Merge pull request #606 from rundeck/upgrade-gradle-8

[RUN-4418] Upgrade Gradle 4.8.14, Groovy 4, Java 17

Author: Jesus-Osuna-M

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: cimg/openjdk:11.0.29
+      - image: cimg/openjdk:17.0
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -49,7 +49,7 @@ jobs:
 
   snyk_test:
     docker:
-      - image: cimg/openjdk:11.0.29 # this should match what's used in the rest of the project
+      - image: cimg/openjdk:17.0 # this should match what's used in the rest of the project
     steps:
       - checkout
       - setup_remote_docker

.github/workflows/codeql-analysis.yml

@@ -47,10 +47,10 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
 
     - name: Grant execute permission for gradlew

.github/workflows/gradle.yml

@@ -13,10 +13,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@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -32,13 +32,8 @@ jobs:
     needs: build
     strategy:
       matrix:
-        jdk: [ "openjdk-11-jdk","openjdk-17-jdk","openjdk-21-jdk" ]
-        ubuntu: ["20.04", "22.04"]
-        include:
-          - jdk: 'openjdk-11-jdk'
-            ubuntu: '18.04'
-          - jdk: 'openjdk-17-jdk'
-            ubuntu: '18.04'
+        jdk: ["openjdk-17-jdk","openjdk-21-jdk", "openjdk-25-jdk" ]
+        ubuntu: ["22.04"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -60,7 +55,8 @@ jobs:
     needs: build
     strategy:
       matrix:
-        jdk: [ "java-11-openjdk","java-17-openjdk","java-21-openjdk" ]
+        # UBI 8 repos ship 17 and 21; java-25-openjdk is not available on el8
+        jdk: ["java-17-openjdk","java-21-openjdk"]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -87,10 +83,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@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

.github/workflows/release.yml

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

.github/workflows/test-signing.yml

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

CHANGELOG.md

@@ -1,7 +1,14 @@
 ## Unreleased
 
-* **Security Fix**: External extension directory loading is now disabled by default to prevent arbitrary code execution vulnerability. To enable extension loading from external directories, set environment variable `RD_EXT_DISABLED=false`. (Addresses RUN-3540)
+## 3.0.0
 
+* **Breaking change**: Java 17 or later is required to run the CLI and to build from source. Java 11 is no longer supported.
+* **Security**: External extension directory loading is now disabled by default to prevent arbitrary code execution. To enable extension loading from external directories, set environment variable `RD_EXT_DISABLED=false`. (Addresses RUN-3540)
+* Build: Gradle 8, Groovy 4, and dependency updates (including Jackson).
+* CI and packaging tests: workflows and Docker-based install/upgrade tests now target Java 17 and later (Java 11 combinations removed).
+* Documentation: the in-repo Jekyll site under `docs/` was removed; use the [published CLI documentation](https://docs.rundeck.com/docs/rd-cli/) and [changelog](https://rundeck.github.io/rundeck-cli/changes/) on the web.
+
+[Changes](https://github.com/rundeck/rundeck-cli/compare/v2.0.9...v3.0.0)
 
 ## 2.0.9
 

README.md

@@ -66,6 +66,11 @@ Dependency verification is automatically updated by Renovate when dependencies c
 
 This updates both `gradle/verification-metadata.xml` (trusted keys) and `gradle/verification-keyring.keys` (PGP keyring). Commit both files.
 
+**Rundeck `X.Y.Z-SNAPSHOT`:** If that command fails with `Multiple entries with same key` for `org.rundeck:rundeck-authz-*`, Gradle merged two different snapshot builds in one run. Use one of these approaches:
+
+1. Temporarily set `rundeck` in `gradle/libs.versions.toml` to a **released** version on Maven Central (see `org.rundeck:rundeck-authz-core` there), run the command above, then restore `X.Y.Z-SNAPSHOT` and **re-apply** the Sonatype snapshot checksum blocks for the authz JARs/modules (or copy them from a prior commit).
+2. Add or adjust checksums and trusted keys **by hand** for the new snapshot build, using artifacts from [Sonatype snapshots](https://central.sonatype.com/repository/maven-snapshots/).
+
 ## Refresh Dependency Verification Keys
 
 After a failed build.

build.gradle

@@ -31,8 +31,8 @@ subprojects{
     apply plugin: "java-library"
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         withJavadocJar()
         withSourcesJar()
     }
@@ -165,9 +165,15 @@ allprojects {
     project.version = scmVersion.version
     ext.rpmVersion=project.version.replaceAll('-', '.')
 
+    // Central and Sonatype snapshots before mavenLocal() so org.rundeck artifacts are not
+    // shadowed by stale ~/.m2 copies (avoids duplicate verification / metadata merge issues).
     repositories {
-        mavenLocal()
         mavenCentral()
+        maven {
+            url = uri('https://central.sonatype.com/repository/maven-snapshots/')
+            mavenContent { snapshotsOnly() }
+        }
+        mavenLocal()
     }
 }
 

dockers/install/rpm/Dockerfile

@@ -1,5 +1,5 @@
 FROM redhat/ubi8
-ARG JDK=java-11-openjdk
+ARG JDK=java-17-openjdk
 RUN yum -y update
 RUN yum -y install ${JDK} ${JDK}-devel which
 RUN which java

dockers/install/upgrade-rpm/Dockerfile

@@ -1,6 +1,6 @@
 FROM redhat/ubi8
 
-ARG JDK=java-11-openjdk
+ARG JDK=java-17-openjdk
 RUN yum -y update
 RUN yum -y install ${JDK} ${JDK}-devel which
 RUN which java