Grails 7 Migration - Rundeck 6.0 Compatibility

.github/workflows/gradle.yml

@@ -14,10 +14,10 @@ jobs:
       - name: Get Fetch Tags
         run: git -c protocol.version=2 fetch --tags --progress --no-recurse-submodules origin
         if: "!contains(github.ref, 'refs/tags')"
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/release.yml

@@ -16,10 +16,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
       - name: Build with Gradle
         run: ./gradlew build

.github/workflows/snapshot-release.yml

@@ -17,10 +17,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'zulu'
       - name: Build with Gradle
         run: ./gradlew build

build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'java'
 }
 
-group 'com.rundeck'
+group 'org.rundeck.plugins'
 
 ext.rundeckPluginVersion = '1.2'
 ext.publishName = "Git Plugin ${project.version}"
@@ -18,19 +18,19 @@ ext.developers = [
 
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }
 
 scmVersion {
-    ignoreUncommittedChanges = true
+    ignoreUncommittedChanges = false
     tag {
-        prefix = ''
+        prefix = ''           // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
         versionSeparator = ''
     }
-    versionCreator("simple")
+    versionCreator 'simple'  // Use simple version creator (just tag name)
 }
 project.version = scmVersion.version
 
@@ -53,7 +53,8 @@ configurations {
 dependencies {
     // Use catalog aliases for dependencies
     implementation(libs.groovyAll)
-    implementation(libs.rundeckCore)
+    compileOnly(libs.rundeckCore)
+    testImplementation(libs.rundeckCore)
     implementation(libs.slf4jApi)
 
     // Add secure commons-lang3 to provide alternative to vulnerable commons-lang 2.6
@@ -122,6 +123,26 @@ nexusPublishing {
 
 test {
     useJUnitPlatform()
+    // Java 17 requires these for cglib/Spock mocking
+    jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+            '--add-opens', 'java.base/java.util=ALL-UNNAMED'
 }
 
 apply from: "${rootDir}/gradle/publishing.gradle"
+
+// Add PackageCloud repository
+publishing {
+    repositories {
+        maven {
+            name = "PackageCloudTest"
+            url = uri("https://packagecloud.io/pagerduty/rundeckpro-test/maven2")
+            authentication {
+                header(HttpHeaderAuthentication)
+            }
+            credentials(HttpHeaderCredentials) {
+                name = "Authorization"
+                value = "Bearer " + (System.getenv("PKGCLD_WRITE_TOKEN") ?: project.findProperty("pkgcldWriteToken"))
+            }
+        }
+    }
+}

gradle/libs.versions.toml

@@ -3,34 +3,34 @@
 axionRelease = "1.18.18"
 nexusPublish = "1.3.0"
 # Libraries
-groovy = "3.0.22"
+groovy = "4.0.29"
 junit = "4.13.2"
-rundeckCore = "5.16.0-20251006"
+rundeckCore = "6.0.0-alpha1-20260407"
 slf4j = "1.7.36"
 jgit = "6.6.1.202309021850-r"
 jgitSshApache = "6.6.1.202309021850-r"
-spock = "2.0-groovy-3.0"
-cglib = "3.3.0"
-objenesis = "1.4"
+spock = "2.3-groovy-4.0"
+bytebuddy = "1.14.11"
+objenesis = "3.3"
 # Security overrides for transitive dependencies
 okhttp3 = "4.12.0"
 okio = "3.9.1"
-commonsLang3 = "3.18.0"
+commonsLang3 = "3.20.0"
 
 [libraries]
-groovyAll   = { group = "org.codehaus.groovy", name = "groovy-all", version.ref = "groovy" }
+groovyAll   = { group = "org.apache.groovy", name = "groovy-all", version.ref = "groovy" }
 junit       = { group = "junit", name = "junit", version.ref = "junit" }
 rundeckCore = { group = "org.rundeck", name = "rundeck-core", version.ref = "rundeckCore" }
 slf4jApi    = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
 jgit        = { group = "org.eclipse.jgit", name = "org.eclipse.jgit", version.ref = "jgit" }
 jgitSshApache = { group = "org.eclipse.jgit", name = "org.eclipse.jgit.ssh.apache", version.ref = "jgitSshApache" }
 spockCore   = { group = "org.spockframework", name = "spock-core", version.ref = "spock" }
-cglibNodep  = { group = "cglib", name = "cglib-nodep", version.ref = "cglib" }
+bytebuddy   = { group = "net.bytebuddy", name = "byte-buddy", version.ref = "bytebuddy" }
 objenesis   = { group = "org.objenesis", name = "objenesis", version.ref = "objenesis" }
 commonsLang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commonsLang3" }
 
 [bundles]
-testLibs = ["junit", "groovyAll", "spockCore", "cglibNodep", "objenesis"]
+testLibs = ["junit", "groovyAll", "spockCore", "bytebuddy", "objenesis"]
 
 [plugins]
 axionRelease = { id = "pl.allegro.tech.build.axion-release", version.ref = "axionRelease" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists