Skip to content

sync up from main - #352

Merged
ludoch merged 27 commits into
jdk24from
main
Mar 18, 2025
Merged

sync up from main#352
ludoch merged 27 commits into
jdk24from
main

Conversation

@ludoch

@ludoch ludoch commented Mar 18, 2025

Copy link
Copy Markdown
Collaborator

No description provided.

dependabot Bot and others added 27 commits February 14, 2025 15:07
Bumps [io.netty:netty-common](https://github.com/netty/netty) from 4.1.117.Final to 4.1.118.Final.
- [Commits](netty/netty@netty-4.1.117.Final...netty-4.1.118.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-common
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…va 21, 23.

- Removing Java 22 from all JDK since we can now safely just test on JDK23 and the upcoming JDK24.

PiperOrigin-RevId: 727603486
Change-Id: I73c659ef58fe85fb6d9964d0997949eccec08aeb
…netty-netty-common-4.1.118.Final

PiperOrigin-RevId: 727840363
Change-Id: I5a9427d06fa5c9fc66de35a8d9258dc39048ff5f
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
…on 2.0.34-SNAPSHOT

PiperOrigin-RevId: 728533780
Change-Id: Ic8bd0b0863999092f469267dbb15d0eca39a92db
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
…ilters

PiperOrigin-RevId: 729124423
Change-Id: I7e1de8b74b631d2ecedf33b07667207728ff7511
…ut. See jetty/jetty.project#3891

PiperOrigin-RevId: 729286826
Change-Id: Iea5120e9e46db5874fd95426537f4136bf876f84
…ut. See jetty/jetty.project#3891

PiperOrigin-RevId: 729581319
Change-Id: I85a21e3fdd2cc5c5c250ff048632f5687870a049
PiperOrigin-RevId: 730709780
Change-Id: Ib5d34c35a767453619d70a7483b4a2f371f9917e
…out. See jetty/jetty.project#3891

PiperOrigin-RevId: 731360214
Change-Id: Ifedd44381e45a318ab38705d910ba3f41317ee79
PiperOrigin-RevId: 732760665
Change-Id: Ia5516a33dfac848d54d9d83f661b66491aa24b50
Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
PiperOrigin-RevId: 733945939
Change-Id: I556668b063c3596fe9bc63d48cd3cfb6e30718d4
PiperOrigin-RevId: 734104453
Change-Id: I0ad3f52c675374e3f9337a02ebf5b5668eef8b1b
PiperOrigin-RevId: 735214001
Change-Id: Iad7a6cf2192aa4c2c7f498e30d9ea91fdce5023a
…is related to #345

PiperOrigin-RevId: 735623640
Change-Id: I6b2e351765d0778cc2ded07255be8c84b46181db
This change addresses several issues that prevented App Engine tests from passing on Windows:

- **Maven Wrapper:** The Maven wrapper executable `mvnw` is now invoked with the `.cmd` extension when running on Windows to ensure it can be executed correctly.
- **Newline Handling:** Test output reading logic has been updated to handle both `\n` and `\r\n` newline representations, which is necessary for Windows compatibility.

These changes ensure that the affected tests pass on both Linux/macOS and Windows environments.

PiperOrigin-RevId: 736207509
Change-Id: I7c11b010689343ccdbf9b29801e17569064bb867
--
a47b5b3 by Lachlan Roberts <lachlan.p.roberts@gmail.com>:

fix JSPs from appengine-local-runtime-shared-jetty12

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
COPYBARA_INTEGRATE_REVIEW=#350 from GoogleCloudPlatform:DevAppServer-JSP a47b5b3
PiperOrigin-RevId: 736601363
Change-Id: I231efd68881ea23227d1f8d1a21749cc02b71d0e
PiperOrigin-RevId: 737479210
Change-Id: I256a08a9c5c59e17878b9ab0b6ba2a742ece03b5
@google-cla

google-cla Bot commented Mar 18, 2025

Copy link
Copy Markdown

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@ludoch
ludoch merged commit 8ee7ebd into jdk24 Mar 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants