fix(travis): upgrades JDK version to unblock builds (#76)

Fixes #75
arquillian · Oct 5, 2020 · cf40e11 · cf40e11
1 parent c9ffeda
commit cf40e11
Show file tree

Hide file tree

Showing 23 changed files with 142 additions and 105 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - openjdk7
+  - openjdk8
 cache:
   directories:
     - $HOME/.m2

diff --git a/pom.xml b/pom.xml
@@ -47,12 +47,12 @@
 
   <properties>
     <!-- Arquillian -->
-    <version.arquillian_core>1.4.1.Final</version.arquillian_core>
+    <version.arquillian_core>1.6.0.Final</version.arquillian_core>
     <version.arquillian_drone>1.1.0.Final</version.arquillian_drone>
-    <version.arquillian_warp>1.0.0.Alpha4</version.arquillian_warp>
+    <version.arquillian_warp>1.0.0</version.arquillian_warp>
 
     <!-- JAX-RS implementations -->
-    <version.resteasy_jax_rs_1_0>2.3.2.Final</version.resteasy_jax_rs_1_0>
+    <version.resteasy_jax_rs_1_0>3.6.3.Final</version.resteasy_jax_rs_1_0>
     <version.resteasy_jax_rs_2_0>3.0.4.Final</version.resteasy_jax_rs_2_0>
     <version.jersey>1.17</version.jersey>
     <version.cxf>2.7.2</version.cxf>
@@ -64,12 +64,12 @@
     <version.fest.assert>1.4</version.fest.assert>
     <version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers>
     <version.jboss_spec>3.0.0.Final</version.jboss_spec>
-    <version.org.jboss.jbossas>7.1.1.Final</version.org.jboss.jbossas>
+    <version.org.jboss.jbossas>2.1.1.Final</version.org.jboss.jbossas>
     <version.org.glassfish>3.1.2</version.org.glassfish>
 
     <!-- override from parent -->
-    <maven.compiler.target>1.5</maven.compiler.target>
-    <maven.compiler.source>1.5</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
     <tomcat.version>7.0.42</tomcat.version>
   </properties>
 
@@ -238,14 +238,14 @@
 
       <!-- Containers -->
       <dependency>
-        <groupId>org.jboss.as</groupId>
-        <artifactId>jboss-as-arquillian-container-managed</artifactId>
+        <groupId>org.wildfly.arquillian</groupId>
+        <artifactId>wildfly-arquillian-container-managed</artifactId>
         <version>${version.org.jboss.jbossas}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.as</groupId>
-        <artifactId>jboss-as-arquillian-container-remote</artifactId>
+        <groupId>org.wildfly.arquillian</groupId>
+        <artifactId>wildfly-arquillian-container-remote</artifactId>
         <version>${version.org.jboss.jbossas}</version>
       </dependency>
 

diff --git a/rest-client/ftest/ftest-impl-2x/pom.xml b/rest-client/ftest/ftest-impl-2x/pom.xml
@@ -22,7 +22,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemProperties>
-                <jboss.version>${version.org.jboss.jbossas}</jboss.version>
+                <wildfly.version>${wildfly.version}</wildfly.version>
               </systemProperties>
             </configuration>
           </plugin>
@@ -39,12 +39,12 @@
                 <configuration>
                   <artifactItems>
                     <artifactItem>
-                      <artifactId>jboss-as-dist</artifactId>
-                      <groupId>org.jboss.as</groupId>
+                      <artifactId>wildfly-dist</artifactId>
+                      <groupId>org.wildfly</groupId>
                       <outputDirectory>${project.build.directory}/</outputDirectory>
                       <overWrite>false</overWrite>
                       <type>zip</type>
-                      <version>${version.org.jboss.jbossas}</version>
+                      <version>${wildfly.version}</version>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -55,8 +55,8 @@
       </build>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-managed</artifactId>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-managed</artifactId>
           <version>${version.org.jboss.jbossas}</version>
           <scope>test</scope>
         </dependency>
@@ -66,8 +66,8 @@
       <id>arq-jbossas-remote-7</id>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-remote</artifactId>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-remote</artifactId>
           <version>${version.org.jboss.jbossas}</version>
           <scope>test</scope>
         </dependency>
@@ -128,8 +128,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <jboss.version>7.1.1.Final</jboss.version>
-    <version.org.jboss.jbossas>7.1.1.Final</version.org.jboss.jbossas>
+    <wildfly.version>16.0.0.Final</wildfly.version>
+    <version.org.jboss.jbossas>2.1.1.Final</version.org.jboss.jbossas>
     <version.resteasy>2.3.2.Final</version.resteasy>
   </properties>
-</project>
+</project>
diff --git a/rest-client/ftest/ftest-impl-2x/src/test/resources/arquillian.xml b/rest-client/ftest/ftest-impl-2x/src/test/resources/arquillian.xml
@@ -4,7 +4,7 @@
 
   <container qualifier="jbossas7" default="true">
     <configuration>
-      <property name="jbossHome">target/jboss-as-${jboss.version:7.1.1.Final}</property>
+      <property name="jbossHome">target/wildfly-${wildfly.version:16.0.0.Final}</property>
     </configuration>
   </container>
 

diff --git a/rest-client/ftest/ftest-impl-3x/pom.xml b/rest-client/ftest/ftest-impl-3x/pom.xml
@@ -12,8 +12,8 @@
   <name>Arquillian REST Client Extension: Impl-3x Functional Tests</name>
   <properties>
     <version.resteasy>3.0.11.Final</version.resteasy>
-    <version.wildfly>9.0.2.Final</version.wildfly>
-    <arquillian.wildfly.version>1.1.0.Final</arquillian.wildfly.version>
+    <wildfly.version>16.0.0.Final</wildfly.version>
+    <arquillian.wildfly.version>2.1.1.Final</arquillian.wildfly.version>
   </properties>
   <profiles>
     <profile>
@@ -27,7 +27,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemProperties>
-                <jboss.version>${version.wildfly}</jboss.version>
+                <jboss.version>${wildfly.version}</jboss.version>
               </systemProperties>
             </configuration>
           </plugin>
@@ -46,7 +46,7 @@
                     <artifactItem>
                       <groupId>org.wildfly</groupId>
                       <artifactId>wildfly-dist</artifactId>
-                      <version>${version.wildfly}</version>
+                      <version>${wildfly.version}</version>
                       <outputDirectory>${project.build.directory}/</outputDirectory>
                       <type>zip</type>
                       <overWrite>false</overWrite>
@@ -133,4 +133,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
diff --git a/rest-client/ftest/ftest-impl-3x/src/test/resources/arquillian.xml b/rest-client/ftest/ftest-impl-3x/src/test/resources/arquillian.xml
@@ -4,7 +4,7 @@
 
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-${version.wildfly:9.0.2.Final}</property>
+      <property name="jbossHome">target/wildfly-${wildfly.version:16.0.0.Final}</property>
     </configuration>
   </container>
 

diff --git a/rest-client/ftest/ftest-impl-jersey/pom.xml b/rest-client/ftest/ftest-impl-jersey/pom.xml
@@ -12,7 +12,7 @@
   <name>Arquillian REST Client Extension: Impl-Jersey Functional Tests</name>
   <profiles>
     <profile>
-      <id>arq-jbossas-managed-7</id>
+      <id>arq-wildfly-build-managed</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
@@ -22,7 +22,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemProperties>
-                <jboss.version>${version.org.jboss.jbossas}</jboss.version>
+                <jboss.version>${wildfly.version}</jboss.version>
               </systemProperties>
             </configuration>
           </plugin>
@@ -39,12 +39,12 @@
                 <configuration>
                   <artifactItems>
                     <artifactItem>
-                      <artifactId>jboss-as-dist</artifactId>
-                      <groupId>org.jboss.as</groupId>
+                      <groupId>org.wildfly</groupId>
+                      <artifactId>wildfly-dist</artifactId>
+                      <version>${wildfly.version}</version>
                       <outputDirectory>${project.build.directory}/</outputDirectory>
-                      <overWrite>false</overWrite>
                       <type>zip</type>
-                      <version>${version.org.jboss.jbossas}</version>
+                      <overWrite>false</overWrite>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -55,20 +55,20 @@
       </build>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-managed</artifactId>
-          <version>${version.org.jboss.jbossas}</version>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-managed</artifactId>
+          <version>${arquillian.wildfly.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
     </profile>
     <profile>
-      <id>arq-jbossas-remote-7</id>
+      <id>arq-wildfly-build-remote</id>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-remote</artifactId>
-          <version>${version.org.jboss.jbossas}</version>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-remote</artifactId>
+          <version>${arquillian.wildfly.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -370,10 +370,10 @@
     </dependency>
   </dependencies>
   <properties>
-    <jboss.version>7.1.1.Final</jboss.version>
+    <wildfly.version>16.0.0.Final</wildfly.version>
+    <arquillian.wildfly.version>2.1.1.Final</arquillian.wildfly.version>
     <version.jersey>2.6</version.jersey>
     <version.jersey.providers>2.3.0</version.jersey.providers>
-    <version.org.jboss.jbossas>7.1.1.Final</version.org.jboss.jbossas>
     <version.resteasy>3.0.1.Final</version.resteasy>
   </properties>
 </project>
diff --git a/rest-client/ftest/ftest-impl-jersey/src/test/resources/arquillian.xml b/rest-client/ftest/ftest-impl-jersey/src/test/resources/arquillian.xml
@@ -4,7 +4,7 @@
 
   <container qualifier="jbossas7" default="true">
     <configuration>
-      <property name="jbossHome">target/jboss-as-${jboss.version:7.1.1.Final}</property>
+      <property name="jbossHome">target/wildfly-${wildfly.version:16.0.0.Final}</property>
     </configuration>
   </container>
 

diff --git a/rest-client/impl/impl-2x/pom.xml b/rest-client/impl/impl-2x/pom.xml
@@ -13,7 +13,7 @@
   <description>Integrates RestEasy Client version 2.x with Arquillian</description>
   <properties>
     <jboss.version>7.1.1.Final</jboss.version>
-    <version.org.jboss.jbossas>7.1.1.Final</version.org.jboss.jbossas>
+    <version.org.jboss.jbossas>2.1.1.Final</version.org.jboss.jbossas>
     <version.resteasy>2.3.2.Final</version.resteasy>
   </properties>
   <dependencies>
@@ -97,7 +97,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemProperties>
-                <jboss.version>${version.org.jboss.jbossas}</jboss.version>
+                <jboss.version>16.0.0.Final</jboss.version>
               </systemProperties>
             </configuration>
           </plugin>
@@ -111,12 +111,12 @@
                 <configuration>
                   <artifactItems>
                     <artifactItem>
-                      <artifactId>jboss-as-dist</artifactId>
-                      <groupId>org.jboss.as</groupId>
+                      <artifactId>wildfly-dist</artifactId>
+                      <groupId>org.wildfly</groupId>
                       <outputDirectory>${project.build.directory}/</outputDirectory>
                       <overWrite>false</overWrite>
                       <type>zip</type>
-                      <version>${version.org.jboss.jbossas}</version>
+                      <version>16.0.0.Final</version>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -130,8 +130,8 @@
       </build>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-managed</artifactId>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-managed</artifactId>
           <version>${version.org.jboss.jbossas}</version>
           <scope>test</scope>
         </dependency>
@@ -141,8 +141,8 @@
       <id>arq-jbossas-remote-7</id>
       <dependencies>
         <dependency>
-          <groupId>org.jboss.as</groupId>
-          <artifactId>jboss-as-arquillian-container-remote</artifactId>
+          <groupId>org.wildfly.arquillian</groupId>
+          <artifactId>wildfly-arquillian-container-remote</artifactId>
           <version>${version.org.jboss.jbossas}</version>
           <scope>test</scope>
         </dependency>

diff --git a/rest-client/impl/impl-2x/src/test/resources/arquillian.xml b/rest-client/impl/impl-2x/src/test/resources/arquillian.xml
@@ -4,7 +4,7 @@
 
   <container qualifier="jbossas7" default="true">
     <configuration>
-      <property name="jbossHome">target/jboss-as-${jboss.version:7.1.1.Final}</property>
+      <property name="jbossHome">target/wildfly-${jboss.version:16.0.0.Final}</property>
     </configuration>
   </container>
 

diff --git a/rest-client/impl/impl-3x/pom.xml b/rest-client/impl/impl-3x/pom.xml
@@ -13,8 +13,8 @@
   <description>Integrates RestEasy Client version 3.x with Arquillian</description>
   <properties>
     <version.resteasy>3.0.11.Final</version.resteasy>
-    <version.wildfly>9.0.2.Final</version.wildfly>
-    <arquillian.wildfly.version>1.1.0.Final</arquillian.wildfly.version>
+    <wildfly.version>16.0.0.Final</wildfly.version>
+    <arquillian.wildfly.version>2.1.1.Final</arquillian.wildfly.version>
   </properties>
   <dependencies>
     <dependency>
@@ -102,7 +102,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemProperties>
-                <jboss.version>${version.wildfly}</jboss.version>
+                <jboss.version>${wildfly.version}</jboss.version>
               </systemProperties>
             </configuration>
           </plugin>
@@ -121,7 +121,7 @@
                     <artifactItem>
                       <groupId>org.wildfly</groupId>
                       <artifactId>wildfly-dist</artifactId>
-                      <version>${version.wildfly}</version>
+                      <version>${wildfly.version}</version>
                       <outputDirectory>${project.build.directory}/</outputDirectory>
                       <type>zip</type>
                       <overWrite>false</overWrite>

diff --git a/rest-client/impl/impl-3x/src/test/resources/arquillian.xml b/rest-client/impl/impl-3x/src/test/resources/arquillian.xml
@@ -4,7 +4,7 @@
 
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-${version.wildfly:9.0.2.Final}</property>
+      <property name="jbossHome">target/wildfly-${wildfly.version:16.0.0.Final}</property>
     </configuration>
   </container>