Upgrade to Tomcat 10.1.36

codehaus-cargo · Feb 21, 2025 · d3bea9d · d3bea9d
1 parent bddf28a
commit d3bea9d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/core/samples/pom.xml b/core/samples/pom.xml
@@ -735,12 +735,7 @@
                 <!--
                 https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.0.27/tomcat-10.0.27.zip
                   -->
-                <!--
-                  Tomcat 10.1.35 cannot be used due to an InaccessibleObjectException:
-                  Unable to make field static final boolean java.io.FileSystem.useCanonCaches
-                  accessible in JreCompat with Java 17
-                  -->
-                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.34/tomcat-10.1.34.zip
+                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.36/tomcat-10.1.36.zip
               </cargo.tomcat10x.url>
               <cargo.tomcat10x.java.home>${cargo.java.home.1_11}</cargo.tomcat10x.java.home>
 

diff --git a/...lugin/src/main/java/org/codehaus/cargo/maven3/util/EmbeddedContainerArtifactResolver.java b/...lugin/src/main/java/org/codehaus/cargo/maven3/util/EmbeddedContainerArtifactResolver.java
@@ -412,37 +412,37 @@ public EmbeddedContainerArtifactResolver(ArtifactResolver artifactResolver,
 
         List<Dependency> tomcat10xDependencies = new ArrayList<Dependency>();
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "jakartaee-migration", "shaded", "1.0.8"));
+            new Dependency("org.apache.tomcat", "jakartaee-migration", "shaded", "1.0.9"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-annotations-api", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-dbcp", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-annotations-api", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-dbcp", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jsp-api", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-jsp-api", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-util-scan", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-util-scan", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-catalina", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-catalina", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket-client-api", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket-client-api", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket", "10.1.34"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket", "10.1.36"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "10.1.36"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "10.1.34"));
+            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "10.1.36"));
         // To get to the actual ECJ version, open the MANIFEST.MF file in Tomcat's lib/ecj-xxx.jar
         tomcat10xDependencies.add(new Dependency("org.eclipse.jdt", "ecj", "3.33.0"));
         this.containerDependencies.put("tomcat10x", tomcat10xDependencies);