Update servlet API version to 4.0.1 Align JGit’s exported servlet API dependency with Gerrit and Google’s internal build by upgrading javax.servlet:javax.servlet-api from 3.1.0 to 4.0.1. This avoids servlet API version skew when JGit is consumed as a library (e.g. via bzlmod) and helps keep a single consistent servlet API in the consumer’s dependency graph. No code changes are required: servlet-api 4.0.1 continues to provide the javax.servlet.* packages (no javax.* → jakarta.* namespace change). This also realigns the servlet-4 branch with the Servlet API version it is named after, after it was temporarily downgraded to 3.1.0 for library alignment. Also update Maven / PDE target platform metadata accordingly. Change-Id: I8b7598be50c5cce17896bfebd12cfdd2c8a5e382
diff --git a/MODULE.bazel b/MODULE.bazel index 974f3b2..f9e046b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -48,7 +48,7 @@ "commons-codec:commons-codec:1.20.0", "commons-io:commons-io:2.21.0", "commons-logging:commons-logging:1.3.5", - "javax.servlet:javax.servlet-api:3.1.0", + "javax.servlet:javax.servlet-api:4.0.1", "junit:junit:4.13.2", "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 72e948b..2a5319e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index c41f9e0..b9084c8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index e9eb9b2..786f0e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target index bd9aa85..54d77d0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target index c05113d..7eef45f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target index 35b8e7d..786afff 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target
@@ -167,7 +167,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <type>jar</type> </dependency> </dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index c982f6f..b42c0d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
@@ -204,7 +204,7 @@ dependency { groupId = "javax.servlet" artifactId = "javax.servlet-api" - version = "3.1.0" + version = "4.0.1" } } @@ -286,4 +286,4 @@ artifactId = "xz" version = "1.11" } -} \ No newline at end of file +}
diff --git a/pom.xml b/pom.xml index aa3c5ec..8980605 100644 --- a/pom.xml +++ b/pom.xml
@@ -129,7 +129,7 @@ <args4j-version>2.37</args4j-version> <commons-compress-version>1.28.0</commons-compress-version> <osgi-core-version>6.0.0</osgi-core-version> - <servlet-api-version>3.1.0</servlet-api-version> + <servlet-api-version>4.0.1</servlet-api-version> <jetty-version>12.1.5</jetty-version> <japicmp-version>0.25.0</japicmp-version> <httpclient-version>4.5.14</httpclient-version>