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

fdevans · web-flow · commit 191dd44f60b7 · 2026-04-06T11:56:48.000-07:00
Grails 7 Migration - Rundeck 6.0 Compatibility
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -8,31 +8,34 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - 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 1.11
-        uses: actions/setup-java@v1
+      - 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
       - name: Build with Gradle
         run: ./gradlew build
       - name: Copy Artifact for integration test
         run: ./gradlew :functional-test:copyPluginArtifact
+        if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
       - name: Run integration Test
         run: ./gradlew :functional-test:functionalTest
+        if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
       - name: Get Release Version
         id: get_version
-        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
+        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       - name: Upload plugin jar
         uses: actions/upload-artifact@v4
         with:
           # Artifact name
           name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}
           # Directory containing files to upload
-          path: build/libs/ansible-plugin-${{ steps.get_version.outputs.VERSION }}.jar
+          path: build/libs/ansible-plugin-${{ steps.get_version.outputs.VERSION }}.jar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,35 +12,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: set up JDK 1.11
-        uses: actions/setup-java@v1
+      - 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
       - name: Get Release Version
         id: get_version
-        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo ::set-output name=VERSION::$VERSION
-      - name: Create Release
+        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+      - name: Create Release and Upload Asset
         id: create_release
-        uses: actions/create-release@v1.0.0
+        run: |
+          gh release create \
+            --generate-notes \
+            --title 'Release ${{ steps.get_version.outputs.VERSION }}' \
+            ${{ github.ref_name }} \
+            build/libs/ansible-plugin-${{ steps.get_version.outputs.VERSION }}.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ steps.get_version.outputs.VERSION }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset (jar)
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/libs/ansible-plugin-${{ steps.get_version.outputs.VERSION }}.jar
-          asset_name: ansible-plugin-${{ steps.get_version.outputs.VERSION }}.jar
-          asset_content_type: application/octet-stream
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
   id 'maven-publish'
 }
 
-group = 'com.github.rundeck-plugins'
+group = 'com.rundeck.plugins'
 
 ext.rundeckPluginVersion = '1.2'
 ext.pluginClassNames = [
@@ -21,21 +21,38 @@ ext.pluginClassNames = [
 
 apply plugin: 'java'
 apply plugin: 'groovy'
-sourceCompatibility = 1.11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 scmVersion {
     ignoreUncommittedChanges = false
     tag {
-        prefix = 'v'
+        prefix = ''           // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
         versionSeparator = ''
     }
 }
 
-version = scmVersion.version
+version = scmVersion.version  // Dynamic version from git tag
 
 repositories {
-  mavenCentral()
   mavenLocal()
+    maven {
+        name = 'Central Portal Snapshots'
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+        content {
+            includeGroup('org.rundeck')
+        }
+    }  // Must be FIRST for Grails 7 development
+    maven {
+        name = 'Central Portal Snapshots'
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+        
+        // Only search this repository for org.rundeck snapshots
+        content {
+            includeGroup('org.rundeck')
+        }
+    }
+  mavenCentral()
 }
 
 configurations {
@@ -44,7 +61,7 @@ configurations {
   // Security: Force resolution of vulnerable dependencies
   all {
     resolutionStrategy {
-      force 'org.apache.commons:commons-lang3:3.18.0'
+      force 'org.apache.commons:commons-lang3:3.20.0'
       force 'org.apache.commons:commons-compress:1.28.0'
       force 'org.jetbrains.kotlin:kotlin-stdlib:2.1.0'
       // Exclude old commons-lang to prevent conflicts
@@ -77,11 +94,22 @@ dependencies {
   testAnnotationProcessor libs.lombok
 
   testImplementation libs.spock.core
+  testImplementation libs.bytebuddy
+  testImplementation libs.objenesis
 
 }
 
 tasks.withType(Test).configureEach {
   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',
+    '--add-opens=java.base/java.io=ALL-UNNAMED',
+    '--add-opens=java.base/java.net=ALL-UNNAMED'
+  ]
 }
 
 task copyToLib(type: Copy) {
@@ -114,8 +142,24 @@ jar {
 publishing {
   publications {
     maven(MavenPublication) {
+      groupId = 'com.rundeck.plugins'
       artifactId = 'ansible-plugin'
+      version = project.version
       from components.java
     }
   }
+  
+  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"))
+      }
+    }
+  }
 }
diff --git a/functional-test/build.gradle b/functional-test/build.gradle
@@ -11,12 +11,6 @@ repositories {
 group = 'com.github.rundeck-plugins'
 
 configurations {
-    configurations {
-        instrumentedClasspath {
-            canBeConsumed = false
-        }
-    }
-    
     // Security: Force resolution of vulnerable dependencies
     all {
         resolutionStrategy {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,24 @@
 [versions]
 # Security-fixed versions
-commons-lang3 = "3.18.0"
+commons-lang3 = "3.17.0"
 commons-compress = "1.28.0"
 kotlin-stdlib = "2.1.0"
 
 # Current dependency versions (maintained for compatibility)
 gson = "2.10.1"
-jackson = "2.16.1"
+jackson = "2.21.2"
 snakeyaml = "2.2"
-groovy = "3.0.15"
+groovy = "4.0.29"
 lombok = "1.18.30"
-spock = "2.1-groovy-3.0"
+spock = "2.4-groovy-4.0"
 testcontainers = "1.19.0"
-rd-api-client = "2.0.8"
+rd-api-client = "2.0.9"
 jsch = "0.1.55"
+bytebuddy = "1.14.11"
+objenesis = "3.4"
 
 # Rundeck version
-rundeck-core = "5.16.0-20251006"
+rundeck-core = "6.0.0-SNAPSHOT"
 
 [libraries]
 # Security overrides
@@ -29,11 +31,13 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "snakeyaml" }
-groovy-all = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
+groovy-all = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
 lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
 testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }
 rd-api-client = { module = "org.rundeck.api:rd-api-client", version.ref = "rd-api-client" }
 jsch = { module = "com.jcraft:jsch", version.ref = "jsch" }
-rundeck-core = { module = "org.rundeck:rundeck-core", version.ref = "rundeck-core" }
+rundeck-core = { module = "org.rundeck:rundeck-core", version.ref = "rundeck-core" }
+bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
+objenesis = { module = "org.objenesis:objenesis", version.ref = "objenesis" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jitpack.yml b/jitpack.yml
@@ -1,2 +1,2 @@
 jdk:
-  - openjdk11
+  - openjdk17
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,2 @@
-enableFeaturePreview('VERSION_CATALOGS')
-
 rootProject.name = 'ansible-plugin'
 include 'functional-test'
diff --git a/src/test/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceSpec.groovy b/src/test/groovy/com/rundeck/plugins/ansible/plugin/AnsibleResourceModelSourceSpec.groovy
@@ -34,9 +34,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         ResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()
@@ -104,9 +102,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         ResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()
@@ -137,9 +133,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
     void "ansible yaml data size parameter with an Exception"() {
         given:
         Framework framework = Mock(Framework) {
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
@@ -175,9 +169,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         ResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()
@@ -229,9 +221,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
     void "tag hosts is empty"() {
         given:
         Framework framework = Mock(Framework) {
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
@@ -285,9 +275,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         AnsibleResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()
@@ -330,9 +318,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         AnsibleResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()
@@ -378,9 +364,7 @@ class AnsibleResourceModelSourceSpec extends Specification {
             getPropertyLookup() >> Mock(IPropertyLookup){
                 getProperty("framework.tmp.dir") >> '/tmp'
             }
-            getBaseDir() >> Mock(File) {
-                getAbsolutePath() >> '/tmp'
-            }
+            getBaseDir() >> new File('/tmp')
         }
         AnsibleResourceModelSource plugin = new AnsibleResourceModelSource(framework)
         Properties config = new Properties()

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`jdk:`
`2`		`- - openjdk11`
	`2`	`+ - openjdk17`