From 75a946e6d41cdd700a7772b134cc370683cd1aaf Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Fri, 22 Nov 2024 14:32:57 +0100
Subject: [PATCH 01/14] java versions

---
 .../gradle/jdks/GradleJdkTestUtils.groovy     |  4 ++-
 .../jdks/JdkDistributionConfigurator.java     |  8 ++++--
 .../palantir/gradle/jdks/JdksExtension.java   | 11 ++++++++
 .../jdks/GradleJdkIntegrationSpec.groovy      |  4 +++
 .../GradleJdkToolchainsIntegrationTest.groovy | 25 +++++++++++++++++++
 5 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy b/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
index e3c5d455..33ed20cc 100644
--- a/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
+++ b/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
@@ -97,7 +97,7 @@ class GradleJdkTestUtils {
                 .stripIndent(true)
     }
 
-    static setupJdksHardcodedVersions(File settingsFile, File buildFile, String daemonJdkVersion = DAEMON_MAJOR_VERSION_11) {
+    static setupJdksHardcodedVersions(File settingsFile, File buildFile, String daemonJdkVersion = DAEMON_MAJOR_VERSION_11, boolean onlyIncludeDaemonJdk = false) {
 
         applyJdksPlugins(settingsFile, buildFile)
 
@@ -120,6 +120,7 @@ class GradleJdkTestUtils {
                }
                
                daemonTarget = DAEMON_MAJOR_VERSION_11
+               daemonJdkOnly = DAEMON_JDK_ONLY
             }
         """.replace("JDK_11_DISTRO", quoted(JDK_11.getLeft()))
                 .replace("JDK_11_VERSION", quoted(JDK_11.getRight()))
@@ -128,6 +129,7 @@ class GradleJdkTestUtils {
                 .replace("JDK_21_DISTRO", quoted(JDK_21.getLeft()))
                 .replace("JDK_21_VERSION", quoted(JDK_21.getRight()))
                 .replace("DAEMON_MAJOR_VERSION_11", quoted(daemonJdkVersion))
+                .replace("DAEMON_JDK_ONLY", onlyIncludeDaemonJdk.toString())
                 .stripIndent(true)
     }
 
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
index 6408069f..29080092 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
@@ -38,8 +38,12 @@ public final class JdkDistributionConfigurator {
 
     public static Map<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros(
             Project project, JdkDistributions jdkDistributions, JdksExtension jdksExtension) {
-        Set<JavaLanguageVersion> javaVersions = Arrays.stream(JavaVersion.values())
-                .map(javaVersion -> JavaLanguageVersion.of(javaVersion.getMajorVersion()))
+        Stream<JavaLanguageVersion> requestedJavaVersions =
+                jdksExtension.getDaemonJdkOnly().get()
+                        ? Stream.of(jdksExtension.getDaemonTarget().get())
+                        : Arrays.stream(JavaVersion.values())
+                                .map(javaVersion -> JavaLanguageVersion.of(javaVersion.getMajorVersion()));
+        Set<JavaLanguageVersion> javaVersions = requestedJavaVersions
                 .filter(javaLanguageVersion -> javaLanguageVersion.canCompileOrRun(MINIMUM_SUPPORTED_JAVA_VERSION))
                 .collect(Collectors.toSet());
         return javaVersions.stream()
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
index 687fee6d..57461704 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
@@ -36,6 +36,7 @@ public abstract class JdksExtension {
     private final MapProperty<String, String> caCerts;
     private final DirectoryProperty jdkStorageLocation;
     private final Property<JavaLanguageVersion> daemonTarget;
+    private final Property<Boolean> daemonJdkOnly;
 
     @Inject
     protected abstract ObjectFactory getObjectFactory();
@@ -57,9 +58,11 @@ public JdksExtension() {
         this.jdkStorageLocation = SynchronizedInterface.synchronizeAllInterfaceMethods(
                 DirectoryProperty.class, getObjectFactory().directoryProperty());
         this.daemonTarget = getObjectFactory().property(JavaLanguageVersion.class);
+        this.daemonJdkOnly = getObjectFactory().property(Boolean.class);
         this.getCaCerts().finalizeValueOnRead();
         this.getJdkStorageLocation().finalizeValueOnRead();
         this.getDaemonTarget().finalizeValueOnRead();
+        this.getDaemonJdkOnly().finalizeValueOnRead();
     }
 
     public final Property<JavaLanguageVersion> getDaemonTarget() {
@@ -74,6 +77,14 @@ public final void setDaemonTarget(int value) {
         getDaemonTarget().set(JavaLanguageVersion.of(value));
     }
 
+    public final Property<Boolean> getDaemonJdkOnly() {
+        return daemonJdkOnly;
+    }
+
+    public final void setDaemonJdkOnly(Boolean value) {
+        getDaemonJdkOnly().set(value);
+    }
+
     public final MapProperty<String, String> getCaCerts() {
         return caCerts;
     }
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
index be25aa72..8145f4b7 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
@@ -36,6 +36,10 @@ abstract class GradleJdkIntegrationSpec extends IntegrationSpec {
         GradleJdkTestUtils.setupJdksHardcodedVersions(settingsFile, buildFile, daemonTarget)
     }
 
+    def setupJdksHardcodedVersions(String daemonTarget, boolean onlyDaemonJdk) {
+        GradleJdkTestUtils.setupJdksHardcodedVersions(settingsFile, buildFile, daemonTarget, onlyDaemonJdk)
+    }
+
     def applyApplicationPlugin() {
         GradleJdkTestUtils.applyApplicationPlugin(buildFile)
     }
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 0a05c0e9..bcda0031 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -21,9 +21,11 @@ import com.palantir.gradle.jdks.setup.common.CurrentOs
 import org.apache.commons.lang3.tuple.Pair
 import spock.lang.TempDir
 
+import java.nio.file.Files
 import java.nio.file.Path
 import java.util.regex.Matcher
 import java.util.regex.Pattern
+import java.util.stream.Collectors
 
 class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
 
@@ -156,6 +158,9 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         Path daemonJvm = workingDir().resolve("gradle-jdks").resolve(daemonJdkFileName).toAbsolutePath()
         gradleHomeOutput.contains("java.home: ${daemonJvm}")
 
+        then: 'generates directories for all jdk versions'
+        Files.list(projectDir.toPath().resolve("gradle/jdks")).map {it -> it.getFileName()}.collect(Collectors.toList()).equals(List.of("11", "17", "21"))
+
         when: 'compiling projects'
         def output = runGradlewTasksSuccessfully("compileJava", "--info")
 
@@ -175,6 +180,26 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         gradleVersionNumber << GRADLE_TEST_VERSIONS
     }
 
+
+    def '#gradleVersionNumber: only generates daemon jdk'() {
+        gradleVersion = gradleVersionNumber
+        setupJdksHardcodedVersions('11', true)
+        applyBaselineJavaVersions()
+        applyApplicationPlugin()
+
+        file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
+        file('src/main/java/Main.java') << java17PreviewCode
+
+        when:
+        runTasksSuccessfully('wrapper')
+
+        then: 'only jdk 11 is generated'
+        Files.list(projectDir.toPath().resolve("gradle/jdks")).allMatch { it -> it.endsWith("gradle/jdks/11")}
+
+        where:
+        gradleVersionNumber << GRADLE_TEST_VERSIONS
+    }
+
     def '#gradleVersionNumber: fails if the jdk version is not configured'() {
         setupJdksHardcodedVersions()
         applyBaselineJavaVersions()

From 7a71212ecb8991cfb85813dbd09161f5e106b088 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Fri, 22 Nov 2024 14:45:06 +0100
Subject: [PATCH 02/14] default ot false

---
 .../src/main/java/com/palantir/gradle/jdks/JdksExtension.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
index 57461704..3c656e7b 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
@@ -62,7 +62,7 @@ public JdksExtension() {
         this.getCaCerts().finalizeValueOnRead();
         this.getJdkStorageLocation().finalizeValueOnRead();
         this.getDaemonTarget().finalizeValueOnRead();
-        this.getDaemonJdkOnly().finalizeValueOnRead();
+        this.getDaemonJdkOnly().convention(false);
     }
 
     public final Property<JavaLanguageVersion> getDaemonTarget() {

From 48ec4979f0ec420e9eda314140732eb151674ef8 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Fri, 22 Nov 2024 14:56:47 +0100
Subject: [PATCH 03/14] .

---
 .../gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index bcda0031..93b32a6a 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -159,7 +159,7 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         gradleHomeOutput.contains("java.home: ${daemonJvm}")
 
         then: 'generates directories for all jdk versions'
-        Files.list(projectDir.toPath().resolve("gradle/jdks")).map {it -> it.getFileName()}.collect(Collectors.toList()).equals(List.of("11", "17", "21"))
+        Files.list(projectDir.toPath().resolve("gradle/jdks")).map { it -> it.getFileName().toString() }.collect(Collectors.toList()).containsAll(List.of("11", "17", "21"))
 
         when: 'compiling projects'
         def output = runGradlewTasksSuccessfully("compileJava", "--info")

From 7a57614147a0e219dea9738dd62403d777d43e31 Mon Sep 17 00:00:00 2001
From: svc-changelog <svc-changelog@palantir.com>
Date: Fri, 22 Nov 2024 14:17:20 +0000
Subject: [PATCH 04/14] Add generated changelog entries

---
 changelog/@unreleased/pr-472.v2.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelog/@unreleased/pr-472.v2.yml

diff --git a/changelog/@unreleased/pr-472.v2.yml b/changelog/@unreleased/pr-472.v2.yml
new file mode 100644
index 00000000..8706d883
--- /dev/null
+++ b/changelog/@unreleased/pr-472.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Add `daemonJdkOnly ` property for gradle jdk directory generation
+  links:
+  - https://github.com/palantir/gradle-jdks/pull/472

From dbc81da13f9cdd4a42d30542e9590414181c326d Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 11:47:21 +0100
Subject: [PATCH 05/14] address comments

---
 .../gradle/jdks/GradleJdkTestUtils.groovy     |  4 +--
 .../jdks/JdkDistributionConfigurator.java     |  8 +-----
 .../palantir/gradle/jdks/JdksExtension.java   | 26 ++++++++++++++-----
 .../jdks/GradleJdkIntegrationSpec.groovy      |  4 ---
 .../GradleJdkToolchainsIntegrationTest.groovy |  9 ++++++-
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy b/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
index 33ed20cc..e3c5d455 100644
--- a/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
+++ b/gradle-jdks-test-common/src/main/groovy/com/palantir/gradle/jdks/GradleJdkTestUtils.groovy
@@ -97,7 +97,7 @@ class GradleJdkTestUtils {
                 .stripIndent(true)
     }
 
-    static setupJdksHardcodedVersions(File settingsFile, File buildFile, String daemonJdkVersion = DAEMON_MAJOR_VERSION_11, boolean onlyIncludeDaemonJdk = false) {
+    static setupJdksHardcodedVersions(File settingsFile, File buildFile, String daemonJdkVersion = DAEMON_MAJOR_VERSION_11) {
 
         applyJdksPlugins(settingsFile, buildFile)
 
@@ -120,7 +120,6 @@ class GradleJdkTestUtils {
                }
                
                daemonTarget = DAEMON_MAJOR_VERSION_11
-               daemonJdkOnly = DAEMON_JDK_ONLY
             }
         """.replace("JDK_11_DISTRO", quoted(JDK_11.getLeft()))
                 .replace("JDK_11_VERSION", quoted(JDK_11.getRight()))
@@ -129,7 +128,6 @@ class GradleJdkTestUtils {
                 .replace("JDK_21_DISTRO", quoted(JDK_21.getLeft()))
                 .replace("JDK_21_VERSION", quoted(JDK_21.getRight()))
                 .replace("DAEMON_MAJOR_VERSION_11", quoted(daemonJdkVersion))
-                .replace("DAEMON_JDK_ONLY", onlyIncludeDaemonJdk.toString())
                 .stripIndent(true)
     }
 
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
index 29080092..89f5c801 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
@@ -38,12 +37,7 @@ public final class JdkDistributionConfigurator {
 
     public static Map<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros(
             Project project, JdkDistributions jdkDistributions, JdksExtension jdksExtension) {
-        Stream<JavaLanguageVersion> requestedJavaVersions =
-                jdksExtension.getDaemonJdkOnly().get()
-                        ? Stream.of(jdksExtension.getDaemonTarget().get())
-                        : Arrays.stream(JavaVersion.values())
-                                .map(javaVersion -> JavaLanguageVersion.of(javaVersion.getMajorVersion()));
-        Set<JavaLanguageVersion> javaVersions = requestedJavaVersions
+        Set<JavaLanguageVersion> javaVersions = jdksExtension.getJdkMajorVersionsToUse().get().stream()
                 .filter(javaLanguageVersion -> javaLanguageVersion.canCompileOrRun(MINIMUM_SUPPORTED_JAVA_VERSION))
                 .collect(Collectors.toSet());
         return javaVersions.stream()
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
index 3c656e7b..19c00bac 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
@@ -20,14 +20,20 @@
 import com.palantir.gradle.utils.lazilyconfiguredmapping.LazilyConfiguredMapping;
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 import javax.inject.Inject;
 import org.gradle.api.Action;
+import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 public abstract class JdksExtension {
@@ -36,7 +42,7 @@ public abstract class JdksExtension {
     private final MapProperty<String, String> caCerts;
     private final DirectoryProperty jdkStorageLocation;
     private final Property<JavaLanguageVersion> daemonTarget;
-    private final Property<Boolean> daemonJdkOnly;
+    private final SetProperty<JavaLanguageVersion> jdkMajorVersionsToUse;
 
     @Inject
     protected abstract ObjectFactory getObjectFactory();
@@ -58,11 +64,13 @@ public JdksExtension() {
         this.jdkStorageLocation = SynchronizedInterface.synchronizeAllInterfaceMethods(
                 DirectoryProperty.class, getObjectFactory().directoryProperty());
         this.daemonTarget = getObjectFactory().property(JavaLanguageVersion.class);
-        this.daemonJdkOnly = getObjectFactory().property(Boolean.class);
+        this.jdkMajorVersionsToUse = getObjectFactory().setProperty(JavaLanguageVersion.class);
+        this.jdkMajorVersionsToUse.convention(Arrays.stream(JavaVersion.values())
+                .map(javaVersion -> JavaLanguageVersion.of(javaVersion.getMajorVersion()))
+                .collect(Collectors.toSet()));
         this.getCaCerts().finalizeValueOnRead();
         this.getJdkStorageLocation().finalizeValueOnRead();
         this.getDaemonTarget().finalizeValueOnRead();
-        this.getDaemonJdkOnly().convention(false);
     }
 
     public final Property<JavaLanguageVersion> getDaemonTarget() {
@@ -77,12 +85,16 @@ public final void setDaemonTarget(int value) {
         getDaemonTarget().set(JavaLanguageVersion.of(value));
     }
 
-    public final Property<Boolean> getDaemonJdkOnly() {
-        return daemonJdkOnly;
+    public final SetProperty<JavaLanguageVersion> getJdkMajorVersionsToUse() {
+        return this.jdkMajorVersionsToUse;
     }
 
-    public final void setDaemonJdkOnly(Boolean value) {
-        getDaemonJdkOnly().set(value);
+    public final void setJdkMajorVersionsToUse(List<JavaLanguageVersion> javaLanguageVersions) {
+        this.jdkMajorVersionsToUse.set(javaLanguageVersions);
+    }
+
+    public final void daemonJdkOnly() {
+        this.jdkMajorVersionsToUse.set(daemonTarget.map(Set::of));
     }
 
     public final MapProperty<String, String> getCaCerts() {
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
index 8145f4b7..be25aa72 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkIntegrationSpec.groovy
@@ -36,10 +36,6 @@ abstract class GradleJdkIntegrationSpec extends IntegrationSpec {
         GradleJdkTestUtils.setupJdksHardcodedVersions(settingsFile, buildFile, daemonTarget)
     }
 
-    def setupJdksHardcodedVersions(String daemonTarget, boolean onlyDaemonJdk) {
-        GradleJdkTestUtils.setupJdksHardcodedVersions(settingsFile, buildFile, daemonTarget, onlyDaemonJdk)
-    }
-
     def applyApplicationPlugin() {
         GradleJdkTestUtils.applyApplicationPlugin(buildFile)
     }
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 93b32a6a..a4273953 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -183,10 +183,17 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
 
     def '#gradleVersionNumber: only generates daemon jdk'() {
         gradleVersion = gradleVersionNumber
-        setupJdksHardcodedVersions('11', true)
+        setupJdksHardcodedVersions('11')
         applyBaselineJavaVersions()
         applyApplicationPlugin()
 
+        // language=groovy
+        buildFile << """
+            jdks {
+                daemonJdkOnly()
+            }
+        """.stripIndent(true)
+
         file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
         file('src/main/java/Main.java') << java17PreviewCode
 

From 33ab223027d807538d3b56de1017dbd65027e8d4 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 12:11:03 +0100
Subject: [PATCH 06/14] readme

---
 gradle-jdks-setup/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle-jdks-setup/README.md b/gradle-jdks-setup/README.md
index 1b0032c0..710aabe9 100644
--- a/gradle-jdks-setup/README.md
+++ b/gradle-jdks-setup/README.md
@@ -89,6 +89,8 @@ jdks {
 ```
 jdks {
     daemonTarget = <version eg. 11/17/21>
+    daemonOnly() # optional, only installs & configures the daemon JDK version
+    jdkVersionsToUse = <set of versions eg. 11/17/21> # optional, the set of java versions to install, by default it will contain all the major versions configured in step 3.
 }
 ```
 5. Enable the jdk setup by adding the following to `gradle.properties`:

From 25ce2999d417316ce6eae944509153fff8b8f629 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 14:19:33 +0100
Subject: [PATCH 07/14] fix

---
 .../palantir/gradle/jdks/JdksExtension.java   |  3 +-
 .../gradle/jdks/ToolchainsPlugin.java         | 35 ++++++++++++++++---
 .../GradleJdkToolchainsIntegrationTest.groovy | 35 +++++++++++++++++++
 3 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
index 19c00bac..ca8a42fe 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
@@ -21,7 +21,6 @@
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -89,7 +88,7 @@ public final SetProperty<JavaLanguageVersion> getJdkMajorVersionsToUse() {
         return this.jdkMajorVersionsToUse;
     }
 
-    public final void setJdkMajorVersionsToUse(List<JavaLanguageVersion> javaLanguageVersions) {
+    public final void setJdkMajorVersionsToUse(Set<JavaLanguageVersion> javaLanguageVersions) {
         this.jdkMajorVersionsToUse.set(javaLanguageVersions);
     }
 
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
index 91ba14d8..05f4d1fd 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
@@ -16,14 +16,19 @@
 
 package com.palantir.gradle.jdks;
 
+import com.palantir.baseline.plugins.javaversions.BaselineJavaVersionExtension;
 import com.palantir.baseline.plugins.javaversions.BaselineJavaVersionsExtension;
+import com.palantir.baseline.plugins.javaversions.ChosenJavaVersion;
 import com.palantir.gradle.jdks.GradleWrapperPatcher.GradleWrapperPatcherTask;
 import com.palantir.gradle.jdks.enablement.GradleJdksEnablement;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.wrapper.Wrapper;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
@@ -58,12 +63,32 @@ public void apply(Project rootProject) {
         JdksExtension jdksExtension = JdksPlugin.extension(rootProject, jdkDistributions);
 
         rootProject.getPluginManager().withPlugin("com.palantir.baseline-java-versions", unused -> {
-            rootProject
-                    .getExtensions()
-                    .getByType(BaselineJavaVersionsExtension.class)
-                    .getSetupJdkToolchains()
-                    .set(false);
+            BaselineJavaVersionsExtension baselineJavaVersionsExtension =
+                    rootProject.getExtensions().getByType(BaselineJavaVersionsExtension.class);
+            baselineJavaVersionsExtension.getSetupJdkToolchains().set(false);
+
+            jdksExtension.getJdkMajorVersionsToUse().set(rootProject.provider(() -> Stream.of(
+                            jdksExtension.getDaemonTarget(),
+                            baselineJavaVersionsExtension.libraryTarget(),
+                            baselineJavaVersionsExtension.runtime().map(ChosenJavaVersion::javaLanguageVersion),
+                            baselineJavaVersionsExtension
+                                    .distributionTarget()
+                                    .map(ChosenJavaVersion::javaLanguageVersion))
+                    .map(Provider::get)
+                    .collect(Collectors.toSet())));
         });
+
+        rootProject.subprojects(
+                proj -> proj.getPluginManager().withPlugin("com.palantir.baseline-java-version", unused -> {
+                    BaselineJavaVersionExtension projectVersions =
+                            proj.getExtensions().getByType(BaselineJavaVersionExtension.class);
+
+                    jdksExtension.getJdkMajorVersionsToUse().addAll(rootProject.provider(() -> Stream.of(
+                                    projectVersions.target(), projectVersions.runtime())
+                            .map(Provider::get)
+                            .map(ChosenJavaVersion::javaLanguageVersion)
+                            .collect(Collectors.toSet())));
+                }));
         TaskProvider<Wrapper> wrapperTask = rootProject.getTasks().named("wrapper", Wrapper.class);
 
         TaskProvider<GenerateGradleJdksConfigsTask> generateGradleJdkConfigs = rootProject
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index a4273953..0dd5ad0c 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -180,6 +180,41 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         gradleVersionNumber << GRADLE_TEST_VERSIONS
     }
 
+    def '#gradleVersionNumber: only required java versions are configured'() {
+        gradleVersion = gradleVersionNumber
+        setupJdksHardcodedVersions('17')
+        applyBaselineJavaVersions()
+        applyApplicationPlugin()
+
+        file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
+        file('src/main/java/Main.java') << java17PreviewCode
+
+        // language=Groovy
+        buildFile << """
+            javaVersions {
+                libraryTarget = '17'
+            }
+        """.stripIndent(true)
+
+        //language=groovy
+        def subprojectLib21 = addSubproject 'subproject-lib-21', '''
+            apply plugin: 'java-library'
+            javaVersion {
+               target = 21
+            }
+        '''.stripIndent(true)
+        writeJavaSourceFile(getMainJavaCode(), subprojectLib21)
+
+        when:
+        runTasksSuccessfully('wrapper')
+
+        then: 'generates directories for all jdk versions'
+        Files.list(projectDir.toPath().resolve("gradle/jdks")).map { it -> it.getFileName().toString() }.collect(Collectors.toList()).containsAll(List.of("17", "21"))
+
+        where:
+        gradleVersionNumber << GRADLE_TEST_VERSIONS
+    }
+
 
     def '#gradleVersionNumber: only generates daemon jdk'() {
         gradleVersion = gradleVersionNumber

From 2d592ff9b7c477c340fd1eb15c1e44c942f2f760 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 14:50:03 +0100
Subject: [PATCH 08/14] wip

---
 build.gradle                                  |   4 +++-
 .../gradle/jdks/GradleJdksConfigs.java        |  11 +++++++++++
 gradle/gradle-jdks-setup.jar                  | Bin 112072 -> 112070 bytes
 .../jdks/21/linux-glibc/aarch64/download-url  |   1 -
 gradle/jdks/21/linux-glibc/aarch64/local-path |   1 -
 .../jdks/21/linux-glibc/x86-64/download-url   |   1 -
 gradle/jdks/21/linux-glibc/x86-64/local-path  |   1 -
 .../jdks/21/linux-musl/aarch64/download-url   |   1 -
 gradle/jdks/21/linux-musl/aarch64/local-path  |   1 -
 gradle/jdks/21/linux-musl/x86-64/download-url |   1 -
 gradle/jdks/21/linux-musl/x86-64/local-path   |   1 -
 gradle/jdks/21/macos/aarch64/download-url     |   1 -
 gradle/jdks/21/macos/aarch64/local-path       |   1 -
 gradle/jdks/21/macos/x86-64/download-url      |   1 -
 gradle/jdks/21/macos/x86-64/local-path        |   1 -
 gradle/jdks/21/windows/x86-64/download-url    |   1 -
 gradle/jdks/21/windows/x86-64/local-path      |   1 -
 17 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 gradle/jdks/21/linux-glibc/aarch64/download-url
 delete mode 100644 gradle/jdks/21/linux-glibc/aarch64/local-path
 delete mode 100644 gradle/jdks/21/linux-glibc/x86-64/download-url
 delete mode 100644 gradle/jdks/21/linux-glibc/x86-64/local-path
 delete mode 100644 gradle/jdks/21/linux-musl/aarch64/download-url
 delete mode 100644 gradle/jdks/21/linux-musl/aarch64/local-path
 delete mode 100644 gradle/jdks/21/linux-musl/x86-64/download-url
 delete mode 100644 gradle/jdks/21/linux-musl/x86-64/local-path
 delete mode 100644 gradle/jdks/21/macos/aarch64/download-url
 delete mode 100644 gradle/jdks/21/macos/aarch64/local-path
 delete mode 100644 gradle/jdks/21/macos/x86-64/download-url
 delete mode 100644 gradle/jdks/21/macos/x86-64/local-path
 delete mode 100644 gradle/jdks/21/windows/x86-64/download-url
 delete mode 100644 gradle/jdks/21/windows/x86-64/local-path

diff --git a/build.gradle b/build.gradle
index 00ca5ca3..927c37de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,13 @@ buildscript {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
+        mavenLocal()
     }
 
     dependencies {
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0-13-g25ce299'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
         classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
@@ -42,6 +43,7 @@ allprojects {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
+        mavenLocal()
     }
 
     group 'com.palantir.gradle.jdks'
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
index e2f2808d..3f82a0b1 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
@@ -27,9 +27,11 @@
 import org.gradle.api.file.Directory;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.options.Option;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 /**
@@ -43,6 +45,15 @@ public abstract class GradleJdksConfigs extends DefaultTask {
     public static final String GRADLE_JDKS_SETUP_SCRIPT = "gradle-jdks-setup.sh";
     public static final String GRADLE_JDKS_FUNCTIONS_SCRIPT = "gradle-jdks-functions.sh";
 
+    /**
+     * Option to include a specific java major version when generating/checking the gradle jdk configuration files.
+     */
+    @Input
+    @Option(
+            option = "includeJava",
+            description = "Generates the jdk configuration directories for the Java major version.")
+    public abstract SetProperty<JavaLanguageVersion> getIncludedJavaMajorVersion();
+
     @Nested
     public abstract MapProperty<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros();
 
diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar
index 17ce8d02d35930d45f284e970fbcda34d0d18bb4..0cd1840ece6866015f4c1ca20264d44786ea0163 100644
GIT binary patch
delta 7567
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

delta 7597
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

diff --git a/gradle/jdks/21/linux-glibc/aarch64/download-url b/gradle/jdks/21/linux-glibc/aarch64/download-url
deleted file mode 100644
index 43106141..00000000
--- a/gradle/jdks/21/linux-glibc/aarch64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/linux-glibc/aarch64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-glibc/x86-64/download-url b/gradle/jdks/21/linux-glibc/x86-64/download-url
deleted file mode 100644
index 25c31a53..00000000
--- a/gradle/jdks/21/linux-glibc/x86-64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/linux-glibc/x86-64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/aarch64/download-url b/gradle/jdks/21/linux-musl/aarch64/download-url
deleted file mode 100644
index 90d966e8..00000000
--- a/gradle/jdks/21/linux-musl/aarch64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/linux-musl/aarch64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/x86-64/download-url b/gradle/jdks/21/linux-musl/x86-64/download-url
deleted file mode 100644
index a507d2cd..00000000
--- a/gradle/jdks/21/linux-musl/x86-64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/linux-musl/x86-64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/aarch64/download-url b/gradle/jdks/21/macos/aarch64/download-url
deleted file mode 100644
index 2ab7620e..00000000
--- a/gradle/jdks/21/macos/aarch64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/21/macos/aarch64/local-path b/gradle/jdks/21/macos/aarch64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/macos/aarch64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/x86-64/download-url b/gradle/jdks/21/macos/x86-64/download-url
deleted file mode 100644
index 376401ed..00000000
--- a/gradle/jdks/21/macos/x86-64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/21/macos/x86-64/local-path b/gradle/jdks/21/macos/x86-64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/macos/x86-64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/windows/x86-64/download-url b/gradle/jdks/21/windows/x86-64/download-url
deleted file mode 100644
index 3f033748..00000000
--- a/gradle/jdks/21/windows/x86-64/download-url
+++ /dev/null
@@ -1 +0,0 @@
-https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/21/windows/x86-64/local-path b/gradle/jdks/21/windows/x86-64/local-path
deleted file mode 100644
index 4c19e3ac..00000000
--- a/gradle/jdks/21/windows/x86-64/local-path
+++ /dev/null
@@ -1 +0,0 @@
-amazon-corretto-21.0.5.11.1

From 374e740ba4eb4bf085265ba2bfa9a980d3dde4ff Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 15:05:31 +0100
Subject: [PATCH 09/14] option

---
 build.gradle                                           |  2 +-
 .../com/palantir/gradle/jdks/GradleJdksConfigs.java    |  2 +-
 .../gradle/jdks/JdkDistributionConfigurator.java       | 10 ++++++++--
 .../com/palantir/gradle/jdks/ToolchainsPlugin.java     |  2 +-
 gradle/jdks/21/linux-glibc/aarch64/download-url        |  1 +
 gradle/jdks/21/linux-glibc/aarch64/local-path          |  1 +
 gradle/jdks/21/linux-glibc/x86-64/download-url         |  1 +
 gradle/jdks/21/linux-glibc/x86-64/local-path           |  1 +
 gradle/jdks/21/linux-musl/aarch64/download-url         |  1 +
 gradle/jdks/21/linux-musl/aarch64/local-path           |  1 +
 gradle/jdks/21/linux-musl/x86-64/download-url          |  1 +
 gradle/jdks/21/linux-musl/x86-64/local-path            |  1 +
 gradle/jdks/21/macos/aarch64/download-url              |  1 +
 gradle/jdks/21/macos/aarch64/local-path                |  1 +
 gradle/jdks/21/macos/x86-64/download-url               |  1 +
 gradle/jdks/21/macos/x86-64/local-path                 |  1 +
 gradle/jdks/21/windows/x86-64/download-url             |  1 +
 gradle/jdks/21/windows/x86-64/local-path               |  1 +
 18 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 gradle/jdks/21/linux-glibc/aarch64/download-url
 create mode 100644 gradle/jdks/21/linux-glibc/aarch64/local-path
 create mode 100644 gradle/jdks/21/linux-glibc/x86-64/download-url
 create mode 100644 gradle/jdks/21/linux-glibc/x86-64/local-path
 create mode 100644 gradle/jdks/21/linux-musl/aarch64/download-url
 create mode 100644 gradle/jdks/21/linux-musl/aarch64/local-path
 create mode 100644 gradle/jdks/21/linux-musl/x86-64/download-url
 create mode 100644 gradle/jdks/21/linux-musl/x86-64/local-path
 create mode 100644 gradle/jdks/21/macos/aarch64/download-url
 create mode 100644 gradle/jdks/21/macos/aarch64/local-path
 create mode 100644 gradle/jdks/21/macos/x86-64/download-url
 create mode 100644 gradle/jdks/21/macos/x86-64/local-path
 create mode 100644 gradle/jdks/21/windows/x86-64/download-url
 create mode 100644 gradle/jdks/21/windows/x86-64/local-path

diff --git a/build.gradle b/build.gradle
index 927c37de..d82e7dfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0-13-g25ce299'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0-14-g2d592ff.dirty'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
         classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
index 3f82a0b1..8190e6d9 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
@@ -52,7 +52,7 @@ public abstract class GradleJdksConfigs extends DefaultTask {
     @Option(
             option = "includeJava",
             description = "Generates the jdk configuration directories for the Java major version.")
-    public abstract SetProperty<JavaLanguageVersion> getIncludedJavaMajorVersion();
+    public abstract SetProperty<String> getIncludedJavaMajorVersion();
 
     @Nested
     public abstract MapProperty<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros();
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
index 89f5c801..b4125fb1 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
@@ -28,6 +28,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
+import org.gradle.api.provider.SetProperty;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 public final class JdkDistributionConfigurator {
@@ -36,8 +37,13 @@ public final class JdkDistributionConfigurator {
     private static final JavaLanguageVersion MINIMUM_SUPPORTED_JAVA_VERSION = JavaLanguageVersion.of(11);
 
     public static Map<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros(
-            Project project, JdkDistributions jdkDistributions, JdksExtension jdksExtension) {
-        Set<JavaLanguageVersion> javaVersions = jdksExtension.getJdkMajorVersionsToUse().get().stream()
+            Project project,
+            JdkDistributions jdkDistributions,
+            JdksExtension jdksExtension,
+            SetProperty<String> extraLanguageVersions) {
+        Set<JavaLanguageVersion> javaVersions = Stream.concat(
+                        jdksExtension.getJdkMajorVersionsToUse().get().stream(),
+                        extraLanguageVersions.get().stream().map(JavaLanguageVersion::of))
                 .filter(javaLanguageVersion -> javaLanguageVersion.canCompileOrRun(MINIMUM_SUPPORTED_JAVA_VERSION))
                 .collect(Collectors.toSet());
         return javaVersions.stream()
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
index 05f4d1fd..fba89c05 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
@@ -114,7 +114,7 @@ public void apply(Project rootProject) {
             task.getDaemonJavaVersion().set(jdksExtension.getDaemonTarget());
             task.getJavaVersionToJdkDistros()
                     .putAll(rootProject.provider(() -> JdkDistributionConfigurator.getJavaVersionToJdkDistros(
-                            rootProject, jdkDistributions, jdksExtension)));
+                            rootProject, jdkDistributions, jdksExtension, task.getIncludedJavaMajorVersion())));
             task.getCaCerts().putAll(jdksExtension.getCaCerts());
         });
 
diff --git a/gradle/jdks/21/linux-glibc/aarch64/download-url b/gradle/jdks/21/linux-glibc/aarch64/download-url
new file mode 100644
index 00000000..43106141
--- /dev/null
+++ b/gradle/jdks/21/linux-glibc/aarch64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/linux-glibc/aarch64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-glibc/x86-64/download-url b/gradle/jdks/21/linux-glibc/x86-64/download-url
new file mode 100644
index 00000000..25c31a53
--- /dev/null
+++ b/gradle/jdks/21/linux-glibc/x86-64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/linux-glibc/x86-64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/aarch64/download-url b/gradle/jdks/21/linux-musl/aarch64/download-url
new file mode 100644
index 00000000..90d966e8
--- /dev/null
+++ b/gradle/jdks/21/linux-musl/aarch64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/linux-musl/aarch64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/x86-64/download-url b/gradle/jdks/21/linux-musl/x86-64/download-url
new file mode 100644
index 00000000..a507d2cd
--- /dev/null
+++ b/gradle/jdks/21/linux-musl/x86-64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/linux-musl/x86-64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/aarch64/download-url b/gradle/jdks/21/macos/aarch64/download-url
new file mode 100644
index 00000000..2ab7620e
--- /dev/null
+++ b/gradle/jdks/21/macos/aarch64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/21/macos/aarch64/local-path b/gradle/jdks/21/macos/aarch64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/macos/aarch64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/x86-64/download-url b/gradle/jdks/21/macos/x86-64/download-url
new file mode 100644
index 00000000..376401ed
--- /dev/null
+++ b/gradle/jdks/21/macos/x86-64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/21/macos/x86-64/local-path b/gradle/jdks/21/macos/x86-64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/macos/x86-64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/windows/x86-64/download-url b/gradle/jdks/21/windows/x86-64/download-url
new file mode 100644
index 00000000..3f033748
--- /dev/null
+++ b/gradle/jdks/21/windows/x86-64/download-url
@@ -0,0 +1 @@
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/21/windows/x86-64/local-path b/gradle/jdks/21/windows/x86-64/local-path
new file mode 100644
index 00000000..4c19e3ac
--- /dev/null
+++ b/gradle/jdks/21/windows/x86-64/local-path
@@ -0,0 +1 @@
+amazon-corretto-21.0.5.11.1

From 3eabf8cedf2e589a95a7e78f5e42e4bde1e27b05 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 15:07:53 +0100
Subject: [PATCH 10/14] old gradle-jdks

---
 build.gradle                 |   4 +---
 gradle/gradle-jdks-setup.jar | Bin 112070 -> 112072 bytes
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d82e7dfd..00ca5ca3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,12 @@ buildscript {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-        mavenLocal()
     }
 
     dependencies {
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0-14-g2d592ff.dirty'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.57.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
         classpath 'org.unbroken-dome.gradle-plugins:gradle-testsets-plugin:4.1.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0'
@@ -43,7 +42,6 @@ allprojects {
     repositories {
         mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
-        mavenLocal()
     }
 
     group 'com.palantir.gradle.jdks'
diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar
index 0cd1840ece6866015f4c1ca20264d44786ea0163..17ce8d02d35930d45f284e970fbcda34d0d18bb4 100644
GIT binary patch
delta 7597
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

delta 7567
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


From 60577fed80bf04ffba29066a3ef1c1df3caf0630 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 25 Nov 2024 16:34:09 +0100
Subject: [PATCH 11/14] libraryTarget first

---
 .../gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 0dd5ad0c..734abb35 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -250,7 +250,7 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
 
         buildFile << '''
             javaVersions {
-                distributionTarget = '15'
+                libraryTarget = 15
             }
         '''.stripIndent(true)
         writeHelloWorld(projectDir)

From 72999fe2ba149f7a4f473692d0c7ec7a0334483b Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Tue, 26 Nov 2024 09:49:25 +0100
Subject: [PATCH 12/14] .

---
 .../GradleJdkToolchainsIntegrationTest.groovy | 27 -------------------
 1 file changed, 27 deletions(-)

diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 64432b9b..4ee90ae9 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -246,33 +246,6 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         gradleVersionNumber << GRADLE_TEST_VERSIONS
     }
 
-
-    def '#gradleVersionNumber: only generates daemon jdk'() {
-        gradleVersion = gradleVersionNumber
-        setupJdksHardcodedVersions('11')
-        applyBaselineJavaVersions()
-        applyApplicationPlugin()
-
-        // language=groovy
-        buildFile << """
-            jdks {
-                daemonJdkOnly()
-            }
-        """.stripIndent(true)
-
-        file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
-        file('src/main/java/Main.java') << java17PreviewCode
-
-        when:
-        runTasksSuccessfully('wrapper')
-
-        then: 'only jdk 11 is generated'
-        Files.list(projectDir.toPath().resolve("gradle/jdks")).allMatch { it -> it.endsWith("gradle/jdks/11")}
-
-        where:
-        gradleVersionNumber << GRADLE_TEST_VERSIONS
-    }
-
     def '#gradleVersionNumber: fails if the jdk version is not configured'() {
         setupJdksHardcodedVersions()
         applyBaselineJavaVersions()

From 2d2bf0e5d6edbb09fa8ce5fb10702cdd74e985a3 Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Mon, 9 Dec 2024 13:43:49 +0100
Subject: [PATCH 13/14] multiple targets

---
 .../gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 4ee90ae9..612df063 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -231,7 +231,8 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
         def subprojectLib21 = addSubproject 'subproject-lib-21', '''
             apply plugin: 'java-library'
             javaVersion {
-               target = 21
+               target = 17
+               runtime = 21
             }
         '''.stripIndent(true)
         writeJavaSourceFile(getMainJavaCode(), subprojectLib21)

From 92baa2022b1b0f6c47385b7d910f041bc45c9e4b Mon Sep 17 00:00:00 2001
From: Claudia Rogoz <crogoz@palantir.com>
Date: Wed, 11 Dec 2024 14:15:15 +0100
Subject: [PATCH 14/14] tests

---
 gradle-jdks-setup/README.md                   | 20 +++++-
 .../gradle/jdks/GradleJdksConfigs.java        | 11 ++--
 .../jdks/JdkDistributionConfigurator.java     | 14 ++--
 .../palantir/gradle/jdks/JdksExtension.java   |  7 +-
 .../gradle/jdks/ToolchainsPlugin.java         |  9 ++-
 .../GradleJdkToolchainsIntegrationTest.groovy | 66 +++++++++++++++++++
 6 files changed, 108 insertions(+), 19 deletions(-)

diff --git a/gradle-jdks-setup/README.md b/gradle-jdks-setup/README.md
index 286ddabb..ace324a7 100644
--- a/gradle-jdks-setup/README.md
+++ b/gradle-jdks-setup/README.md
@@ -90,7 +90,7 @@ jdks {
 jdks {
     daemonTarget = <version eg. 11/17/21>
     daemonJdkOnly() # optional, only installs & configures the daemon JDK version
-    jdkVersionsToUse = [11, 17, 21, 23] # optional, the set of java versions to install, by default it will contain all the major versions configured in step 3.
+    jdkMajorVersionsToUse = [11, 17, 21, 23] # optional, the set of java versions to install, by default it will contain all the major versions configured in step 3.
 }
 ```
 5. Enable the jdk setup by adding the following to `gradle.properties`:
@@ -211,6 +211,24 @@ The plugin registers the following tasks:
 - `checkGradleJdkConfigs` - checks that all the `gradle/` configurations are up-to-date. E.g. if the `jdks-latest` plugin is updated, we need to make sure the `gradle/jdks` files reflect the jdk versions.
 - `setupJdks` - task that triggers `wrapperJdkPatcher` and `generateGradleJdkConfigs` and runs the patched `./gradlew` script.
 
+
+## Using a new java version
+
+We are only generating the jdk configuration files for the jdk versions that are used see: [jdkMajorVersionsToUse](https://github.com/palantir/gradle-jdks/blob/26d54605b7827b232024ec7e0c34a87983804492/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java#L44)
+Using a new java version is a 2-step process: 
+1. Firstly, we need to generate the gradle jdk configuration files for the new java version that we are going to use
+2. Secondly, once the new files are generated, the javaVersion can be configured in the gradle build configuration.
+
+### Palantir specific, if using `baseline-java-version` through excavators
+1. Run `./gradlew generateGradleJdkConfigs --includeAllJdks`. The command will generate the Gradle jdk configuration files for all jdks.
+2. Update the javaVersion(s)/jdks extension values with the desired java major version.
+3. Run `./gradlew setupJdks` to only keep the Gradle jdk configuration files for the used Gradle JDKs.
+
+### Gradle Toolchains workflow
+1. Update `jdkMajorVersionsToUse` with the required jdk versions 
+2. Run `./gradlew setupJdks`
+
+
 ## Unsupported
 
 - This workflow is disabled on `Windows` at the moment.
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
index 8190e6d9..0b0ac97f 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/GradleJdksConfigs.java
@@ -27,7 +27,6 @@
 import org.gradle.api.file.Directory;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.provider.SetProperty;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.TaskAction;
@@ -50,9 +49,9 @@ public abstract class GradleJdksConfigs extends DefaultTask {
      */
     @Input
     @Option(
-            option = "includeJava",
-            description = "Generates the jdk configuration directories for the Java major version.")
-    public abstract SetProperty<String> getIncludedJavaMajorVersion();
+            option = "includeAllJdks",
+            description = "Generates the configuration directories for all configured Java major versions.")
+    public abstract Property<Boolean> getIncludeAllJdks();
 
     @Nested
     public abstract MapProperty<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros();
@@ -76,6 +75,10 @@ protected abstract void applyGradleJdkFileAction(
 
     protected abstract void maybePrepareForAction(List<Path> targetPaths);
 
+    public GradleJdksConfigs() {
+        getIncludeAllJdks().convention(false);
+    }
+
     @TaskAction
     public final void action() {
         Path gradleJdksDir = gradleDirectory().dir("jdks").getAsFile().toPath();
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
index b4125fb1..d8349c99 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdkDistributionConfigurator.java
@@ -25,10 +25,10 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
-import org.gradle.api.provider.SetProperty;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 
 public final class JdkDistributionConfigurator {
@@ -37,13 +37,11 @@ public final class JdkDistributionConfigurator {
     private static final JavaLanguageVersion MINIMUM_SUPPORTED_JAVA_VERSION = JavaLanguageVersion.of(11);
 
     public static Map<JavaLanguageVersion, List<JdkDistributionConfig>> getJavaVersionToJdkDistros(
-            Project project,
-            JdkDistributions jdkDistributions,
-            JdksExtension jdksExtension,
-            SetProperty<String> extraLanguageVersions) {
-        Set<JavaLanguageVersion> javaVersions = Stream.concat(
-                        jdksExtension.getJdkMajorVersionsToUse().get().stream(),
-                        extraLanguageVersions.get().stream().map(JavaLanguageVersion::of))
+            Project project, JdkDistributions jdkDistributions, JdksExtension jdksExtension, Boolean includeAllJdks) {
+        Set<JavaLanguageVersion> javaVersions = (includeAllJdks
+                        ? Arrays.stream(JavaVersion.values())
+                                .map(javaVersion -> JavaLanguageVersion.of(javaVersion.getMajorVersion()))
+                        : jdksExtension.jdkMajorVersionsToUse().get().stream())
                 .filter(javaLanguageVersion -> javaLanguageVersion.canCompileOrRun(MINIMUM_SUPPORTED_JAVA_VERSION))
                 .collect(Collectors.toSet());
         return javaVersions.stream()
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
index ca8a42fe..62f248ac 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/JdksExtension.java
@@ -84,12 +84,13 @@ public final void setDaemonTarget(int value) {
         getDaemonTarget().set(JavaLanguageVersion.of(value));
     }
 
-    public final SetProperty<JavaLanguageVersion> getJdkMajorVersionsToUse() {
+    public final SetProperty<JavaLanguageVersion> jdkMajorVersionsToUse() {
         return this.jdkMajorVersionsToUse;
     }
 
-    public final void setJdkMajorVersionsToUse(Set<JavaLanguageVersion> javaLanguageVersions) {
-        this.jdkMajorVersionsToUse.set(javaLanguageVersions);
+    public final void setJdkMajorVersionsToUse(Set<String> jdkMajorVersions) {
+        jdkMajorVersionsToUse()
+                .set(jdkMajorVersions.stream().map(JavaLanguageVersion::of).collect(Collectors.toSet()));
     }
 
     public final void daemonJdkOnly() {
diff --git a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
index fba89c05..048b93a2 100644
--- a/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
+++ b/gradle-jdks/src/main/java/com/palantir/gradle/jdks/ToolchainsPlugin.java
@@ -67,7 +67,7 @@ public void apply(Project rootProject) {
                     rootProject.getExtensions().getByType(BaselineJavaVersionsExtension.class);
             baselineJavaVersionsExtension.getSetupJdkToolchains().set(false);
 
-            jdksExtension.getJdkMajorVersionsToUse().set(rootProject.provider(() -> Stream.of(
+            jdksExtension.jdkMajorVersionsToUse().set(rootProject.provider(() -> Stream.of(
                             jdksExtension.getDaemonTarget(),
                             baselineJavaVersionsExtension.libraryTarget(),
                             baselineJavaVersionsExtension.runtime().map(ChosenJavaVersion::javaLanguageVersion),
@@ -83,7 +83,7 @@ public void apply(Project rootProject) {
                     BaselineJavaVersionExtension projectVersions =
                             proj.getExtensions().getByType(BaselineJavaVersionExtension.class);
 
-                    jdksExtension.getJdkMajorVersionsToUse().addAll(rootProject.provider(() -> Stream.of(
+                    jdksExtension.jdkMajorVersionsToUse().addAll(rootProject.provider(() -> Stream.of(
                                     projectVersions.target(), projectVersions.runtime())
                             .map(Provider::get)
                             .map(ChosenJavaVersion::javaLanguageVersion)
@@ -114,7 +114,10 @@ public void apply(Project rootProject) {
             task.getDaemonJavaVersion().set(jdksExtension.getDaemonTarget());
             task.getJavaVersionToJdkDistros()
                     .putAll(rootProject.provider(() -> JdkDistributionConfigurator.getJavaVersionToJdkDistros(
-                            rootProject, jdkDistributions, jdksExtension, task.getIncludedJavaMajorVersion())));
+                            rootProject,
+                            jdkDistributions,
+                            jdksExtension,
+                            task.getIncludeAllJdks().get())));
             task.getCaCerts().putAll(jdksExtension.getCaCerts());
         });
 
diff --git a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
index 612df063..3b7d8ec5 100644
--- a/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
+++ b/gradle-jdks/src/test/groovy/com/palantir/gradle/jdks/GradleJdkToolchainsIntegrationTest.groovy
@@ -209,6 +209,72 @@ class GradleJdkToolchainsIntegrationTest extends GradleJdkIntegrationSpec {
 
         where:
         gradleVersionNumber << GRADLE_TEST_VERSIONS
+
+    }
+
+    def '#gradleVersionNumber: can bump java major version when baseline-java is applied'() {
+        gradleVersion = gradleVersionNumber
+        setupJdksHardcodedVersions('11')
+        applyBaselineJavaVersions()
+        applyApplicationPlugin()
+
+        // language=groovy
+        buildFile << """
+            javaVersions {
+                libraryTarget = '11'
+            }
+        """.stripIndent(true)
+
+        file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
+        file('src/main/java/Main.java') << java17PreviewCode
+        runTasksSuccessfully('wrapper')
+
+        when:
+        runTasksSuccessfully('generateGradleJdkConfigs', '--includeAllJdks')
+
+        then: 'generates directories for all jdk versions'
+        Files.list(projectDir.toPath().resolve("gradle/jdks"))
+                .map { it -> it.getFileName().toString() }
+                .collect(Collectors.toList())
+                .containsAll(List.of("11", "17", "21"))
+
+        when:
+        runTasksSuccessfully('setupJdks')
+
+        then: 'only jdk 11 is generated'
+        Files.list(projectDir.toPath().resolve("gradle/jdks"))
+                .allMatch { it -> it.endsWith("gradle/jdks/11")}
+
+        where:
+        gradleVersionNumber << GRADLE_TEST_VERSIONS
+    }
+
+    def '#gradleVersionNumber: only jdkVersionsToUse jdks are generated'() {
+        gradleVersion = gradleVersionNumber
+        setupJdksHardcodedVersions('11')
+        applyApplicationPlugin()
+
+        file('gradle.properties') << 'palantir.jdk.setup.enabled=true'
+        file('src/main/java/Main.java') << java17PreviewCode
+        runTasksSuccessfully('wrapper')
+
+        when:
+        buildFile << """
+            jdks {
+                jdkMajorVersionsToUse = ["11", "21"]
+            }
+        """.stripIndent(true)
+
+        runTasksSuccessfully('setupJdks')
+
+        then: 'only jdkVersionsToUse files are generated'
+        Files.list(projectDir.toPath().resolve("gradle/jdks"))
+                .map { it -> it.getFileName().toString() }
+                .collect(Collectors.toList())
+                .containsAll(List.of("11", "21"))
+
+        where:
+        gradleVersionNumber << GRADLE_TEST_VERSIONS
     }
 
     def '#gradleVersionNumber: only required java versions are configured'() {