Merge pull request #196 from rundeck-plugins/grails7-upgrade

Grails 7 Migration - Rundeck 6.0 Compatibility

Author: fdevans

.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

@@ -2,7 +2,7 @@ on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - '*.*.*' # Push events to matching semver tags (no v prefix)
 
 name: Upload Release Asset
 
@@ -15,10 +15,10 @@ jobs:
         uses: actions/checkout@v4
         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

@@ -21,7 +21,7 @@ ext.developers = [
 ]
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }
@@ -37,9 +37,10 @@ ext.rundeckPluginVersion = '1.1'
 scmVersion {
     ignoreUncommittedChanges = false
     tag {
-        prefix = 'v'
+        prefix = ''           // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
         versionSeparator = ''
     }
+    versionCreator 'simple'  // Use simple version creator (just tag name)
 }
 project.version = scmVersion.version
 
@@ -54,12 +55,22 @@ configurations{
     }
 }
 repositories {
-    mavenCentral()
     mavenLocal()
+    maven {
+        name = 'Central Portal Snapshots'
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+        content {
+            includeGroup('org.rundeck')
+        }
+    }
+    mavenCentral()
 }
 dependencies {
     implementation libs.slf4jApi
-    implementation(libs.rundeckCore) {
+    compileOnly(libs.rundeckCore) {
+        exclude group: "com.google.guava"
+    }
+    testImplementation(libs.rundeckCore) {
         exclude group: "com.google.guava"
     }
     implementation libs.bundles.awsSdk
@@ -120,6 +131,9 @@ jar {
 
 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'
 }
 //set jar task to depend on copyToLib
 jar.dependsOn(copyToLib)
@@ -134,4 +148,21 @@ nexusPublishing {
     }
 }
 
-apply from: "${rootDir}/gradle/publishing.gradle"
+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,15 +3,15 @@ axionRelease = "1.18.17"
 awsSdk = "1.12.780"
 cglib = "3.3.0"
 commonsBeanutils = "1.11.0"
-groovy = "3.0.23"
-jacksonDatabind = "2.18.2"
+groovy = "4.0.29"
+jacksonDatabind = "2.21.2"
 nexusPublish = "2.0.0"
 objenesis = "3.4"
-rundeckCore = "5.14.0-rc1-20250722"
+rundeckCore = "6.0.0-alpha1-20260407"
 slf4j = "1.7.36"
-spock = "2.3-groovy-3.0"
+spock = "2.4-groovy-4.0"
 # Security overrides for transitive dependencies
-commonsLang3 = "3.18.0"
+commonsLang3 = "3.20.0"
 
 [libraries]
 slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
@@ -21,7 +21,7 @@ awsSdkSts = { group = "com.amazonaws", name = "aws-java-sdk-sts", version.ref =
 jacksonDatabind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonDatabind" }
 commonsBeanutils = { group = "commons-beanutils", name = "commons-beanutils", version.ref = "commonsBeanutils" }
 awsSdkEc2 = { group = "com.amazonaws", name = "aws-java-sdk-ec2", version.ref = "awsSdk" }
-groovyAll = { group = "org.codehaus.groovy", name = "groovy-all", version.ref = "groovy" }
+groovyAll = { group = "org.apache.groovy", name = "groovy-all", version.ref = "groovy" }
 spockCore = { group = "org.spockframework", name = "spock-core", version.ref = "spock" }
 cglibNodep = { group = "cglib", name = "cglib-nodep", version.ref = "cglib" }
 objenesis = { group = "org.objenesis", name = "objenesis", version.ref = "objenesis" }

gradle/wrapper/gradle-wrapper.properties

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