use version properties for Groovy versions:

* performance baselines default to latest v3, v4, v5 but can have hard-coded versions too
* binaryCompatBaseline has a similar latest version approach, but we can also fix in gradle.properties or a system property

Author: paulk-asert

build-logic/src/main/groovy/org.apache.groovy-dep-updates.gradle

@@ -31,18 +31,16 @@ def jdkRejections = new java.util.concurrent.ConcurrentHashMap<String, Set<Strin
 // Used for two purposes:
 //   * hint-skip gate in depUpHints (suppress misleading cross-track bump hints)
 //   * in-track update detection in depUpCapped (proactively warn when a newer
-//     within-track version is available, e.g. binary-compat baseline drift)
-// TODO: migrate performance-test baselines ('3.0.25', '4.0.31', '5.0.5' currently hardcoded
-//       in subprojects/performance/build.gradle:24) into versions.properties and add
-//       matching cappedTracks entries so depUpCapped surfaces drift on those too.
+//     within-track version is available, e.g. Groovy baseline drift on each mainline)
 def cappedTracks = [
     [group: 'org.junit.jupiter',  name: 'junit-jupiter',           current: versions.junit5,         maxPrefix: '5.'],
     [group: 'org.junit.jupiter',  name: 'junit-jupiter-api',       current: versions.junit5,         maxPrefix: '5.'],
     [group: 'org.junit.jupiter',  name: 'junit-jupiter-engine',    current: versions.junit5,         maxPrefix: '5.'],
     [group: 'org.junit.jupiter',  name: 'junit-jupiter-params',    current: versions.junit5,         maxPrefix: '5.'],
     [group: 'org.junit.platform', name: 'junit-platform-launcher', current: versions.junit5Platform, maxPrefix: '1.'],
-    [group: 'org.apache.groovy',  name: 'groovy',
-     current: sharedConfiguration.binaryCompatibilityBaselineVersion.get(),                          maxPrefix: '5.0.'],
+    [group: 'org.codehaus.groovy', name: 'groovy',                 current: versions.latest3,        maxPrefix: '3.0.'],
+    [group: 'org.apache.groovy',   name: 'groovy',                 current: versions.latest4,        maxPrefix: '4.0.'],
+    [group: 'org.apache.groovy',   name: 'groovy',                 current: versions.latest5,        maxPrefix: '5.0.'],
 ]
 def capByCoord = cappedTracks.collectEntries { [("${it.group}:${it.name}".toString()): it.maxPrefix] }
 

gradle.properties

@@ -20,7 +20,7 @@ groovyBundleVersion=6.0.0.SNAPSHOT
 groovyTargetBytecodeVersion=17
 targetJavaVersion=17
 
-binaryCompatibilityBaseline=5.0.4
+binaryCompatibilityBaseline=versions.latest5
 gradle_version=9.4.0
 
 groovyJUnit_ms=512m

subprojects/binary-compatibility/build.gradle

@@ -38,7 +38,10 @@ rootProject.allprojects {
     pluginManager.withPlugin('org.apache.groovy-base') {
         if (groovyLibrary.checkBinaryCompatibility.get()) {
             def taskName = "japicmp${project.name.split('-').collect{ it.capitalize() }.join()}"
-            def baselineCoords = "org.apache.groovy:${project.name}:${sharedConfiguration.binaryCompatibilityBaselineVersion.get()}@jar"
+            // Accept either an explicit version ('5.0.4') or a pseudo-property reference ('versions.latest5')
+            def rawBaseline = sharedConfiguration.binaryCompatibilityBaselineVersion.get()
+            def baselineVersion = rawBaseline.startsWith('versions.') ? versions."${rawBaseline.substring('versions.'.length())}" : rawBaseline
+            def baselineCoords = "org.apache.groovy:${project.name}:${baselineVersion}@jar"
             def baseline = thisProject.configurations.create("${taskName}Baseline") {
                 dependencies.add(thisProject.dependencies.create(baselineCoords))
             }

subprojects/performance/build.gradle

@@ -21,7 +21,7 @@ plugins {
 }
 
 performanceTests {
-    versions 'current', '3.0.25', '4.0.31', '5.0.5'
+    versions 'current', versions.latest3, versions.latest4, versions.latest5
 
     testFiles project.files("src/files") +
             project.files('src/jmh/groovy/org/apache/groovy/bench/Ackermann.groovy') +

versions.properties

@@ -45,6 +45,9 @@ junit=4.13.2
 junit5=5.14.3
 junit5Platform=1.14.3
 junit6=6.0.3
+latest3=3.0.25
+latest4=4.0.31
+latest5=5.0.5
 log4j=1.2.17
 log4j2=2.25.3
 logback=1.5.32