Merge branch 'main' into HIBERNATE-40-improve-executeUpdate

Author: NathanQingyangXu

build.gradle.kts

@@ -144,19 +144,16 @@ class MultilineFormatter : Serializable {
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    options.errorprone {
-        disableWarningsInGeneratedCode.set(true)
-        option("NullAway:AnnotatedPackages", "com.mongodb.hibernate")
-    }
-}
-tasks.compileJava {
-    // The check defaults to a warning, bump it up to an error for the main sources
-    options.errorprone.error("NullAway")
     options.compilerArgs.addAll(listOf("-Xlint:deprecation", "-Werror"))
-}
-
-tasks.compileTestJava {
-    options.errorprone.isEnabled.set(false)
+    if (name == "compileJava") {
+        options.errorprone {
+            disableWarningsInGeneratedCode.set(true)
+            option("NullAway:AnnotatedPackages", "com.mongodb.hibernate")
+            error("NullAway")
+        }
+    } else {
+        options.errorprone.isEnabled.set(false)
+    }
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -189,5 +186,4 @@ dependencies {
     implementation(libs.hibernate.core)
     implementation(libs.mongo.java.driver.sync)
     implementation(libs.sl4j.api)
-}
-
+}