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

Grails 7 Migration - Rundeck 6.0 Compatibility

Author: fdevans

.github/workflows/gradle.yml

@@ -8,27 +8,28 @@ 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.8
-        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: 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.4.1
+        uses: actions/upload-artifact@v4
         with:
           # Artifact name
           name: Grails-Plugin-${{ steps.get_version.outputs.VERSION }}
           # Directory containing files to upload
-          path: build/libs/http-notification-plugin-${{ steps.get_version.outputs.VERSION }}.jar
+          path: build/libs/http-notification-${{ steps.get_version.outputs.VERSION }}.jar

.github/workflows/release.yml

@@ -1,46 +1,42 @@
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-      - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - '*.*.*'
 
-name: Upload Release Asset
+name: Publish Release
 
 jobs:
   build:
-    name: Upload Release Asset
+    name: Publish Release
     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.8
-        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
+        run: VERSION=$(./gradlew currentVersion -q -Prelease.quiet) && echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       - name: Create Release
-        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/http-notification-${{ 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
+      - name: Publish to Maven Central
+        run: ./gradlew -PsigningKey=${SIGNING_KEY_B64} -PsigningPassword=${SIGNING_PASSWORD} -PsonatypeUsername=${SONATYPE_USERNAME} -PsonatypePassword=${SONATYPE_PASSWORD} publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/libs/http-notification-plugin-${{ steps.get_version.outputs.VERSION }}.jar
-          asset_name: http-notification-plugin-${{ steps.get_version.outputs.VERSION }}.jar
-          asset_content_type: application/octet-stream
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SIGNING_KEY_B64: ${{ secrets.SIGNING_KEY_B64 }}
+          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}

build.gradle

@@ -1,45 +1,38 @@
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url "https://oss.sonatype.org/content/groups/public"}
-    }
-}
-
 plugins {
-    id 'pl.allegro.tech.build.axion-release' version '1.13.4'
+    id 'pl.allegro.tech.build.axion-release' version '1.17.2'
+    id 'groovy'
+    id 'java'
+    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
-group 'com.rundeck.plugin'
-
-apply plugin: 'pl.allegro.tech.build.axion-release'
-apply plugin: 'groovy'
-apply plugin: 'java'
-
-sourceCompatibility = 11
-ext.rundeckPluginVersion = '1.2'
-ext.pluginClassNames='com.rundeck.plugin.HttpNotificationPlugin'
-ext.pluginName = 'Http Notification'
-ext.pluginDescription = 'A notification plugin that makes HTTP requests'
+group 'org.rundeck.plugins'
 
+ext.publishName = "Http Notification ${project.version}"
+ext.githubSlug = 'rundeck-plugins/http-notification'
+ext.developers = [
+        [id: 'gschueler', name: 'Greg Schueler', email: 'greg@rundeck.com']
+]
 
 scmVersion {
-    ignoreUncommittedChanges = true
+    ignoreUncommittedChanges = false
     tag {
-        prefix = ''
+        prefix = ''           // NO "v" prefix - see PLUGIN_TAGGING_ARCHITECTURE.md
         versionSeparator = ''
-        def origDeserialize=deserialize
-        //apend .0 to satisfy semver if the tag version is only X.Y
-        deserialize = { config, position, tagName ->
-            def orig = origDeserialize(config, position, tagName)
-            if (orig.split('\\.').length < 3) {
-                orig += ".0"
-            }
-            orig
-        }
     }
 }
-project.version = scmVersion.version
+
+version = scmVersion.version  // Dynamic version from git tag
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+    withSourcesJar()
+    withJavadocJar()
+}
+ext.rundeckPluginVersion = '1.2'
+ext.pluginClassNames='com.rundeck.plugin.HttpNotificationPlugin'
+ext.pluginName = 'Http Notification'
+ext.pluginDescription = 'A notification plugin that makes HTTP requests'
 
 configurations{
     //declare custom pluginLibs configuration to include only libs for this plugin
@@ -52,54 +45,55 @@ configurations{
 }
 
 repositories {
-    mavenCentral()
     mavenLocal()
-    maven { url 'https://jitpack.io' }
-
-}
-
-dependencies {
-    implementation 'org.rundeck:rundeck-core:5.14.0-rc1-20250722'
-
-    pluginLibs ('com.github.rundeck-plugins:http-step:1.1.6'){
-        exclude group: 'org.rundeck', module: 'rundeck-core'
+    maven {
+        name = 'Central Portal Snapshots'
+        url = 'https://central.sonatype.com/repository/maven-snapshots/'
+        content {
+            includeGroup('org.rundeck')
+        }
     }
-
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
-    implementation 'org.codehaus.groovy:groovy-all:3.0.9'
-    
-    // Add secure commons-lang3 to provide alternative to vulnerable commons-lang 2.6
-    implementation 'org.apache.commons:commons-lang3:3.18.0'
-
-    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
-
-    testImplementation "org.codehaus.groovy:groovy-all:3.0.17"
-    testImplementation "org.spockframework:spock-core:2.0-groovy-3.0"
-    testImplementation "cglib:cglib-nodep:2.2.2"
-    testImplementation 'org.objenesis:objenesis:1.4'
-
-}
-
-configurations.all {
-    resolutionStrategy {
-        // Replace vulnerable commons-lang with secure commons-lang3
-        dependencySubstitution {
-            substitute module('commons-lang:commons-lang') using module('org.apache.commons:commons-lang3:3.18.0')
+    maven {
+        name = "PackageCloudTest"
+        url = uri("https://packagecloud.io/pagerduty/rundeckpro-test/maven2")
+        content {
+            includeGroup('org.rundeck.plugins')
         }
     }
+    mavenCentral()
 }
 
+dependencies {
+    implementation 'org.apache.groovy:groovy-all:4.0.29'
+    compileOnly 'org.rundeck:rundeck-core:6.0.0-alpha1-20260407'
+    testImplementation 'org.rundeck:rundeck-core:6.0.0-alpha1-20260407'
+    
+    // Apache HTTP client dependencies for compilation (http-step bundles these but doesn't expose them transitively)
+    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
+    // Version 3.18.0 fixes CVE-2025-48924 (StackOverflowError in ClassUtils)
+    implementation 'org.apache.commons:commons-lang3:3.20.0'
+    
+    // Bundle http-step plugin in lib/ directory for runtime
+    // Use transitive=false to avoid duplicating dependencies already bundled in http-step JAR
+    pluginLibs ('org.rundeck.plugins:http-step:1.1.20-grails7') {
+        transitive = false
+    }
 
-// task to copy plugin libs to output/lib dir
-task copyToLib(type: Copy) {
-    into "$buildDir/output/lib"
-    from configurations.pluginLibs
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation "org.apache.groovy:groovy-all:4.0.29"
+    testImplementation "org.spockframework:spock-core:2.4-groovy-4.0"
+    testImplementation "net.bytebuddy:byte-buddy:1.14.11"
+    testImplementation 'org.objenesis:objenesis:3.4'
 }
 
 
 
 jar {
-    from "$buildDir/output"
+    // Include plugin dependencies in lib/ directory
+    into('lib') {
+        from configurations.pluginLibs
+    }
+    
     manifest {
         def libList = configurations.pluginLibs.collect{'lib/' + it.name}.join(' ')
         attributes 'Rundeck-Plugin-Name' : pluginName
@@ -115,13 +109,28 @@ jar {
         attributes 'Rundeck-Plugin-Archive': 'true'
         attributes 'Rundeck-Plugin-Libs': "${libList}"
     }
-    dependsOn(copyToLib)
 }
 
+test {
+    useJUnit()
+    
+    // Java 17+ module access for reflection/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.net=ALL-UNNAMED'
+    ]
+}
 
-//set jar task to depend on copyToLib
-jar.dependsOn(copyToLib)
+nexusPublishing {
+    packageGroup = 'org.rundeck.plugins'
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
+        }
+    }
+}
 
-tasks.withType(Test) {
-    useJUnitPlatform()
-}
+apply from: "${rootDir}/gradle/publishing.gradle"

gradle/publishing.gradle

@@ -0,0 +1,86 @@
+/**
+ * Define project extension values in the project gradle file before including this file:
+ *
+ * publishName = 'Name of Package'
+ * publishDescription = 'description' (optional)
+ * githubSlug = Github slug e.g. 'rundeck/rundeck-cli'
+ * developers = [ [id:'id', name:'name', email: 'email' ] ] list of developers
+ *
+ * Define project properties to sign and publish when invoking publish task:
+ *
+ *     ./gradlew \
+ *     -PsigningKey="base64 encoded gpg key" \
+ *     -PsigningPassword="password for key" \
+ *     -PsonatypeUsername="sonatype token user" \
+ *     -PsonatypePassword="sonatype token password" \
+ *     publishToSonatype closeAndReleaseSonatypeStagingRepository
+ */
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+publishing {
+    publications {
+        "${project.name}"(MavenPublication) { publication ->
+            from components.java
+
+            pom {
+                name = publishName
+                description = project.ext.hasProperty('publishDescription') ? project.ext.publishDescription :
+                        project.description ?: publishName
+                url = "https://github.com/${githubSlug}"
+                licenses {
+                    license {
+                        name = 'The Apache Software License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        distribution = 'repo'
+                    }
+                }
+                scm {
+                    url = "https://github.com/${githubSlug}"
+                    connection = "scm:git:git@github.com/${githubSlug}.git"
+                    developerConnection = "scm:git:git@github.com:${githubSlug}.git"
+                }
+                if (project.ext.developers) {
+                    developers {
+                        project.ext.developers.each { dev ->
+                            developer {
+                                id = dev.id
+                                name = dev.name
+                                email = dev.email
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+    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) ?
+            new String(Base64.getDecoder().decode(project.findProperty(prop).toString())).trim() :
+            null
+}
+
+if (project.hasProperty('signingKey') && project.hasProperty('signingPassword')) {
+    signing {
+        useInMemoryPgpKeys(base64Decode("signingKey"), project.signingPassword)
+        sign(publishing.publications)
+    }
+}