From 35a24a3a056022c08cec46c2d6224e6b089d42b5 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Tue, 21 Oct 2025 16:15:53 +0200 Subject: [PATCH 1/3] chore: Drop org.gradle.java.installations.fromEnv toolchain restriction --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index de0623c7424..1fe4ab6c54e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g -org.gradle.java.installations.auto-detect=false +org.gradle.java.installations.auto-detect=true org.gradle.java.installations.auto-download=false # 8, 11, 17, 21 and 25 are needed to build -org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME +#org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME # Toggle on to get more details during IJ sync #org.gradle.logging.level=info From 470c6e7cb09afe5f3b49669c6aacee3a6b415797 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 13 Nov 2025 13:51:50 +0100 Subject: [PATCH 2/3] chore: Drop org.gradle.java.installations toolchain restriction for local env, but keep them in CI --- .gitlab-ci.yml | 3 +++ gradle.properties | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21a50d58db1..da8e1e6efb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,6 +171,9 @@ default: - export ORG_GRADLE_PROJECT_akkaRepositoryToken=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.akka_repo_token --with-decryption --query "Parameter.Value" --out text) - export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY - export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY + - export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-detect=false + - export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download=false + - export ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties diff --git a/gradle.properties b/gradle.properties index 1fe4ab6c54e..b652b958d98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,8 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g -org.gradle.java.installations.auto-detect=true -org.gradle.java.installations.auto-download=false -# 8, 11, 17, 21 and 25 are needed to build -#org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME + +# CI use constrained org.gradle.java.installations settings # Toggle on to get more details during IJ sync #org.gradle.logging.level=info From c889363936949aa0f724a19883ee933fe20b4999 Mon Sep 17 00:00:00 2001 From: Brice Dutheil Date: Thu, 13 Nov 2025 14:46:47 +0100 Subject: [PATCH 3/3] chore: Drop org.gradle.java.installations toolchain restriction for local env, but keep them in CI --- .gitlab-ci.yml | 9 ++++++--- gradle.properties | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index da8e1e6efb3..99bdec26cff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,9 +171,12 @@ default: - export ORG_GRADLE_PROJECT_akkaRepositoryToken=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.akka_repo_token --with-decryption --query "Parameter.Value" --out text) - export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY - export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY - - export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-detect=false - - export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download=false - - export ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME + - | + cat >> gradle.properties <<'EOF' + org.gradle.java.installations.auto-detect=false + org.gradle.java.installations.auto-download=false + org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME + EOF - mkdir -p .gradle - export GRADLE_USER_HOME=$(pwd)/.gradle # replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties diff --git a/gradle.properties b/gradle.properties index b652b958d98..48d5ceb5b49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g -# CI use constrained org.gradle.java.installations settings - # Toggle on to get more details during IJ sync #org.gradle.logging.level=info + +# CI use constrained org.gradle.java.installations settings