Skip to content

Commit e014fe0

Browse files
ludochgae-java-bot
authored andcommitted
Update Jetty versions and servlet API jar.
Update Jetty 12.0.x to 12.0.32 and Jetty 12.1.x to 12.1.6. Also, update the Jetty servlet API jar from 4.0.6 to 4.0.9 in the Jetty121EE8Sdk configuration. PiperOrigin-RevId: 864150501 Change-Id: Idc20a1e9abda7b10f9a0e695ad979d3e6cbaa7a2
1 parent 348717a commit e014fe0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE8Sdk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ List<File> getJetty121SharedLibFiles() {
233233
sharedLibs.add(new File(sdkRoot, "lib/shared/jetty12/appengine-local-runtime-shared.jar"));
234234
File jettyHomeLib = new File(sdkRoot, JETTY121_HOME_LIB_PATH);
235235

236-
sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.6.jar")); // this is javax.servlet
236+
sharedLibs.add(new File(jettyHomeLib, "jetty-servlet-api-4.0.9.jar")); // this is javax.servlet
237237

238238
// We want to match this file: "jetty-util-9.3.8.v20160314.jar"
239239
// but without hardcoding the Jetty version which is changing from time to time.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<maven.compiler.target>17</maven.compiler.target>
7070
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7171
<jetty.version>9.4.58.v20250814</jetty.version>
72-
<jetty12.version>12.0.31</jetty12.version>
73-
<jetty121.version>12.1.5</jetty121.version>
72+
<jetty12.version>12.0.32</jetty12.version>
73+
<jetty121.version>12.1.6</jetty121.version>
7474
<slf4j.version>2.0.17</slf4j.version>
7575
<protoc.version>4.33.4</protoc.version>
7676
<distributionManagement.snapshot.url>https://oss.sonatype.org/content/repositories/google-snapshots/</distributionManagement.snapshot.url>

runtime/local_jetty121/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<dependency>
128128
<groupId>org.eclipse.jetty.toolchain</groupId>
129129
<artifactId>jetty-servlet-api</artifactId>
130-
<version>4.0.6</version>
130+
<version>4.0.9</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>org.eclipse.jetty</groupId>

runtime/local_jetty121_ee11/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<dependency>
128128
<groupId>org.eclipse.jetty.toolchain</groupId>
129129
<artifactId>jetty-servlet-api</artifactId>
130-
<version>4.0.6</version>
130+
<version>4.0.9</version>
131131
</dependency>
132132
<dependency>
133133
<groupId>org.eclipse.jetty</groupId>

0 commit comments

Comments
 (0)