HHH-13952 Remove our ability to build the Wildfly feature pack and ru…

…n integration tests on WildFly
hibernate · Apr 17, 2020 · 2b279c6 · 2b279c6
1 parent 95c9526
commit 2b279c6
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 908 deletions.
diff --git a/build.gradle b/build.gradle
@@ -55,8 +55,8 @@ task release {
 			"the fact that subprojects will appropriately define a release task " +
 			"themselves if they have any release-related activities to perform"
 
-	// Force to release with JDK 8. Releasing with JDK 11 is not supported yet:
-	// - the hibernate-orm-modules tests do not run due to an issue with the ASM version currently used by Gradle
+	// Force to release with JDK 8. It used to not work on JDK11 because of the hibernate-orm-modules module,
+	// but this limitation might be resolved now that this module has been deleted?
 	doFirst {
 		if ( !JavaVersion.current().isJava8() || !gradle.ext.testedJavaVersionAsEnum.isJava8() ) {
 			throw new IllegalStateException( "Please use JDK 8 to perform the release." )

diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
@@ -15,7 +15,6 @@ ext {
 			'hibernate-infinispan',
 			'hibernate-ehcache',
 			'hibernate-java8',
-			'hibernate-orm-modules',
 			'hibernate-integrationtest-java-modules',
 			'release'
 	]

diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
@@ -245,17 +245,11 @@ processTestResources {
         copy {
             from file( 'src/test/resources' )
             into file( "${buildDir}/resources/test" )
-            include 'arquillian.xml'
             include 'org/hibernate/test/wf/ddl/manifest.mf'
-            expand wildFlyInstallDir: project( ':hibernate-orm-modules' ).wildFlyInstallDir,
-                   hibernateMajorMinorVersion: "${project.ormVersion.family}",
-                   arquillianDeploymentExportDir: "${rootProject.buildDir.absolutePath}/arquillian-deployments"
         }
     }
 }
 
-test.dependsOn ':hibernate-orm-modules:prepareWildFlyForTests'
-
 test {
     systemProperty 'file.encoding', 'utf-8'
     beforeTest { descriptor ->

diff --git a/hibernate-core/src/test/resources/arquillian.xml b/hibernate-core/src/test/resources/arquillian.xml
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
diff --git a/hibernate-orm-modules/module-templates/byte-buddy.xml b/hibernate-orm-modules/module-templates/byte-buddy.xml
diff --git a/hibernate-orm-modules/module-templates/hibernate-core-alias.xml b/hibernate-orm-modules/module-templates/hibernate-core-alias.xml
diff --git a/hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml b/hibernate-orm-modules/module-templates/hibernate-core-old-deprecated.xml
diff --git a/hibernate-orm-modules/module-templates/hibernate-core.xml b/hibernate-orm-modules/module-templates/hibernate-core.xml
diff --git a/hibernate-orm-modules/module-templates/hibernate-envers-alias.xml b/hibernate-orm-modules/module-templates/hibernate-envers-alias.xml
diff --git a/hibernate-orm-modules/module-templates/hibernate-envers.xml b/hibernate-orm-modules/module-templates/hibernate-envers.xml
diff --git a/hibernate-orm-modules/module-templates/jipijapa-alias.xml b/hibernate-orm-modules/module-templates/jipijapa-alias.xml