HHH-19283: Build with JDK 21 fix and logger cleanup

Author: VladoKuruc

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/enhance/EnhancementHelper.java

@@ -52,20 +52,20 @@ public static void enhance(
 		}
 		final Enhancer enhancer = generateEnhancer( classLoader, enhancementDsl );
 
-		discoverTypes( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations() );
-		doEnhancement( classesDir, classesDir, enhancer, logger, ormDsl.getFileOperations(), classesToEnhance );
+		discoverTypes( classesDir, classesDir, enhancer, ormDsl.getFileOperations() );
+		doEnhancement( classesDir, classesDir, enhancer, ormDsl.getFileOperations(), classesToEnhance );
 	}
 
-	private static void discoverTypes(File classesDir, File dir, Enhancer enhancer, Logger logger, FileOperations fileOperations) {
+	private static void discoverTypes(File classesDir, File dir, Enhancer enhancer, FileOperations fileOperations) {
 		for ( File subLocation : dir.listFiles() ) {
 			if ( subLocation.isDirectory() ) {
-				discoverTypes( classesDir, subLocation, enhancer, logger, fileOperations );
+				discoverTypes( classesDir, subLocation, enhancer, fileOperations );
 			}
 			else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
 				final String className = determineClassName( classesDir, subLocation );
 				final long lastModified = subLocation.lastModified();
 
-				discoverTypes( subLocation, className, enhancer, logger );
+				discoverTypes( subLocation, className, enhancer);
 
 				final boolean timestampReset = subLocation.setLastModified( lastModified );
 				if ( !timestampReset ) {
@@ -76,10 +76,10 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
 		}
 	}
 
-	private static void doEnhancement(File classesDir, File dir, Enhancer enhancer, Logger logger, FileOperations fileOperations, List<String> classesToEnhance) {
+	private static void doEnhancement(File classesDir, File dir, Enhancer enhancer, FileOperations fileOperations, List<String> classesToEnhance) {
 		for ( File subLocation : dir.listFiles() ) {
 			if ( subLocation.isDirectory() ) {
-				doEnhancement( classesDir, subLocation, enhancer, logger, fileOperations, classesToEnhance );
+				doEnhancement( classesDir, subLocation, enhancer, fileOperations, classesToEnhance );
 			}
 			else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
 				final String className = determineClassName( classesDir, subLocation );
@@ -89,7 +89,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
 					continue;
 				}
 
-				enhance( subLocation, className, enhancer, logger );
+				enhance( subLocation, className, enhancer );
 
 				final boolean timestampReset = subLocation.setLastModified( lastModified );
 				if ( !timestampReset ) {
@@ -103,8 +103,7 @@ else if ( subLocation.isFile() && subLocation.getName().endsWith( ".class" ) ) {
 	private static void discoverTypes(
 			File javaClassFile,
 			String className,
-			Enhancer enhancer,
-			Logger logger) {
+			Enhancer enhancer) {
 		try {
 			enhancer.discoverTypes( className, Files.readAllBytes( javaClassFile.toPath() ) );
 			logger.info( "Successfully discovered types for class : " + className );
@@ -117,11 +116,10 @@ private static void discoverTypes(
 	private static void enhance(
 			File javaClassFile,
 			String className,
-			Enhancer enhancer,
-			Logger logger) {
+			Enhancer enhancer) {
 		final byte[] enhancedBytecode = doEnhancement( javaClassFile, className, enhancer );
 		if ( enhancedBytecode != null ) {
-			writeOutEnhancedClass( enhancedBytecode, javaClassFile, logger );
+			writeOutEnhancedClass( enhancedBytecode, javaClassFile );
 			logger.info( "Successfully enhanced class : " + className );
 		}
 		else {
@@ -176,7 +174,7 @@ public boolean doExtendedEnhancement(UnloadedClass classDescriptor) {
 		return buildDefaultBytecodeProvider().getEnhancer( enhancementContext );
 	}
 
-	private static void writeOutEnhancedClass(byte[] enhancedBytecode, File file, Logger logger) {
+	private static void writeOutEnhancedClass(byte[] enhancedBytecode, File file) {
 		try {
 			if ( file.delete() ) {
 				if ( !file.createNewFile() ) {

tooling/hibernate-gradle-plugin/src/test/resources/projects/simple-kotlin/build.gradle

@@ -24,6 +24,18 @@ dependencies {
     implementation 'org.hibernate.orm:hibernate-core:6.1.0.Final'
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+        freeCompilerArgs += ["-Xjdk-release=17"]
+    }
+}
+
 hibernate {
     useSameVersion = false
     enhancement {