Automatic merge from release/2.10 -> release/2.11

.github/workflows/auto-merge.yml

@@ -0,0 +1,28 @@
+name: Automatic Branch Merging
+
+on:
+  pull_request:
+    types:
+      - closed
+
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+
+jobs:
+  merge:
+    name: Cascading Auto Merge
+    runs-on: ubuntu-latest
+
+    if: |
+      github.event.pull_request.merged == true &&
+      startsWith(github.base_ref, 'release/')
+
+    steps:
+      - name: Automatic Merge
+        uses: ActionsDesk/cascading-downstream-merge@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          prefixes: release/
+          ref_branch: develop

.github/workflows/maven.yml

@@ -5,19 +5,19 @@ name: Build
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ release/2.10 ]
   pull_request:
-    branches: [ develop ]
+    branches: [ release/2.10 ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v6
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/workflows/release.yml

@@ -6,27 +6,27 @@ on:
       releaseVersion:
         description: 'Release version'
         required: true
-        default: '2.9'
+        default: '2.10'
       releaseBuild:
         description: 'Release build'
         required: true
-        default: ''
+        default: '0'
 
 jobs:
   release:
     name: Release on Sonatype OSS ${{ github.event.inputs.releaseVersion }}.${{ github.event.inputs.releaseBuild }}
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
+          server-id: central
+          server-username: MAVEN_CENTRAL_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
@@ -49,8 +49,8 @@ jobs:
           TAG: release/${{ github.event.inputs.releaseVersion }}/${{ github.event.inputs.releaseVersion }}.${{ github.event.inputs.releaseBuild }}
           # Suppress logging during release prep/perform
           LOGGING: org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
           # This is to work around https://issues.sonatype.org/browse/NEXUS-27902 on JDK17
           JDK_JAVA_OPTIONS: "--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED"