Merge pull request #390 from starksm64/main

Update the container to use the arquillian-core and arquillian-jakarta 1.8.0.Final releases
wildfly · Nov 21, 2023 · c65de6d · c65de6d
2 parents ca3e39b + 88cd9a0
commit c65de6d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/integration-tests/protocol-tests/pom.xml b/integration-tests/protocol-tests/pom.xml
@@ -28,8 +28,8 @@
     <name>WildFly: Arquillian Protocol Integration Tests</name>
 
     <properties>
-        <version.jakarta.ws.rs-api>3.0.0</version.jakarta.ws.rs-api>
-        <version.org.jboss.resteasy>6.0.3.Final</version.org.jboss.resteasy>
+        <version.jakarta.ws.rs-api>3.1.0</version.jakarta.ws.rs-api>
+        <version.org.jboss.resteasy>6.2.6.Final</version.org.jboss.resteasy>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -41,8 +41,8 @@
         <version.org.wildfly.full>28.0.1.Final</version.org.wildfly.full>
         <version.junit>4.13.2</version.junit>
         <version.org.junit>5.9.1</version.org.junit>
-        <version.org.jboss.arquillian.core>1.7.2.Final</version.org.jboss.arquillian.core>
-        <version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
+        <version.org.jboss.arquillian.core>1.8.0.Final</version.org.jboss.arquillian.core>
+        <version.org.jboss.arquillian.jakarta>1.8.0.Final</version.org.jboss.arquillian.jakarta>        <version.org.jboss.galleon>5.2.0.Final</version.org.jboss.galleon>
         <version.org.jboss.jandex>2.4.3.Final</version.org.jboss.jandex>
         <version.org.jboss.logging.jboss-logging>3.5.3.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.marshalling.jboss-marshalling>2.1.3.Final</version.org.jboss.marshalling.jboss-marshalling>
@@ -62,8 +62,8 @@
         <version.org.jboss.ejb-client>4.0.53.Final</version.org.jboss.ejb-client>
         <version.org.testng>7.6.1</version.org.testng>
         <version.jakarta.ejb>4.0.1</version.jakarta.ejb>
-        <version.jakarta.enterprise>3.0.1</version.jakarta.enterprise>
-        <version.jakarta.inject>2.0.0</version.jakarta.inject>
+        <version.jakarta.enterprise>4.0.1</version.jakarta.enterprise>
+        <version.jakarta.inject>2.0.1</version.jakarta.inject>
         <version.jakarta.servlet>5.0.0</version.jakarta.servlet>
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
 
@@ -322,6 +322,13 @@
                 <artifactId>jakarta.enterprise.cdi-api</artifactId>
                 <version>${version.jakarta.enterprise}</version>
                 <scope>test</scope>
+                <!-- CDI references wrong version of annotations -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>jakarta.annotation</groupId>
+                        <artifactId>jakarta.annotation-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>jakarta.inject</groupId>
@@ -432,12 +439,12 @@
             <dependency>
                 <groupId>org.jboss.arquillian.protocol</groupId>
                 <artifactId>arquillian-protocol-rest-jakarta</artifactId>
-                <version>${version.org.jboss.arquillian.core}</version>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.protocol</groupId>
                 <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-                <version>${version.org.jboss.arquillian.core}</version>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.test</groupId>
@@ -452,12 +459,12 @@
             <dependency>
                 <groupId>org.jboss.arquillian.testenricher</groupId>
                 <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
-                <version>${version.org.jboss.arquillian.core}</version>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.testenricher</groupId>
                 <artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
-                <version>${version.org.jboss.arquillian.core}</version>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.testenricher</groupId>
@@ -467,7 +474,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian.testenricher</groupId>
                 <artifactId>arquillian-testenricher-resource-jakarta</artifactId>
-                <version>${version.org.jboss.arquillian.core}</version>
+                <version>${version.org.jboss.arquillian.jakarta}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.testng</groupId>