From 3f2a4947a78a125f9c6817586cd6818d042f610e Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Fri, 17 Apr 2020 08:56:43 +0100
Subject: [PATCH] HHH-13952 Remove dependency to Arquillian as its no longer
 used

---
 gradle/java-module.gradle            | 1 -
 gradle/libraries.gradle              | 8 +-------
 hibernate-core/hibernate-core.gradle | 8 +-------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 0b7b1b14b1..4e8cfdbe73 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -197,7 +197,6 @@ processTestResources {
 		copy {
 			from file( 'src/test/resources' )
 			into file( "${buildDir}/resources/test" )
-			exclude 'src/test/resources/arquillian.xml'
 			exclude 'src/test/resources/hibernate.properties'
 		}
 		copy {
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index bf581dce56..aac04d3f91 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -33,10 +33,8 @@ ext {
 
     // Wildfly version targeted by the custom Jipijapa build
     wildflyVersion = '17.0.1.Final'
-    arquillianVersion = '1.4.1.Final'
     shrinkwrapVersion = '1.2.6'
     shrinkwrapDescriptorsVersion = '2.0.0'
-    wildflyArquillianContainerVersion = '2.2.0.Final'
 
     jodaTimeVersion = '2.3'
 
@@ -154,17 +152,13 @@ ext {
 
             assertj: "org.assertj:assertj-core:${assertjVersion}",
 
-            // Arquillian/Shrinkwrap
-            arquillian_junit_container: "org.jboss.arquillian.junit:arquillian-junit-container:${arquillianVersion}",
-            arquillian_protocol_servlet: "org.jboss.arquillian.protocol:arquillian-protocol-servlet:${arquillianVersion}",
-
+            // Shrinkwrap
             shrinkwrap_api: "org.jboss.shrinkwrap:shrinkwrap-api:${shrinkwrapVersion}",
             shrinkwrap: "org.jboss.shrinkwrap:shrinkwrap-impl-base:${shrinkwrapVersion}",
 
             shrinkwrap_descriptors_api_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-api-javaee:${shrinkwrapDescriptorsVersion}",
             shrinkwrap_descriptors_impl_javaee: "org.jboss.shrinkwrap.descriptors:shrinkwrap-descriptors-impl-javaee:${shrinkwrapDescriptorsVersion}",
 
-            wildfly_arquillian_container_managed: "org.wildfly.arquillian:wildfly-arquillian-container-managed:${wildflyArquillianContainerVersion}",
             jboss_vfs: "org.jboss:jboss-vfs:3.2.11.Final",
             jipijapa_spi: "org.wildfly:jipijapa-spi:${wildflyVersion}",
             wildfly_transaction_client : 'org.wildfly.transaction:wildfly-transaction-client:1.1.7.Final',
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index fb7753b20a..9ebf39b72f 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -95,10 +95,7 @@ dependencies {
     testCompile( libraries.jodaTime )
     testCompile( libraries.assertj )
 
-    testCompile( libraries.cdi ) {
-        // we need to force it to make sure we influence the one coming from arquillian
-        force=true
-    }
+    testCompile( libraries.cdi )
 
     testCompile( libraries.validator ) {
         // for test runtime
@@ -120,11 +117,8 @@ dependencies {
 
     testAnnotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
-    testCompile libraries.arquillian_junit_container
-    testCompile libraries.arquillian_protocol_servlet
     testCompile libraries.shrinkwrap_descriptors_api_javaee
     testCompile libraries.shrinkwrap_descriptors_impl_javaee
-    testCompile libraries.wildfly_arquillian_container_managed
 
     testCompile libraries.jboss_ejb_spec_jar
     testCompile libraries.jboss_annotation_spec_jar