Bump commons-logging:commons-logging from 1.3.4 to 1.3.5 (#578)

* Bump commons-logging:commons-logging from 1.3.4 to 1.3.5 Bumps commons-logging:commons-logging from 1.3.4 to 1.3.5. --- updated-dependencies: - dependency-name: commons-logging:commons-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Tomcat 9.0.99 cannot be used due to an InaccessibleObjectException in JreCompat with Java 17 * Tomcat 10.1.34 cannot be used due to an InaccessibleObjectException in JreCompat with Java 17 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: S. Ali Tokmen <[email protected]>
codehaus-cargo · Feb 13, 2025 · f380f9e · f380f9e
1 parent f2baa3e
commit f380f9e
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 60 deletions.
diff --git a/core/samples/pom.xml b/core/samples/pom.xml
@@ -727,15 +727,25 @@
               <cargo.tomcat8x.java.home>${cargo.java.home.1_7}</cargo.tomcat8x.java.home>
 
               <cargo.tomcat9x.url>
-                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip
+                <!--
+                  Tomcat 9.0.99 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/9.0.98/tomcat-9.0.98.zip
               </cargo.tomcat9x.url>
               <cargo.tomcat9x.java.home>${cargo.java.home.1_8}</cargo.tomcat9x.java.home>
 
               <cargo.tomcat10x.url>
                 <!--
                 https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.0.27/tomcat-10.0.27.zip
                   -->
-                https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/10.1.35/tomcat-10.1.35.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
               </cargo.tomcat10x.url>
               <cargo.tomcat10x.java.home>${cargo.java.home.1_11}</cargo.tomcat10x.java.home>
 

diff --git a/extensions/ant/samples/ant1.10-test/src/test/resources/build.xml b/extensions/ant/samples/ant1.10-test/src/test/resources/build.xml
@@ -35,7 +35,7 @@
     <sequential>
       <cargo containerId="tomcat9x" action="@{action}">
         <zipUrlInstaller
-          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
           downloadDir="${basedir}/../../../../core/samples/java/installs"
           extractDir="${catalina.root}">
           <!--

diff --git a/extensions/ant/samples/configurationFiles-xmlReplacements-test/src/test/resources/build.xml b/extensions/ant/samples/configurationFiles-xmlReplacements-test/src/test/resources/build.xml
@@ -35,7 +35,7 @@
     <sequential>
       <cargo containerId="tomcat9x" action="@{action}">
         <zipUrlInstaller
-          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
           downloadDir="${basedir}/../../../../core/samples/java/installs"
           extractDir="${catalina.root}">
           <!--

diff --git a/extensions/ant/samples/daemon-test/pom.xml b/extensions/ant/samples/daemon-test/pom.xml
@@ -57,7 +57,7 @@
               <artifactInstaller>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat</artifactId>
-                <version>9.0.99</version>
+                <version>9.0.98</version>
               </artifactInstaller>
               <systemProperties>
                 <cargo.home>${project.build.directory}/daemon-cargo-home</cargo.home>

diff --git a/extensions/ant/samples/daemon-test/src/test/resources/build.xml b/extensions/ant/samples/daemon-test/src/test/resources/build.xml
@@ -35,7 +35,7 @@
   <target name="daemon-start">
     <cargo containerId="tomcat9x" action="daemon-start">
       <zipUrlInstaller
-        installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+        installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
         downloadDir="\${basedir}/../../../../core/samples/java/installs"
         extractDir="\${catalina.root}">
         <!--

diff --git a/extensions/ant/samples/datasource-test/src/test/resources/build.xml b/extensions/ant/samples/datasource-test/src/test/resources/build.xml
@@ -38,7 +38,7 @@
     <sequential>
       <cargo containerId="tomcat9x" action="@{action}">
         <zipUrlInstaller
-          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
           downloadDir="\${basedir}/../../../../core/samples/java/installs"
           extractDir="\${catalina.root}">
           <!--

diff --git a/extensions/ant/samples/remote-test/src/test/resources/build.xml b/extensions/ant/samples/remote-test/src/test/resources/build.xml
@@ -38,7 +38,7 @@
     <sequential>
       <cargo containerId="tomcat9x" action="@{action}">
         <zipUrlInstaller
-          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
           downloadDir="\${basedir}/../../../../core/samples/java/installs"
           extractDir="\${catalina.root}">
           <!--

diff --git a/extensions/ant/samples/users-test/src/test/resources/build.xml b/extensions/ant/samples/users-test/src/test/resources/build.xml
@@ -38,7 +38,7 @@
     <sequential>
       <cargo containerId="tomcat9x" action="@{action}">
         <zipUrlInstaller
-          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.99/tomcat-9.0.99.zip"
+          installURL="https://repo.maven.apache.org/maven2/org/apache/tomcat/tomcat/9.0.98/tomcat-9.0.98.zip"
           downloadDir="\${basedir}/../../../../core/samples/java/installs"
           extractDir="\${catalina.root}">
           <!--

diff --git a/extensions/daemon/itests/deployable-on-tomcat/pom.xml b/extensions/daemon/itests/deployable-on-tomcat/pom.xml
@@ -68,7 +68,7 @@
                 <artifactInstaller>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>9.0.99</version>
+                  <version>9.0.98</version>
                 </artifactInstaller>
                 <systemProperties>
                   <daemon.home>${project.build.directory}/daemon-home</daemon.home>

diff --git a/extensions/maven3/archetypes/daemon/pom.xml b/extensions/maven3/archetypes/daemon/pom.xml
@@ -49,7 +49,7 @@
               <artifactInstaller>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat</artifactId>
-                <version>9.0.99</version>
+                <version>9.0.98</version>
               </artifactInstaller>
               <systemProperties>
                 <cargo.home>${project.build.directory}/daemon-cargo-home</cargo.home>

diff --git a/extensions/maven3/archetypes/daemon/src/main/resources/archetype-resources/pom.xml b/extensions/maven3/archetypes/daemon/src/main/resources/archetype-resources/pom.xml
@@ -175,7 +175,7 @@
                   <artifactInstaller>
                     <groupId>org.apache.tomcat</groupId>
                     <artifactId>tomcat</artifactId>
-                    <version>9.0.99</version>
+                    <version>9.0.98</version>
                   </artifactInstaller>
                 </container>
               </configuration>

diff --git a/...ions/maven3/archetypes/multiple-containers/src/main/resources/archetype-resources/pom.xml b/...ions/maven3/archetypes/multiple-containers/src/main/resources/archetype-resources/pom.xml
@@ -90,7 +90,7 @@
                 <artifactItem>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>9.0.99</version>
+                  <version>9.0.98</version>
                   <type>zip</type>
                   <outputDirectory>\${project.build.directory}/cargo/containers</outputDirectory>
                 </artifactItem>
@@ -127,7 +127,7 @@
                     </deployable>
                   </configuration>
                 </cargo>
-                <cargo containerId="tomcat9x" action="start" home="\${project.build.directory}/cargo/containers/apache-tomcat-9.0.99">
+                <cargo containerId="tomcat9x" action="start" home="\${project.build.directory}/cargo/containers/apache-tomcat-9.0.98">
                   <configuration home="\${project.build.directory}/cargo/configurations/tomcat9x">
                     <property name="cargo.servlet.port" value="\${servlet2.port}"/>
                     <property name="cargo.rmi.port" value="\${rmi2.port}"/>
@@ -156,7 +156,7 @@
                     <property name="cargo.rmi.port" value="\${rmi.port}"/>
                   </configuration>
                 </cargo>
-                <cargo containerId="tomcat9x" action="stop" home="\${project.build.directory}/cargo/containers/apache-tomcat-9.0.99">
+                <cargo containerId="tomcat9x" action="stop" home="\${project.build.directory}/cargo/containers/apache-tomcat-9.0.98">
                   <configuration home="\${project.build.directory}/cargo/configurations/tomcat9x">
                     <property name="cargo.servlet.port" value="\${servlet2.port}"/>
                     <property name="cargo.rmi.port" value="\${rmi2.port}"/>

diff --git a/extensions/maven3/archetypes/remote-deployment/pom.xml b/extensions/maven3/archetypes/remote-deployment/pom.xml
@@ -41,7 +41,7 @@
               <artifactInstaller>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat</artifactId>
-                <version>9.0.99</version>
+                <version>9.0.98</version>
               </artifactInstaller>
             </container>
             <configuration>

diff --git a/...module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml b/...module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml
@@ -178,7 +178,7 @@
                   <artifactInstaller>
                     <groupId>org.apache.tomcat</groupId>
                     <artifactId>tomcat</artifactId>
-                    <version>9.0.99</version>
+                    <version>9.0.98</version>
                   </artifactInstaller>
                 </container>
               </configuration>

diff --git a/...ons/maven3/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml b/...ons/maven3/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml
@@ -185,7 +185,7 @@
                   <artifactInstaller>
                     <groupId>org.apache.tomcat</groupId>
                     <artifactId>tomcat</artifactId>
-                    <version>9.0.99</version>
+                    <version>9.0.98</version>
                   </artifactInstaller>
                 </container>
               </configuration>

diff --git a/...s/maven3/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml b/...s/maven3/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml
@@ -198,7 +198,7 @@
                   <artifactInstaller>
                     <groupId>org.apache.tomcat</groupId>
                     <artifactId>tomcat</artifactId>
-                    <version>9.0.99</version>
+                    <version>9.0.98</version>
                   </artifactInstaller>
                 </container>
               </configuration>

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
@@ -383,66 +383,66 @@ public EmbeddedContainerArtifactResolver(ArtifactResolver artifactResolver,
 
         List<Dependency> tomcat9xDependencies = new ArrayList<Dependency>();
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-annotations-api", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-dbcp", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jsp-api", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-annotations-api", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-dbcp", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jsp-api", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-util-scan", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-catalina", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-util-scan", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-catalina", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket", "9.0.99"));
-        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket", "9.0.98"));
+        tomcat9xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "9.0.98"));
         tomcat9xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "9.0.99"));
+            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "9.0.98"));
         // To get to the actual ECJ version, open the MANIFEST.MF file in Tomcat's lib/ecj-xxx.jar
         tomcat9xDependencies.add(new Dependency("org.eclipse.jdt", "ecj", "3.26.0"));
         this.containerDependencies.put("tomcat9x", tomcat9xDependencies);
 
         List<Dependency> tomcat10xDependencies = new ArrayList<Dependency>();
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "jakartaee-migration", "shaded", "1.0.9"));
+            new Dependency("org.apache.tomcat", "jakartaee-migration", "shaded", "1.0.8"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-servlet-api", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-annotations-api", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-dbcp", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-el-api", "10.1.35"));
+            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"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-jaspic-api", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jsp-api", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-juli", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-api", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jni", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-util", "10.1.35"));
+            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"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-util-scan", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-util-scan", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-catalina", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-catalina", "10.1.34"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-coyote", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket-api", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket-client-api", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket-client-api", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-websocket", "10.1.35"));
-        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-websocket", "10.1.34"));
+        tomcat10xDependencies.add(new Dependency("org.apache.tomcat", "tomcat-jasper", "10.1.34"));
         tomcat10xDependencies.add(
-            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "10.1.35"));
+            new Dependency("org.apache.tomcat", "tomcat-jasper-el", "10.1.34"));
         // 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);

diff --git a/extensions/maven3/samples/multi-datasource-test/pom.xml b/extensions/maven3/samples/multi-datasource-test/pom.xml
@@ -71,7 +71,7 @@
                 <artifactInstaller>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>9.0.99</version>
+                  <version>9.0.98</version>
                 </artifactInstaller>
               </container>
               <configuration>

diff --git a/extensions/maven3/samples/remoteDeploy-test/pom.xml b/extensions/maven3/samples/remoteDeploy-test/pom.xml
@@ -49,7 +49,7 @@
                 <artifactInstaller>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>9.0.99</version>
+                  <version>9.0.98</version>
                 </artifactInstaller>
               </container>
               <configuration>

diff --git a/extensions/maven3/samples/users-test/pom.xml b/extensions/maven3/samples/users-test/pom.xml
@@ -57,7 +57,7 @@
                 <artifactInstaller>
                   <groupId>org.apache.tomcat</groupId>
                   <artifactId>tomcat</artifactId>
-                  <version>9.0.99</version>
+                  <version>9.0.98</version>
                 </artifactInstaller>
               </container>
               <configuration>

diff --git a/pom.xml b/pom.xml
@@ -931,7 +931,7 @@
       <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.5</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>