java-kotlin.patch

diff --git a/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts b/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
index de5c5923529..7e7090e7319 100644
--- a/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
+++ b/build-logic/packaging/src/main/kotlin/gradlebuild.public-api-jar.gradle.kts
@@ -66,7 +66,7 @@ val task = tasks.register<Jar>("jarGradleApi") {
     }
     destinationDirectory = layout.buildDirectory.dir("public-api/gradle-api")
     // This is needed because of the duplicate package-info.class files
-    duplicatesStrategy = DuplicatesStrategy.WARN
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 // The consumable configuration containing the public Gradle API artifact
diff --git a/build-logic/uber-plugins/src/main/kotlin/gradlebuild.distribution-module.gradle.kts b/build-logic/uber-plugins/src/main/kotlin/gradlebuild.distribution-module.gradle.kts
index 0af7d7195b7..521d9d96f3d 100644
--- a/build-logic/uber-plugins/src/main/kotlin/gradlebuild.distribution-module.gradle.kts
+++ b/build-logic/uber-plugins/src/main/kotlin/gradlebuild.distribution-module.gradle.kts
@@ -41,7 +41,7 @@ val apiStubElements = configurations.consumable("apiStubElements") {
     }
 }
 
-pluginManager.withPlugin("gradlebuild.java-library") {
+pluginManager.withPlugin("gradlebuild.jvm-library") {
     val extractorClasspathConfig by configurations.creating
 
     dependencies {
@@ -56,7 +56,6 @@ pluginManager.withPlugin("gradlebuild.java-library") {
 
     configurations {
         named("apiStubElements") {
-            extendsFrom(configurations.compileOnlyApi.get())
             outgoing.artifact(extractJavaAbi)
         }
     }