From 001a4e3177950289a56231131e8fdc3ada52f656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Mon, 23 Oct 2023 17:28:07 +0200 Subject: [PATCH] roll back OpenJDK 21 because Gradle 8.4 does not allow OpenJDK 21 plugins --- gradle-plugin-asciidoctor/gradle.properties | 2 +- gradle-plugin-docker/gradle.properties | 2 +- gradle-plugin-git/gradle.properties | 2 +- gradle-plugin-jacc/gradle.properties | 2 +- gradle-plugin-jflex/gradle.properties | 2 +- gradle-plugin-rpm/gradle.properties | 2 +- gradle-plugin-shadow/gradle.properties | 2 +- .../gradle/plugin/shadow/internal/DependencyUtilsTest.groovy | 1 - gradle.properties | 2 +- gradle/compile/groovy.gradle | 2 +- gradle/compile/java.gradle | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gradle-plugin-asciidoctor/gradle.properties b/gradle-plugin-asciidoctor/gradle.properties index 406668f..e5d38ad 100644 --- a/gradle-plugin-asciidoctor/gradle.properties +++ b/gradle-plugin-asciidoctor/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-asciidoctor -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-docker/gradle.properties b/gradle-plugin-docker/gradle.properties index f19acd8..6e2f483 100644 --- a/gradle-plugin-docker/gradle.properties +++ b/gradle-plugin-docker/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-docker -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-git/gradle.properties b/gradle-plugin-git/gradle.properties index f19acd8..6e2f483 100644 --- a/gradle-plugin-git/gradle.properties +++ b/gradle-plugin-git/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-docker -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-jacc/gradle.properties b/gradle-plugin-jacc/gradle.properties index d5f37cf..c2d9ef4 100644 --- a/gradle-plugin-jacc/gradle.properties +++ b/gradle-plugin-jacc/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-jacc -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-jflex/gradle.properties b/gradle-plugin-jflex/gradle.properties index 00a4e18..32f0c4e 100644 --- a/gradle-plugin-jflex/gradle.properties +++ b/gradle-plugin-jflex/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-jflex -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-rpm/gradle.properties b/gradle-plugin-rpm/gradle.properties index f747a1f..1b59de5 100644 --- a/gradle-plugin-rpm/gradle.properties +++ b/gradle-plugin-rpm/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-rpm -version = 3.0.2 +version = 3.0.3 diff --git a/gradle-plugin-shadow/gradle.properties b/gradle-plugin-shadow/gradle.properties index 71cf478..680c8b8 100644 --- a/gradle-plugin-shadow/gradle.properties +++ b/gradle-plugin-shadow/gradle.properties @@ -1,2 +1,2 @@ name = gradle-plugin-shadow -version = 3.0.1 +version = 3.0.2 diff --git a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy index 602f5db..a1d3de3 100644 --- a/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy +++ b/gradle-plugin-shadow/src/test/groovy/org/xbib/gradle/plugin/shadow/internal/DependencyUtilsTest.groovy @@ -24,7 +24,6 @@ class DependencyUtilsTest { "java.lang.Object", "java.lang.String", "java.lang.StringBuilder", - "java.lang.Thread", "java.lang.Throwable") .sort() // we do not care about jdk.internal classes, they vary between JDK versions and even JVMs diff --git a/gradle.properties b/gradle.properties index 09baa2e..91a3ce8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib.gradle.plugin name = gradle-plugins -version = 0.0.5 +version = 0.0.6 org.gradle.warning.mode = ALL diff --git a/gradle/compile/groovy.gradle b/gradle/compile/groovy.gradle index c736ba6..35a8723 100644 --- a/gradle/compile/groovy.gradle +++ b/gradle/compile/groovy.gradle @@ -6,7 +6,7 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } modularity.inferModulePath.set(true) withSourcesJar() diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 71f2751..b3160a2 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -3,7 +3,7 @@ apply plugin: 'java-library' java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } modularity.inferModulePath.set(true) withSourcesJar()