chore: Synchronize Tomcat versions under a unified property.

arquillian · May 15, 2024 · f5dd9c4 · f5dd9c4
1 parent b285d0a
commit f5dd9c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,9 +31,11 @@
     <shrinkwrap.version>1.2.6</shrinkwrap.version>
     <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version>
     <shrinkwrap.resolver.version>3.3.0</shrinkwrap.resolver.version>
-    <!-- Latest Weld version for Jakarta artifacts -->
     <weld.jakarta.version>5.1.2.Final</weld.jakarta.version>
 
+    <!-- Tomcat versions -->
+    <tomcat10.version>10.1.23</tomcat10.version>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

diff --git a/tomcat-embedded-10/pom.xml b/tomcat-embedded-10/pom.xml
@@ -12,7 +12,6 @@
   <name>Arquillian Tomcat Embedded 10.x Container</name>
 
   <properties>
-    <tomcat.version>10.1.23</tomcat.version>
     <!-- Needs newer version because of deprecated method removal in CDI 4 and subsequent adjustments in Arq. -->
     <arquillian.core.version>1.7.0.Alpha10</arquillian.core.version>
     <ecj.version>4.6.1</ecj.version>
@@ -22,13 +21,13 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat10.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-jasper</artifactId>
-      <version>${tomcat.version}</version>
+      <version>${tomcat10.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/tomcat-managed-10/pom.xml b/tomcat-managed-10/pom.xml
@@ -12,10 +12,8 @@
   <name>Arquillian Container Tomcat Managed 10.x</name>
 
   <properties>
-    <tomcat.major.version>10</tomcat.major.version>
-    <tomcat.version>${tomcat.major.version}.1.19</tomcat.version>
-    <test.catalina.home>${project.build.directory}/cargo/installs/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}</test.catalina.home>
-    <test.catalina.base>${project.build.directory}/cargo/configurations/tomcat${tomcat.major.version}x</test.catalina.base>
+    <test.catalina.home>${project.build.directory}/cargo/installs/apache-tomcat-${tomcat10.version}/apache-tomcat-${tomcat10.version}</test.catalina.home>
+    <test.catalina.base>${project.build.directory}/cargo/configurations/tomcat10x</test.catalina.base>
   </properties>
 
   <build>
@@ -28,9 +26,9 @@
             <id>install-container</id>
             <configuration>
               <container>
-                <containerId>tomcat${tomcat.major.version}x</containerId>
+                <containerId>tomcat10x</containerId>
                 <zipUrlInstaller>
-                  <url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
+                  <url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat10.version}/bin/apache-tomcat-${tomcat10.version}.zip</url>
                 </zipUrlInstaller>
               </container>
             </configuration>

diff --git a/tomcat-remote-10/pom.xml b/tomcat-remote-10/pom.xml
@@ -13,21 +13,16 @@
   <artifactId>arquillian-tomcat-remote-10</artifactId>
   <name>Arquillian Tomcat Remote 10.x Container</name>
 
-  <properties>
-    <tomcat.major.version>10</tomcat.major.version>
-    <tomcat.version>${tomcat.major.version}.1.19</tomcat.version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.cargo</groupId>
         <artifactId>cargo-maven2-plugin</artifactId>
         <configuration>
           <container>
-            <containerId>tomcat${tomcat.major.version}x</containerId>
+            <containerId>tomcat10x</containerId>
             <zipUrlInstaller>
-              <url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
+              <url>https://archive.apache.org/dist/tomcat/tomcat-10/v${tomcat10.version}/bin/apache-tomcat-${tomcat10.version}.zip</url>
             </zipUrlInstaller>
           </container>
         </configuration>