[tomee] branch tomee-7.1.x updated: Fix Arquillian test failures

[jgallimore]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-7.1.x by this push:
     new 7f1b19e  Fix Arquillian test failures
7f1b19e is described below

commit 7f1b19e36b5427b1e31a1953dcb8230ea90892be
Author: Jonathan Gallimore <j...@jrg.me.uk>
AuthorDate: Sun Jul 12 08:53:16 2020 +0100

    Fix Arquillian test failures
---
 .../arquillian-tomee-webprofile-tests/pom.xml      | 40 ----------------------
 .../arquillian/tests/hibernate/HibernateTest.java  |  8 ++---
 arquillian/arquillian-tomee-tests/pom.xml          |  2 +-
 3 files changed, 5 insertions(+), 45 deletions(-)

diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index 7236362..309e691 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -45,46 +45,6 @@
       <version>1.9.5</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <version>4.1.12.Final</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hibernate.javax.persistence</groupId>
-          <artifactId>hibernate-jpa-2.0-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.jboss.spec.javax.transaction</groupId>
-          <artifactId>jboss-transaction-api_1.1_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>4.3.1.Final</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.validation</groupId>
-          <artifactId>validation-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <version>3.1.0.GA</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
 
   <build>
diff --git 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
index 8c5094d..2cdd4ad 100644
--- 
a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
+++ 
b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/hibernate/HibernateTest.java
@@ -47,15 +47,15 @@ public class HibernateTest {
     public static WebArchive war() {
         File[] hibernate;
         try { // try offline first since it is generally faster
-            hibernate = Maven.resolver()
-                    .offline(true)
+            hibernate = Maven.configureResolver()
+                    .workOffline()
                     .loadPomFromFile("src/test/resources/hibernate-pom.xml")
-                    
.importRuntimeAndTestDependencies().resolve().withTransitivity()
+                    
.importCompileAndRuntimeDependencies().resolve().withTransitivity()
                     .asFile();
         } catch (ResolutionException re) { // try on central
             hibernate = Maven.resolver()
                     .loadPomFromFile("src/test/resources/hibernate-pom.xml")
-                    
.importRuntimeAndTestDependencies().resolve().withTransitivity()
+                    
.importCompileAndRuntimeDependencies().resolve().withTransitivity()
                     .asFile();
         }
 
diff --git a/arquillian/arquillian-tomee-tests/pom.xml 
b/arquillian/arquillian-tomee-tests/pom.xml
index bf4ea6b..375d962 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
       <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-      <version>2.0.0</version>
+      <version>2.2.7</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>