Merge pull request #170 from rhusar/169-arquillian-core-1.9

Upgrade version.arquillian.core from 1.8.0.Final to 1.9.0.Final
arquillian · Jul 12, 2024 · f59e9be · f59e9be
2 parents a7fba9b + 57bad8b
commit f59e9be
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
   <version>1.2.2.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Arquillian Tomcat Container Parent</name>
+  <name>Arquillian Tomcat Container Project Parent</name>
   <description>Tomcat Container integrations for the Arquillian Project</description>
 
   <scm>
@@ -27,14 +27,15 @@
 
   <properties>
 
-    <arquillian.core.version>1.8.0.Final</arquillian.core.version>
-    <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>
-    <weld.jakarta.version>5.1.2.Final</weld.jakarta.version>
+    <version.arquillian.core>1.9.0.Final</version.arquillian.core>
+    <version.arquillian.jakarta>10.0.0.Final</version.arquillian.jakarta>
+    <version.shrinkwrap>1.2.6</version.shrinkwrap>
+    <version.shrinkwrap.descriptors>2.0.0</version.shrinkwrap.descriptors>
+    <version.shrinkwrap.resolver>3.3.0</version.shrinkwrap.resolver>
+    <version.weld.jakarta>5.1.2.Final</version.weld.jakarta>
 
     <!-- Tomcat versions -->
-    <tomcat10.version>10.1.25</tomcat10.version>
+    <version.tomcat10>10.1.25</version.tomcat10>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -49,42 +50,51 @@
       <dependency>
         <groupId>org.jboss.shrinkwrap</groupId>
         <artifactId>shrinkwrap-bom</artifactId>
-        <version>${shrinkwrap.version}</version>
+        <version>${version.shrinkwrap}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.shrinkwrap.descriptors</groupId>
         <artifactId>shrinkwrap-descriptors-bom</artifactId>
-        <version>${shrinkwrap.descriptors.version}</version>
+        <version>${version.shrinkwrap.descriptors}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.shrinkwrap.resolver</groupId>
         <artifactId>shrinkwrap-resolver-bom</artifactId>
-        <version>${shrinkwrap.resolver.version}</version>
+        <version>${version.shrinkwrap.resolver}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.arquillian</groupId>
         <artifactId>arquillian-bom</artifactId>
-        <version>${arquillian.core.version}</version>
+        <version>${version.arquillian.core}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.jboss.arquillian</groupId>
         <artifactId>arquillian-build</artifactId>
-        <version>${arquillian.core.version}</version>
+        <version>${version.arquillian.core}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.arquillian.jakarta</groupId>
+        <artifactId>arquillian-jakarta-bom</artifactId>
+        <version>${version.arquillian.jakarta}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- Dependencies -->
       <dependency>
         <groupId>org.jboss.weld.servlet</groupId>
         <artifactId>weld-servlet-core</artifactId>
-        <version>${weld.jakarta.version}</version>
+        <version>${version.weld.jakarta}</version>
         <scope>test</scope>
       </dependency>
 

diff --git a/tomcat-common/pom.xml b/tomcat-common/pom.xml
@@ -19,6 +19,7 @@
       <version>2.1.1</version>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/tomcat-embedded-10/pom.xml b/tomcat-embedded-10/pom.xml
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arquillian-tomcat-embedded-10</artifactId>
-  <name>Arquillian Tomcat Embedded 10.x Container</name>
+  <name>Arquillian Tomcat Embedded Container 10.1</name>
 
   <properties>
     <ecj.version>4.6.1</ecj.version>
@@ -19,13 +19,13 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>${tomcat10.version}</version>
+      <version>${version.tomcat10}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-jasper</artifactId>
-      <version>${tomcat10.version}</version>
+      <version>${version.tomcat10}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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

diff --git a/tomcat-remote-10/pom.xml b/tomcat-remote-10/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>arquillian-tomcat-remote-10</artifactId>
-  <name>Arquillian Tomcat Remote 10.x Container</name>
+  <name>Arquillian Tomcat Remote Container 10.1</name>
 
   <build>
     <plugins>
@@ -22,7 +22,7 @@
           <container>
             <containerId>tomcat10x</containerId>
             <zipUrlInstaller>
-              <url>https://archive.apache.org/dist/tomcat/tomcat-10/v${tomcat10.version}/bin/apache-tomcat-${tomcat10.version}.zip</url>
+              <url>https://archive.apache.org/dist/tomcat/tomcat-10/v${version.tomcat10}/bin/apache-tomcat-${version.tomcat10}.zip</url>
             </zipUrlInstaller>
           </container>
         </configuration>