fix build for JDK24+ (take 2, test our explicit target version)

paulk-asert · paulk-asert · commit bd3020b9d468 · 2026-04-04T05:19:59.000+10:00
diff --git a/subprojects/groovy-ant/build.gradle b/subprojects/groovy-ant/build.gradle
@@ -16,6 +16,8 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+import org.apache.groovy.gradle.TargetJavaHomeSupport
+
 plugins {
     id 'org.apache.groovy-library'
 }
@@ -41,7 +43,9 @@ dependencies {
 }
 
 tasks.withType(Test).configureEach {
-    if (JavaVersion.current() < JavaVersion.VERSION_24) {
+    Integer feature = TargetJavaHomeSupport.featureVersionFromReleaseFile(TargetJavaHomeSupport.targetJavaHome(project))
+    boolean testJdkPre24 = feature != null ? feature < 24 : JavaVersion.current() < JavaVersion.VERSION_24
+    if (testJdkPre24) {
         // Setting isn't allowed for Java 24+ but hushes security manager warnings from Ant for JDK17-23
         jvmArgs '-Djava.security.manager=allow'
     }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`* specific language governing permissions and limitations`
`17`	`17`	`* under the License.`
`18`	`18`	`*/`
	`19`	`+import org.apache.groovy.gradle.TargetJavaHomeSupport`
	`20`	`+`
`19`	`21`	`plugins {`
`20`	`22`	`id 'org.apache.groovy-library'`
`21`	`23`	`}`
`@@ -41,7 +43,9 @@ dependencies {`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`tasks.withType(Test).configureEach {`
`44`		`- if (JavaVersion.current() < JavaVersion.VERSION_24) {`
	`46`	`+ Integer feature = TargetJavaHomeSupport.featureVersionFromReleaseFile(TargetJavaHomeSupport.targetJavaHome(project))`
	`47`	`+ boolean testJdkPre24 = feature != null ? feature < 24 : JavaVersion.current() < JavaVersion.VERSION_24`
	`48`	`+ if (testJdkPre24) {`
`45`	`49`	`// Setting isn't allowed for Java 24+ but hushes security manager warnings from Ant for JDK17-23`
`46`	`50`	`jvmArgs '-Djava.security.manager=allow'`
`47`	`51`	`}`