Merge pull request javaee-samples#424 from juangon/SWARM-1675_2

arjantijms · web-flow · commit e8c9ed77621c · 2017-11-20T17:45:46.000+01:00
Fix some failures using wildfly-swarm profile
diff --git a/pom.xml b/pom.xml
@@ -10,6 +10,7 @@
     <name>Java EE 7 Sample: javaee7-samples</name>
 
     <properties>
+	<arquillian.version>1.1.14.Final</arquillian.version>
         <java.min.version>1.7</java.min.version>
         <maven.min.version>3.0.0</maven.min.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -30,7 +31,7 @@
         <glassfish.version>4.1.1</glassfish.version>
         <liberty.version>16.0.0.3</liberty.version>
         <wildfly.version>10.1.0.Final</wildfly.version>
-        <wildfly.swarm.version>2017.4.0</wildfly.swarm.version>
+        <wildfly.swarm.version>2017.11.0</wildfly.swarm.version>
         <tomee.version>7.0.1</tomee.version>
         <tomcat.version>8.5.6</tomcat.version>
     </properties>
@@ -106,14 +107,14 @@
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>1.1.11.Final</version>
+                <version>${arquillian.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-container-test-api</artifactId>
-                <version>1.1.11.Final</version>
+                <version>${arquillian.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.javaee7</groupId>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
@@ -2,16 +2,32 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>samples-parent</artifactId>
-        <groupId>org.javaee7</groupId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
     
+    <properties>
+	<arquillian.version>1.1.14.Final</arquillian.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+    
+    <groupId>org.javaee7</groupId>
     <artifactId>test-utils</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <name>Java EE 7 Sample: javaee7-samples - test-utils</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -28,4 +44,4 @@
         </dependency>
     </dependencies>
     
-</project>
+</project>
