[RESTEASY-1840] Sync surefire version in whole TS, extract versions t…

…o common version dependencies pom * Downgrading to 2.18.1 version of surefire fixes the hpux crash issue * Extract depedency versions from microprofile-tck testsuite module into shared dependency file and unify the surefire version used. * Update arquillian bom
resteasy · Apr 6, 2018 · 02fafe1 · 02fafe1
1 parent a941061
commit 02fafe1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -59,7 +59,7 @@
         <version.org.infinispan>8.2.8.Final</version.org.infinispan>
         <version.org.jacoco>0.7.9</version.org.jacoco>
         <version.org.javassist>3.20.0-GA</version.org.javassist>
-        <org.jboss.arquillian.container>2.0.0.Beta5</org.jboss.arquillian.container>
+        <version.org.jboss.arquillian.container.arquillian-weld-embedded>2.0.0.Beta5</version.org.jboss.arquillian.container.arquillian-weld-embedded>
         <version.org.jboss.logging.jboss-logging>3.3.1.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.logging.jboss-logging-annotations>2.1.0.Final</version.org.jboss.logging.jboss-logging-annotations>
         <version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.0.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
@@ -146,12 +146,6 @@
                 <version>${version.com.fasterxml.classmate}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.arquillian.container</groupId>
-                <artifactId>arquillian-weld-embedded</artifactId>
-                <version>${org.jboss.arquillian.container}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>
@@ -561,6 +555,11 @@
             </dependency>
 
             <!-- testsuite dependencies -->
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock</artifactId>
+                <version>${version.com.github.tomakehurst.wiremock}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jacoco</groupId>
                 <artifactId>org.jacoco.ant</artifactId>
@@ -587,6 +586,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.arquillian.container</groupId>
+                <artifactId>arquillian-weld-embedded</artifactId>
+                <version>${version.org.jboss.arquillian.container.arquillian-weld-embedded}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.jms</groupId>
                 <artifactId>jboss-jms-api_2.0_spec</artifactId>
@@ -726,6 +730,11 @@
                 <artifactId>weld-se</artifactId>
                 <version>${version.weld}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.weld.se</groupId>
+                <artifactId>weld-se-core</artifactId>
+                <version>${version.org.jboss.weld.se.weld-se-core}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.core</groupId>
                 <artifactId>wildfly-cli</artifactId>

diff --git a/testsuite/microprofile-tck/pom.xml b/testsuite/microprofile-tck/pom.xml
@@ -88,6 +88,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -159,18 +160,16 @@
             </goals>
             <configuration>
               <dependenciesToScan>
-              <dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
+                <dependency>org.eclipse.microprofile.rest.client:microprofile-rest-client-tck</dependency>
               </dependenciesToScan>
               <excludes>
-
                 <!--
                   the dependency on MP config in the resteasy client is not desireable
                   this requires further thought
                 -->
                 <exclude>**/DefaultExceptionMapperConfigTest.java</exclude>
 
                 <!-- Challenged, see  https://github.com/eclipse/microprofile-rest-client/pull/69 -->
-                <!--<exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonPProviderTest</exclude>-->
                 <exclude>**/InvokeWithJsonPProviderTest.java</exclude>
                 <exclude>**/InvokeWithBuiltProvidersTest.java</exclude>
                 <exclude>**/InvokeWithRegisteredProvidersTest.java</exclude>