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

Grails 7 Migration - Rundeck 6.0 Compatibility

Author: fdevans

.github/workflows/gradle.yml

@@ -8,16 +8,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - 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: Publish Release
 
@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        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

.gitignore

@@ -5,3 +5,4 @@
 /build
 .idea
 out
+bin

build.gradle

@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.nexusPublish)
 }
 
-group = 'org.rundeck.plugins'
+group = 'com.rundeck.plugins'
 ext.pluginClassNames = 'org.rundeck.plugins.nodes.icon.IconNodeEnhancer,org.rundeck.plugins.nodes.attributes.AttributeNodeEnhancer'
 ext.pluginName = 'Attribute Node Enhancer'
 ext.publishDescription = 'Adds icons to nodes based on attribute values'
@@ -18,15 +18,16 @@ ext.developers = [
 
 scmVersion {
     tag {
-    	//defines release tags like "v1.2.3"
-        prefix = 'v'
+        prefix = ''           // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
         versionSeparator = ''
     }
     ignoreUncommittedChanges = true
+    branchVersionCreator = ['main': 'simple', 'master': 'simple']  // Don't append branch name
+    versionCreator 'simple'  // Use simple version creator (just tag name)
 }
 
 allprojects {
-    project.version = scmVersion.version
+    project.version = scmVersion.version  // Dynamic version from git tag
     apply from: "${rootDir}/gradle/java.gradle"
 }
 
@@ -50,6 +51,13 @@ jar {
 }
 test {
     useJUnitPlatform()
+    
+    // Java 17+ module access for cglib/Spock mocking
+    jvmArgs = [
+        '--add-opens=java.base/java.lang=ALL-UNNAMED',
+        '--add-opens=java.base/java.util=ALL-UNNAMED',
+        '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED'
+    ]
 }
 
 dependencies {
@@ -74,11 +82,19 @@ configurations.all {
 
 // In this section you declare where to find the dependencies of your project
 repositories {
+    mavenLocal()
+    maven {
+        name = 'Central Portal Snapshots'
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+        content {
+            includeGroup('org.rundeck')
+        }
+    }
     mavenCentral()
 }
 
 nexusPublishing {
-    packageGroup = 'org.rundeck.plugins'
+    packageGroup = 'com.rundeck.plugins'
     repositories {
         sonatype {
             nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))

gradle/java.gradle

@@ -1,5 +1,6 @@
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
 axionRelease = "1.18.18"
-groovy = "3.0.24"
-rundeckCore = "5.19.0-20260202"
+groovy = "4.0.29"
+rundeckCore = "6.0.0-SNAPSHOT"
 nexusPublish = "2.0.0"
-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]
 rundeckCore = { group = "org.rundeck", name = "rundeck-core", version.ref = "rundeckCore" }
-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" }
 commonsLang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commonsLang3" }
 

gradle/publishing.gradle

@@ -55,6 +55,22 @@ publishing {
 
         }
     }
+    repositories {
+        def pkgcldWriteToken = System.getenv("PKGCLD_WRITE_TOKEN") ?: project.findProperty("pkgcldWriteToken")
+        if (pkgcldWriteToken) {
+            maven {
+                name = "PackageCloudTest"
+                url = uri("https://packagecloud.io/pagerduty/rundeckpro-test/maven2")
+                authentication {
+                    header(HttpHeaderAuthentication)
+                }
+                credentials(HttpHeaderCredentials) {
+                    name = "Authorization"
+                    value = "Bearer " + pkgcldWriteToken
+                }
+            }
+        }
+    }
 }
 def base64Decode = { String prop ->
     project.findProperty(prop) ?

gradle/wrapper/gradle-wrapper.properties

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

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17