From cc6fe84f30bd0250f0bde65078bf915db5939350 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Wed, 26 May 2021 14:24:51 +0200
Subject: [PATCH] HHH-14640 : Fix gradle errors

---
 build.gradle                                       |  1 +
 documentation/documentation.gradle                 |  2 +-
 gradle/base-information.gradle                     |  0
 gradle/java-module.gradle                          | 13 ++++++-------
 hibernate-core/hibernate-core.gradle               |  3 ---
 hibernate-envers/hibernate-envers.gradle           |  2 +-
 hibernate-orm-modules/hibernate-orm-modules.gradle |  4 +---
 7 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 gradle/base-information.gradle

diff --git a/build.gradle b/build.gradle
index 90d7553f63..bd5d4105b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ File versionFile = file( "${rootProject.projectDir}/gradle/version.properties" )
 
 ext {
 	ormVersionFile = versionFile
+	baselineJavaVersion = '1.8'
 	ormVersion = HibernateVersion.fromFile( versionFile, project )
 	// Override during releases
 	if ( project.hasProperty( 'releaseVersion' ) ) {
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 8647e2deaf..3aba0f2345 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -40,7 +40,7 @@ dependencies {
 
 	compile( libraries.jpa )
 	compile( project( ':hibernate-core' ) )
-	compile( project( ':hibernate-jpamodelgen' ) )
+	annotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
 	testCompile( 'org.apache.commons:commons-lang3:3.4' )
 
diff --git a/gradle/base-information.gradle b/gradle/base-information.gradle
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 3df1fd5e45..fa66f6a0b4 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -217,13 +217,12 @@ test {
 
 // Enable the experimental features of ByteBuddy with JDK 15+
 test {
-	if ( Integer.valueOf( gradle.ext.testedJavaVersionAsEnum.getMajorVersion() ) >= 15 ) {
-		if ( JavaVersion.current().isJava11Compatible() ) {
-			int majorJVMVersionInt = Integer.valueOf(JavaVersion.current().toString());
-			//Set the -Dnet.bytebuddy.experimental=true property only when we need it:
-			if (majorJVMVersionInt >= 12) {
-				systemProperty 'net.bytebuddy.experimental', true
-			}
+	if ( JavaVersion.current().isJava11Compatible() ) {
+		int majorJVMVersionInt = Integer.valueOf( JavaVersion.current().toString() );
+		//Set the -Dnet.bytebuddy.experimental=true property only when we need it:
+		if ( majorJVMVersionInt >= 12 ) {
+			systemProperty 'net.bytebuddy.experimental', true
+		}
 	}
 }
 
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index a819188ff8..f5d824d9d8 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -93,7 +93,6 @@ dependencies {
     testCompile( libraries.mockito )
     testCompile( libraries.mockito_inline )
     testCompile( libraries.jodaTime )
-    testCompile( libraries.assertj )
 
     testCompile( libraries.cdi ) {
         // we need to force it to make sure we influence the one coming from arquillian
@@ -114,8 +113,6 @@ dependencies {
     testRuntime( libraries.javassist )
     testRuntime( libraries.byteBuddy )
     testRuntime( libraries.weld )
-    testRuntime( libraries.atomikos )
-    testRuntime( libraries.atomikos_jta )
     testRuntime(libraries.wildfly_transaction_client)
 
     testAnnotationProcessor( project( ':hibernate-jpamodelgen' ) )
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
index 80483b760e..9d97794a3f 100644
--- a/hibernate-envers/hibernate-envers.gradle
+++ b/hibernate-envers/hibernate-envers.gradle
@@ -17,7 +17,7 @@ dependencies {
     }
 
     provided( libraries.ant )
-    provided( project( ':hibernate-jpamodelgen' ) )
+    annotationProcessor( project( ':hibernate-jpamodelgen' ) )
 
     testCompile( project( ':hibernate-testing' ) )
     testCompile( project( path: ':hibernate-core', configuration: 'tests' ) )
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index 11c9cb46b6..c84597d972 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -12,7 +12,6 @@ plugins {
 
 
 
-apply from: rootProject.file( 'gradle/base-information.gradle' )
 apply plugin: 'java'
 apply from: rootProject.file( 'gradle/libraries.gradle' )
 
@@ -30,7 +29,6 @@ ext {
 description = "Feature Pack of Hibernate ORM modules for WildFly ${project.wildFlyMajorVersion}"
 
 apply plugin: 'maven-publish'
-apply plugin: 'org.hibernate.build.maven-repo-auth'
 apply from: rootProject.file( 'gradle/publishing-repos.gradle' )
 apply from: rootProject.file( 'gradle/publishing-pom.gradle' )
 
@@ -132,7 +130,7 @@ publishing {
 }
 
 task ciBuild( dependsOn: [clean, test, publish] )
-task release( dependsOn: [clean, test, bintrayUpload] )
+task release( dependsOn: [clean, test, publishToSonatype] )
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // tasks related to in-container (Arquillian + WF) testing