Skip to content

Commit 8ee7ebd

Browse files
ludochdependabot[bot]maigovannongae-java-botlachlan-roberts
authored
sync up from main (#352)
* Bump io.netty:netty-common from 4.1.117.Final to 4.1.118.Final 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> * - Add Maven CI action for building with Zulu and Liberica JDKs for Java 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 * allow Jetty 9.4 jetty-servlets class names to work with Jetty 12 Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * allow Jetty 9.4 jetty-servlets class names to work with Jetty 12 Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * allow Jetty 9.4 jetty-servlets class names to work with Jetty 12 Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * Upgrade GAE Java version from 2.0.32 to 2.0.33 and prepare next version 2.0.34-SNAPSHOT PiperOrigin-RevId: 728533780 Change-Id: Ic8bd0b0863999092f469267dbb15d0eca39a92db * PR #345 - changes from review Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * PR #345 - fixes for broken tests Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891 PiperOrigin-RevId: 729286826 Change-Id: Iea5120e9e46db5874fd95426537f4136bf876f84 * Set API host idle timeout to 2 seconds by default instead of no timeout. See jetty/jetty.project#3891 PiperOrigin-RevId: 729581319 Change-Id: I85a21e3fdd2cc5c5c250ff048632f5687870a049 * Update all non-major dependencies * Set API host idle timeout to 25 seconds by default instead of no timeout. See jetty/jetty.project#3891 PiperOrigin-RevId: 731360214 Change-Id: Ifedd44381e45a318ab38705d910ba3f41317ee79 * Update all non-major dependencies * Update to Jetty 12.0.17 and allow invalid pathSpecs in EE8 Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> * Internal change PiperOrigin-RevId: 734104453 Change-Id: I0ad3f52c675374e3f9337a02ebf5b5668eef8b1b * Update all non-major dependencies * Adding `org.eclipse.jetty.servlet` to deprecated package names. This is related to #345 PiperOrigin-RevId: 735623640 Change-Id: I6b2e351765d0778cc2ded07255be8c84b46181db * Fix App Engine tests for Windows. 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 * Copybara import of the project: -- 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 * Update all non-major dependencies --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhinand Sundararajan <abhinasu@google.com> Co-authored-by: GAE Java Team <gae-java-bot@google.com> Co-authored-by: Lachlan Roberts <lachlan.p.roberts@gmail.com> Co-authored-by: Srinjoy Ray <srinjoyray@google.com> Co-authored-by: Mend Renovate <bot@renovateapp.com> Co-authored-by: Lachlan <lachlan@webtide.com>
1 parent b6d2e3d commit 8ee7ebd

124 files changed

Lines changed: 396 additions & 184 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
6969
<dependency>
7070
<groupId>com.google.appengine</groupId>
7171
<artifactId>appengine-api-1.0-sdk</artifactId>
72-
<version>2.0.32</version><!-- or later-->
72+
<version>2.0.33</version><!-- or later-->
7373
</dependency>
7474
<dependency>
7575
<groupId>javax.servlet</groupId>
@@ -89,7 +89,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
8989
<dependency>
9090
<groupId>com.google.appengine</groupId>
9191
<artifactId>appengine-api-1.0-sdk</artifactId>
92-
<version>2.0.32</version><!-- or later-->
92+
<version>2.0.33</version><!-- or later-->
9393
</dependency>
9494
<dependency>
9595
<groupId>jakarta.servlet</groupId>
@@ -188,7 +188,7 @@ Source code for remote APIs for App Engine.
188188
<dependency>
189189
<groupId>com.google.appengine</groupId>
190190
<artifactId>appengine-remote-api</artifactId>
191-
<version>2.0.32</version><!-- Or later-->
191+
<version>2.0.33</version><!-- Or later-->
192192
</dependency>
193193
```
194194
@@ -211,7 +211,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
211211
<dependency>
212212
<groupId>com.google.appengine</groupId>
213213
<artifactId>appengine-api-legacy.jar/artifactId>
214-
<version>2.0.32</version><!-- Or later-->
214+
<version>2.0.33</version><!-- Or later-->
215215
</dependency>
216216
```
217217
@@ -226,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
226226
<dependency>
227227
<groupId>com.google.appengine</groupId>
228228
<artifactId>appengine-testing</artifactId>
229-
<version>2.0.32</version><!-- Or later-->
229+
<version>2.0.33</version><!-- Or later-->
230230
<scope>test</scope>
231231
</dependency>
232232
<dependency>
233233
<groupId>com.google.appengine</groupId>
234234
<artifactId>appengine-api-stubs</artifactId>
235-
<version>2.0.32</version><!-- Or later-->
235+
<version>2.0.33</version><!-- Or later-->
236236
<scope>test</scope>
237237
</dependency>
238238
<dependency>
239239
<groupId>com.google.appengine</groupId>
240240
<artifactId>appengine-tools-sdk</artifactId>
241-
<version>2.0.32</version><!-- Or later-->
241+
<version>2.0.33</version><!-- Or later-->
242242
<scope>test</scope>
243243
</dependency>
244244
```

TRYLATESTBITSINPROD.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ top of your web application and change the entrypoint to boot with these jars in
4646
./mvnw clean install
4747
```
4848

49-
Let's assume the current build version is `2.0.33-SNAPSHOT`.
49+
Let's assume the current build version is `2.0.34-SNAPSHOT`.
5050

5151
See the output of the runtime deployment module which contains all the jars needed by the runtime:
5252

@@ -66,7 +66,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:
6666

6767
```
6868
<properties>
69-
<appengine.runtime.version>2.0.33-SNAPSHOT</appengine.runtime.version>
69+
<appengine.runtime.version>2.0.34-SNAPSHOT</appengine.runtime.version>
7070
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
7171
<properties>
7272
...

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.appengine</groupId>
2323
<artifactId>parent</artifactId>
24-
<version>2.0.33-SNAPSHOT</version>
24+
<version>2.0.34-SNAPSHOT</version>
2525
</parent>
2626
<properties>
2727
<maven.deploy.skip>true</maven.deploy.skip>

api_dev/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.google.appengine</groupId>
2525
<artifactId>parent</artifactId>
26-
<version>2.0.33-SNAPSHOT</version>
26+
<version>2.0.34-SNAPSHOT</version>
2727
</parent>
2828

2929
<packaging>jar</packaging>

api_legacy/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.appengine</groupId>
2424
<artifactId>parent</artifactId>
25-
<version>2.0.33-SNAPSHOT</version>
25+
<version>2.0.34-SNAPSHOT</version>
2626
</parent>
2727

2828
<packaging>jar</packaging>

appengine-api-1.0-sdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.google.appengine</groupId>
2222
<artifactId>parent</artifactId>
23-
<version>2.0.33-SNAPSHOT</version>
23+
<version>2.0.34-SNAPSHOT</version>
2424
</parent>
2525
<packaging>jar</packaging>
2626
<name>AppEngine :: appengine-api-1.0-sdk</name>

appengine-api-stubs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.google.appengine</groupId>
2525
<artifactId>parent</artifactId>
26-
<version>2.0.33-SNAPSHOT</version>
26+
<version>2.0.34-SNAPSHOT</version>
2727
</parent>
2828

2929
<packaging>jar</packaging>

appengine_init/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>com.google.appengine</groupId>
2525
<artifactId>parent</artifactId>
26-
<version>2.0.33-SNAPSHOT</version>
26+
<version>2.0.34-SNAPSHOT</version>
2727
</parent>
2828

2929
<packaging>jar</packaging>

appengine_jsr107/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.appengine</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.33-SNAPSHOT</version>
27+
<version>2.0.34-SNAPSHOT</version>
2828
</parent>
2929

3030
<dependencies>

appengine_resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>com.google.appengine</groupId>
2323
<artifactId>parent</artifactId>
24-
<version>2.0.33-SNAPSHOT</version>
24+
<version>2.0.34-SNAPSHOT</version>
2525
</parent>
2626
<packaging>jar</packaging>
2727
<name>AppEngine :: appengine-resources</name>

0 commit comments

Comments
 (0)