Announce support for JDK17

build-logic/build-platform/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 // Here you should declare versions which should be shared by the different modules of buildSrc itself
 val javaParserVersion = "3.18.0"
-val groovyVersion = "3.0.8"
+val groovyVersion = "3.0.9"
 val asmVersion = "9.2"
 
 val kotlinVersion = providers.gradleProperty("buildKotlinVersion")

build-logic/dependency-modules/src/main/kotlin/gradlebuild/modules/extension/ExternalModulesExtension.kt

@@ -20,7 +20,7 @@ import gradlebuild.modules.model.License
 
 abstract class ExternalModulesExtension {
 
-    val groovyVersion = "3.0.8"
+    val groovyVersion = "3.0.9"
     val kotlinVersion = "1.5.31"
 
     fun futureKotlin(module: String) = "org.jetbrains.kotlin:kotlin-$module:$kotlinVersion"

gradle/verification-keyring.keys

@@ -14410,3 +14410,50 @@ COwRkbgKnHC7P+tBBz9ZcwgaaUDznWOa/Kc+PmH/EJEVkRb/VSwy7BKzJCRkgSUK
 +0dwSoh3NyBxizsAWePMOK157AXfExz+iRUK
 =ynq3
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub    431B8F80403A7DC1
+uid    Roger Howell <MysterAitch@users.noreply.github.com>
+
+sub    8BA78B161991D5F7
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+=jtS6
+-----END PGP PUBLIC KEY BLOCK-----

gradle/verification-metadata.xml

@@ -153,6 +153,9 @@
             <trusting group="org.codenarc"/>
             <trusting group="org.gmetrics"/>
          </trusted-key>
+         <trusted-key id="a55830120aed177e1aa4f66a431b8f80403a7dc1">
+            <trusting group="com.github.javaparser"/>
+         </trusted-key>
          <trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
             <trusting group="^org[.]jetbrains($|([.].*))" regex="true"/>
             <trusting group="com.github.javaparser"/>

subprojects/build-init/src/main/resources/org/gradle/buildinit/tasks/templates/library-versions.properties

@@ -1,7 +1,7 @@
 #Generated file, please do not edit - Version values used in build-init templates
 commons-math=3.6.1
 commons-text=1.9
-groovy=3.0.8
+groovy=3.0.9
 guava=30.1.1-jre
 junit-jupiter=5.7.2
 junit=4.13.2

subprojects/docs/src/docs/release/notes.md

@@ -66,6 +66,10 @@ vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 
 ## New features and usability improvements
 
+### Support for Java 17
+
+Gradle 7.3 supports compiling, testing and running on Java 17.
+
 <a name="tooling-api"></a>
 ### Tooling API improvements
 

subprojects/docs/src/docs/userguide/compatibility.adoc

@@ -17,7 +17,7 @@
 The sections below describe Gradle's compatibility with several integrations. Other versions not listed here may or may not work.
 
 == Java
-A Java version between 8 and 16 is required to execute Gradle. Java 17 and later versions are not yet supported.
+A Java version between 8 and 17 is required to execute Gradle. Java 18 and later versions are not yet supported.
 
 Java 6 and 7 can still be used for <<building_java_projects.adoc#sec:java_cross_compilation,compilation and forked test execution>>.
 
@@ -38,13 +38,14 @@ For older Gradle versions, please see the table below which Java version is supp
 |14|6.3
 |15|6.7
 |16|7.0
+|17|7.3
 |===
 
 == Kotlin
 Gradle is tested with Kotlin 1.3.72 through 1.5.31.
 
 == Groovy
-Gradle is tested with Groovy 1.5.8 through 3.0.8.
+Gradle is tested with Groovy 1.5.8 through 3.0.9.
 
 == Android
 Gradle is tested with Android Gradle Plugin 4.1, 4.2, 7.0 and 7.1. Alpha and beta versions may or may not work.

subprojects/docs/src/docs/userguide/migration/upgrading_version_7.adoc

@@ -41,6 +41,7 @@ Some plugins will break with this new version of Gradle, for example because the
 ==== Updates to bundled Gradle dependencies
 
 - Kotlin has been updated to https://github.com/JetBrains/kotlin/releases/tag/v1.5.31[Kotlin 1.5.31].
+- Groovy has been updated to https://groovy-lang.org/changelogs/changelog-3.0.9.html[Groovy 3.0.9].
 
 ==== Application order of plugins in the `plugins` block
 

subprojects/docs/src/samples/groovy/library-publishing/groovy/my-library/build.gradle

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.codehaus.groovy:groovy-all:3.0.8'
+    implementation 'org.codehaus.groovy:groovy-all:3.0.9'
 }
 
 publishing {

subprojects/docs/src/samples/groovy/library-publishing/kotlin/my-library/build.gradle.kts

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.codehaus.groovy:groovy-all:3.0.8")
+    implementation("org.codehaus.groovy:groovy-all:3.0.9")
 }
 
 publishing {

subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy

@@ -30,7 +30,7 @@ abstract class AbstractSourcesAndJavadocJarsIntegrationTest extends AbstractIdeI
     @Rule
     HttpServer server
 
-    String groovyVersion = "3.0.8"
+    String groovyVersion = "3.0.9"
 
     def setup() {
         server.start()

subprojects/model-core/src/test/groovy/org/gradle/model/NodeBackedModelMapSpec.groovy

@@ -39,7 +39,7 @@ import org.gradle.util.internal.ClosureBackedAction
 import static org.gradle.model.ModelTypeTesting.fullyQualifiedNameOf
 import static org.gradle.util.internal.TextUtil.normaliseLineSeparators
 
-abstract class NodeBackedModelMapSpec<T extends Named, S extends T & Special> extends ProjectRegistrySpec {
+abstract class NodeBackedModelMapSpec<T extends Named, S extends Special & T> extends ProjectRegistrySpec {
     abstract Class<T> getItemClass()
     abstract Class<S> getSpecialItemClass()
     ModelType<T> getItemType() { ModelType.of(itemClass) }

subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy

@@ -43,7 +43,7 @@ class GroovyRuntimeTest extends AbstractProjectBuilderSpec {
     }
 
     def "inferred Groovy3 class path uses 'groovy' jars from classpath if all required pieces are found"() {
-        def groovyVersion = "3.0.8"
+        def groovyVersion = "3.0.9"
 
         when:
         def classpath = project.groovyRuntime.inferGroovyClasspath([