From 634d9700c7cbb2f1039a7c03ccaa4b4dac8e66cb Mon Sep 17 00:00:00 2001 From: Ben Middleton Date: Fri, 20 Mar 2026 20:58:31 +0000 Subject: [PATCH 1/2] UDP-11513 : Added automerge --- .github/workflows/auto-merge.yml | 4 ++-- .github/workflows/maven.yml | 4 ++-- .github/workflows/release.yml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index b9e30f7b..739a9fbc 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -21,8 +21,8 @@ jobs: steps: - name: Automatic Merge - uses: ActionsDesk/cascading-downstream-merge@v3.1.0 + uses: ActionsDesk/cascading-downstream-merge@v3 with: - github_token: \${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.GITHUB_TOKEN }} prefixes: release/ ref_branch: develop \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b505fb18..0929ae4f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 446b157b..a6a2af65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,23 +10,23 @@ on: releaseBuild: description: 'Release build' required: true - default: '' + default: '0' jobs: release: - name: Release on Sonatype OSS + 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 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '8' - 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 }} run: | echo "::group::Prepare" From 7cf6e631d496d2e90aad2bd14bcf64ccea18becb Mon Sep 17 00:00:00 2001 From: Ben Middleton Date: Fri, 20 Mar 2026 21:04:37 +0000 Subject: [PATCH 2/2] UDP-11513 : Added automerge --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0929ae4f..5377c164 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ develop ] + branches: [ release/2.9 ] pull_request: - branches: [ develop ] + branches: [ release/2.9 ] jobs: build: