File 0001-drop-setVendor-for-Java.patch of Package gradle

From d7ea9a961b6e0f8c8e06781a0a5850ffb91cef07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 21 Sep 2022 16:09:49 +0200
Subject: [PATCH 1/2] drop setVendor for Java
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Klaus Kämpf <kkaempf@suse.de>
---
 .../main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt    | 1 -
 build-logic-commons/settings.gradle.kts                        | 1 -
 build-logic-settings/build-environment/build.gradle.kts        | 1 -
 .../main/kotlin/gradlebuild.unittest-and-compile.gradle.kts    | 3 ---
 gradle/gradle-daemon-jvm.properties                            | 1 -
 .../src/snippets/java/toolchain-filters/groovy/build.gradle    | 1 -
 .../snippets/java/toolchain-filters/kotlin/build.gradle.kts    | 3 +--
 7 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/build-logic-commons/gradle-plugin/src/main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt b/build-logic-commons/gradle-plugin/src/main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt
index af146c4b68c..91080ac6dc1 100644
--- a/build-logic-commons/gradle-plugin/src/main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt
+++ b/build-logic-commons/gradle-plugin/src/main/kotlin/gradlebuild/commons/JavaPluginExtensions.kt
@@ -26,6 +26,5 @@ internal
 fun JavaPluginExtension.configureJavaToolChain() {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)
-        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
diff --git a/build-logic-commons/settings.gradle.kts b/build-logic-commons/settings.gradle.kts
index 32cf0e8dcd3..164bde1e65e 100644
--- a/build-logic-commons/settings.gradle.kts
+++ b/build-logic-commons/settings.gradle.kts
@@ -53,7 +53,6 @@ gradle.lifecycle.beforeProject {
             // if you change this java version please also consider changing .idea/misc.xml#project/component(@project-jdk-name}
             // Also, there are a lot of other places this should be changed.
             languageVersion = JavaLanguageVersion.of(17)
-            vendor = JvmVendorSpec.ADOPTIUM
         }
     }
 }
diff --git a/build-logic-settings/build-environment/build.gradle.kts b/build-logic-settings/build-environment/build.gradle.kts
index 937f609bcbe..24290fcee7b 100644
--- a/build-logic-settings/build-environment/build.gradle.kts
+++ b/build-logic-settings/build-environment/build.gradle.kts
@@ -25,6 +25,5 @@ group = "gradlebuild"
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(17)
-        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
diff --git a/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts b/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
index 79a3de3456e..787b1852c91 100644
--- a/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
+++ b/build-logic/jvm/src/main/kotlin/gradlebuild.unittest-and-compile.gradle.kts
@@ -122,7 +122,6 @@ fun configureCompileDefaults() {
 fun configureDefaultToolchain(toolchainVersion: Int) {
     java.toolchain {
         languageVersion = JavaLanguageVersion.of(toolchainVersion)
-        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
 
@@ -186,7 +185,6 @@ fun enforceJavaCompatibility(targetVersion: Provider<Int>, useRelease: Provider<
                     provider { JavaLanguageVersion.of(11) }
                 }
             }
-            vendor = JvmVendorSpec.ADOPTIUM
         }
     }
 
@@ -368,7 +366,6 @@ fun Test.configureJvmForTest() {
     jvmArgumentProviders.add(CiEnvironmentProvider(this))
     val launcher = project.javaToolchains.launcherFor {
         languageVersion = jvmVersionForTest()
-        vendor = project.testJavaVendor.orElse(JvmVendorSpec.ADOPTIUM)
     }
     javaLauncher = launcher
     if (jvmVersionForTest().canCompileOrRun(9)) {
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
index 36f5a898f8e..858feb7e383 100644
--- a/gradle/gradle-daemon-jvm.properties
+++ b/gradle/gradle-daemon-jvm.properties
@@ -1,3 +1,2 @@
 #This file is generated by updateDaemonJvm
-toolchainVendor=adoptium
 toolchainVersion=17
diff --git a/platforms/documentation/docs/src/snippets/java/toolchain-filters/groovy/build.gradle b/platforms/documentation/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
index 82d95a0e803..d62e4e7eaa4 100644
--- a/platforms/documentation/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
+++ b/platforms/documentation/docs/src/snippets/java/toolchain-filters/groovy/build.gradle
@@ -10,7 +10,6 @@ if (testToolchain == "knownVendor") {
 java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(11)
-        vendor = JvmVendorSpec.ADOPTIUM
     }
 }
 // end::toolchain-known-vendor[]
diff --git a/platforms/documentation/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts b/platforms/documentation/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
index 19934ab886a..669651f3765 100644
--- a/platforms/documentation/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
+++ b/platforms/documentation/docs/src/snippets/java/toolchain-filters/kotlin/build.gradle.kts
@@ -10,8 +10,7 @@ if (testToolchain == "knownVendor") {
 // tag::toolchain-known-vendor[]
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
-        vendor = JvmVendorSpec.ADOPTIUM
+        languageVersion.set(JavaLanguageVersion.of(11))
     }
 }
 // end::toolchain-known-vendor[]
-- 
2.47.1