diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle
index bbfd333b87..c1257077d0 100644
--- a/gradle/javadoc.gradle
+++ b/gradle/javadoc.gradle
@@ -36,16 +36,6 @@ javadoc {
         ]
         tags = [ "apiNote", 'implSpec', 'implNote', 'todo' ]
 
-        if ( JavaVersion.current().isJava11Compatible() ) {
-            //The need to set `--source 1.8` applies to all JVMs after 11, and also to 11
-            // but after excluding the first two builds; see also specific comments on
-            // https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762
-            // For now, let's be compatible with JDK 11.0.3+. We can improve on it if people
-            // complain they cannot build with JDK 11.0.0, 11.0.1 and 11.0.2.
-            System.out.println("Forcing Javadoc in Java 8 compatible mode");
-            options.source = gradle.ext.baselineJavaVersion
-        }
-
         addStringOption( 'Xdoclint:none', '-quiet' )
 
         tags(
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 95e9ba3464..cfec54a6e8 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -188,7 +188,7 @@ task copyBundleResources (type: Copy) {
 
 processTestResources {
     dependsOn copyBundleResources
-    duplicatesStrategy = DuplicatesStrategy.WARN
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 }
 
 sourcesJar {
diff --git a/release/release.gradle b/release/release.gradle
index 140a77849f..b6e4f02e6e 100644
--- a/release/release.gradle
+++ b/release/release.gradle
@@ -189,14 +189,6 @@ task aggregateJavadocs(type: Javadoc) {
                 'https://jakarta.ee/specifications/platform/8/apidocs/'
         ]
 
-        //The need to set `--source 1.8` applies to all JVMs after 11, and also to 11
-        // but after excluding the first two builds; see also specific comments on
-        // https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762
-        // For now, let's be compatible with JDK 11.0.3+. We can improve on it if people
-        // complain they cannot build with JDK 11.0.0, 11.0.1 and 11.0.2.
-        logger.lifecycle "Forcing Javadoc in Java 8 compatible mode"
-        options.source = gradle.ext.baselineJavaVersion
-
         options.addStringOption( 'Xdoclint:none', '-quiet' )
 
         if ( gradle.ext.javaToolchainEnabled ) {