Upgraded Gradle Tooling API to 9.3.0-rc-2

Upgraded Micronaut Gradle Test Projects

Fix some Gradle project loading internals

Fix gradle.java tests.

Fix gradle.dependencies tests

Fix micronaut tests

Gradle test can work with Java 25 from now

Moving to the final Gradle 9.3.0 Release

Remove static final from BuildPropertiesSupport.Property as it became a record

Ignore WeirdMultiProject Test.

Author: lkishalmi

.github/workflows/main.yml

@@ -846,7 +846,7 @@ jobs:
     timeout-minutes: 50
     strategy:
       matrix:
-        java: [ '17', '21', '26-ea' ]
+        java: [ '17', '21', '25', '26-ea' ]
         exclude:
           - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
       fail-fast: false
@@ -931,23 +931,23 @@ jobs:
       - name: java/gradle.test
         run: ant $OPTS -f java/gradle.test test
 
-      # TODO next are JDK 21 or 25 incompatibe steps
-      - name: java/java.mx.project
-        if: ${{ matrix.java == '17' || matrix.java == '21' }}
-        run: .github/retry.sh ant $OPTS -f java/java.mx.project test
-
       - name: java/gradle.java
-        if: ${{ matrix.java == '17' || matrix.java == '21' }}
+        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
         run: .github/retry.sh ant $OPTS -f java/gradle.java test
 
       - name: extide/gradle
-        if: ${{ matrix.java == '17' || matrix.java == '21' }}
+        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
         run: ant $OPTS -f extide/gradle test
 
       - name: java/gradle.dependencies
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '17' || matrix.java == '21' || matrix.java == '25' }}
         run: ant $OPTS -f java/gradle.dependencies test
 
+      # TODO next are JDK 21 or 25 incompatibe steps
+      - name: java/java.mx.project
+        if: ${{ matrix.java == '17' || matrix.java == '21' }}
+        run: .github/retry.sh ant $OPTS -f java/java.mx.project test
+
       - name: extide/o.apache.tools.ant.module
         if: ${{ matrix.java == '17' }}
         run: ant $OPTS -f extide/o.apache.tools.ant.module test

enterprise/micronaut/test/unit/data/gradle/artifacts/multi/app/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("io.micronaut.application") version "3.7.10"
+    id("io.micronaut.application") version "4.6.1"
 }
 
 version = "0.1"
@@ -12,21 +11,22 @@ repositories {
 
 dependencies {
     annotationProcessor("io.micronaut:micronaut-http-validation")
-    implementation("io.micronaut:micronaut-http-client")
-    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut:micronaut-http-client-jdk")
+    implementation("io.micronaut.serde:micronaut-serde-jackson")
     implementation("jakarta.annotation:jakarta.annotation-api")
     runtimeOnly("ch.qos.logback:logback-classic")
-    implementation("io.micronaut:micronaut-validation")
+    implementation("io.micronaut.validation:micronaut-validation")
 
 }
 
-
 application {
     mainClass.set("com.example.Application")
 }
+
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 graalvmNative.toolchainDetection = false

enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle.properties

@@ -1 +1 @@
-micronautVersion=3.10.2
+micronautVersion=4.9.4

enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

enterprise/micronaut/test/unit/data/gradle/artifacts/multi/oci/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("io.micronaut.application") version "3.7.10"
+    id("io.micronaut.application") version "4.6.1"
 }
 
 version = "0.1"
@@ -12,26 +11,28 @@ repositories {
 
 dependencies {
     annotationProcessor("io.micronaut:micronaut-http-validation")
-    implementation("io.micronaut:micronaut-http-client")
-    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut:micronaut-http-client-jdk")
+    implementation("io.micronaut.serde:micronaut-serde-jackson")
     implementation("jakarta.annotation:jakarta.annotation-api")
     runtimeOnly("ch.qos.logback:logback-classic")
     implementation(project(":app"))
-    implementation("io.micronaut:micronaut-validation")
+    implementation("io.micronaut.validation:micronaut-validation")
 
 }
 
 
 application {
     mainClass.set("com.example.Application")
 }
+
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 task testJar(type: Jar) {
-    classifier = 'tests'
+    archiveClassifier = 'tests'
     from sourceSets.test.output
 }
 

enterprise/micronaut/test/unit/data/gradle/artifacts/multi/settings.gradle

@@ -2,5 +2,4 @@
 rootProject.name="demo"
 
 include("app")
-include("aws")
 include("oci")

enterprise/micronaut/test/unit/data/gradle/artifacts/simple/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id("com.github.johnrengelman.shadow") version "7.1.2"
-    id("io.micronaut.application") version "3.7.10"
+    id("io.micronaut.application") version "4.6.1"
 }
 
 version = "0.1"
@@ -12,25 +11,25 @@ repositories {
 
 dependencies {
     annotationProcessor("info.picocli:picocli-codegen")
-    implementation("info.picocli:picocli")
-    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.micronaut.serde:micronaut-serde-jackson")
     implementation("io.micronaut.picocli:micronaut-picocli")
     implementation("jakarta.annotation:jakarta.annotation-api")
     runtimeOnly("ch.qos.logback:logback-classic")
-    implementation("io.micronaut:micronaut-validation")
+    implementation("io.micronaut.validation:micronaut-validation")
 
-    testImplementation("io.micronaut:micronaut-http-client")
+    testImplementation("io.micronaut:micronaut-http-client-jdk")
 
-    implementation("org.apache.logging.log4j:log4j-core:2.15.0")
+    implementation("org.apache.logging.log4j:log4j-core:2.24.0")
 }
 
 
 application {
     mainClass.set("com.example.Demo2Command")
 }
 java {
-    sourceCompatibility = JavaVersion.toVersion("11")
-    targetCompatibility = JavaVersion.toVersion("11")
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 micronaut {

enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle.properties

@@ -1 +1 @@
-micronautVersion=3.10.1
+micronautVersion=4.9.4

enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists