From cca3f2e17e709c8b67e25f7fb8db1a6698610c4c Mon Sep 17 00:00:00 2001 From: Dmytro Bezruk Date: Fri, 12 Jul 2024 13:38:06 +0300 Subject: [PATCH 1/8] [CRQ-38890] - SCA Updates. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 54c833ff..c47a1e46 100644 --- a/pom.xml +++ b/pom.xml @@ -88,12 +88,12 @@ 1.8 - 2.5.31 + 2.5.32 1.0 4.2.0 32.1.2-jre 4.5.13 - 2.14.2 + 2.14.3 0.8.10 4.13.1 1.2.13 @@ -105,7 +105,7 @@ 1.7.36 5.1.20.RELEASE 2.1.18.RELEASE - 9.0.85 + 9.0.91 1.3.4 2.12.2 0.8.0 From 10a56c2de33afb96a62a1191e03a1fb95ab486a1 Mon Sep 17 00:00:00 2001 From: Dmytro Bezruk Date: Fri, 12 Jul 2024 15:33:27 +0300 Subject: [PATCH 2/8] [CRQ-38890] - SCA Updates. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c47a1e46..d67e3d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -98,8 +98,8 @@ 4.13.1 1.2.13 2.24.0 - 2.12.11 - 1.1.1 + 2.12.19 + 1.1.2 3.0.8 3.1.0 1.7.36 From fe60bce4cee953dcec14bae08dba4af1cfed4484 Mon Sep 17 00:00:00 2001 From: Dmytro Bezruk Date: Fri, 12 Jul 2024 16:13:42 +0300 Subject: [PATCH 3/8] Revert "[CRQ-38890] - SCA Updates." This reverts commit 10a56c2de33afb96a62a1191e03a1fb95ab486a1. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d67e3d7f..c47a1e46 100644 --- a/pom.xml +++ b/pom.xml @@ -98,8 +98,8 @@ 4.13.1 1.2.13 2.24.0 - 2.12.19 - 1.1.2 + 2.12.11 + 1.1.1 3.0.8 3.1.0 1.7.36 From 10f8021548bfab0cd9578cc42c4430162b60d7af Mon Sep 17 00:00:00 2001 From: RWS Artifact Publishers Date: Fri, 12 Jul 2024 16:41:11 +0000 Subject: [PATCH 4/8] [maven-release-plugin] prepare release release/2.9/2.9.16 --- odata_api/pom.xml | 2 +- odata_assembly/pom.xml | 2 +- odata_checkstyle/pom.xml | 4 ++-- odata_client/pom.xml | 2 +- odata_client_api/pom.xml | 2 +- odata_client_tracing/pom.xml | 2 +- odata_common/pom.xml | 2 +- odata_controller/pom.xml | 2 +- odata_edm/pom.xml | 2 +- odata_parser/pom.xml | 2 +- odata_processor/pom.xml | 2 +- odata_renderer/pom.xml | 2 +- odata_service/pom.xml | 2 +- odata_test/pom.xml | 2 +- odata_war/pom.xml | 2 +- odata_webservice/pom.xml | 2 +- pom.xml | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/odata_api/pom.xml b/odata_api/pom.xml index 5bfdb4da..c0d5d3ce 100644 --- a/odata_api/pom.xml +++ b/odata_api/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_api diff --git a/odata_assembly/pom.xml b/odata_assembly/pom.xml index de9aad20..fdc1afb0 100644 --- a/odata_assembly/pom.xml +++ b/odata_assembly/pom.xml @@ -20,7 +20,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 4.0.0 diff --git a/odata_checkstyle/pom.xml b/odata_checkstyle/pom.xml index 2bdf5868..ccbaf841 100644 --- a/odata_checkstyle/pom.xml +++ b/odata_checkstyle/pom.xml @@ -22,11 +22,11 @@ com.sdl odata - 2.9-SNAPSHOT + 2.9.16 odata_checkstyle - 2.9-SNAPSHOT + 2.9.16 jar OData Checkstyle diff --git a/odata_client/pom.xml b/odata_client/pom.xml index 18efa309..70389010 100644 --- a/odata_client/pom.xml +++ b/odata_client/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_client diff --git a/odata_client_api/pom.xml b/odata_client_api/pom.xml index d067d0b4..8d63c763 100644 --- a/odata_client_api/pom.xml +++ b/odata_client_api/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_client_api diff --git a/odata_client_tracing/pom.xml b/odata_client_tracing/pom.xml index 72799629..aa37136c 100644 --- a/odata_client_tracing/pom.xml +++ b/odata_client_tracing/pom.xml @@ -20,7 +20,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 4.0.0 diff --git a/odata_common/pom.xml b/odata_common/pom.xml index ee51f754..42e7d6bd 100644 --- a/odata_common/pom.xml +++ b/odata_common/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_common diff --git a/odata_controller/pom.xml b/odata_controller/pom.xml index f599ca27..c443a723 100644 --- a/odata_controller/pom.xml +++ b/odata_controller/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_controller diff --git a/odata_edm/pom.xml b/odata_edm/pom.xml index 9a466cf3..fc2cecb6 100644 --- a/odata_edm/pom.xml +++ b/odata_edm/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_edm diff --git a/odata_parser/pom.xml b/odata_parser/pom.xml index cf1a68d8..c95b68fc 100644 --- a/odata_parser/pom.xml +++ b/odata_parser/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_parser diff --git a/odata_processor/pom.xml b/odata_processor/pom.xml index 688c42d9..dfa28739 100644 --- a/odata_processor/pom.xml +++ b/odata_processor/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_processor diff --git a/odata_renderer/pom.xml b/odata_renderer/pom.xml index 0f567d1d..f65bf106 100644 --- a/odata_renderer/pom.xml +++ b/odata_renderer/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_renderer diff --git a/odata_service/pom.xml b/odata_service/pom.xml index c9e3db47..f3604ace 100644 --- a/odata_service/pom.xml +++ b/odata_service/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_service diff --git a/odata_test/pom.xml b/odata_test/pom.xml index f6015d57..2745c88e 100644 --- a/odata_test/pom.xml +++ b/odata_test/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_test diff --git a/odata_war/pom.xml b/odata_war/pom.xml index 0c5dbc84..fc4d787c 100644 --- a/odata_war/pom.xml +++ b/odata_war/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_war diff --git a/odata_webservice/pom.xml b/odata_webservice/pom.xml index c988aa4e..27bafa50 100644 --- a/odata_webservice/pom.xml +++ b/odata_webservice/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9-SNAPSHOT + 2.9.16 odata_webservice diff --git a/pom.xml b/pom.xml index c47a1e46..260af05d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.sdl odata - 2.9-SNAPSHOT + 2.9.16 pom Tridion OData v4 Framework @@ -73,7 +73,7 @@ scm:git:git@github.com:sdl/odata.git scm:git:git@github.com:sdl/odata.git git@github.com:sdl/odata.git - HEAD + release/2.9/2.9.16 From 562d5df800a6895d2d12a0300006661616079d71 Mon Sep 17 00:00:00 2001 From: RWS Artifact Publishers Date: Fri, 12 Jul 2024 16:41:14 +0000 Subject: [PATCH 5/8] [maven-release-plugin] prepare for next development iteration --- odata_api/pom.xml | 2 +- odata_assembly/pom.xml | 2 +- odata_checkstyle/pom.xml | 4 ++-- odata_client/pom.xml | 2 +- odata_client_api/pom.xml | 2 +- odata_client_tracing/pom.xml | 2 +- odata_common/pom.xml | 2 +- odata_controller/pom.xml | 2 +- odata_edm/pom.xml | 2 +- odata_parser/pom.xml | 2 +- odata_processor/pom.xml | 2 +- odata_renderer/pom.xml | 2 +- odata_service/pom.xml | 2 +- odata_test/pom.xml | 2 +- odata_war/pom.xml | 2 +- odata_webservice/pom.xml | 2 +- pom.xml | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/odata_api/pom.xml b/odata_api/pom.xml index c0d5d3ce..5bfdb4da 100644 --- a/odata_api/pom.xml +++ b/odata_api/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_api diff --git a/odata_assembly/pom.xml b/odata_assembly/pom.xml index fdc1afb0..de9aad20 100644 --- a/odata_assembly/pom.xml +++ b/odata_assembly/pom.xml @@ -20,7 +20,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT 4.0.0 diff --git a/odata_checkstyle/pom.xml b/odata_checkstyle/pom.xml index ccbaf841..2bdf5868 100644 --- a/odata_checkstyle/pom.xml +++ b/odata_checkstyle/pom.xml @@ -22,11 +22,11 @@ com.sdl odata - 2.9.16 + 2.9-SNAPSHOT odata_checkstyle - 2.9.16 + 2.9-SNAPSHOT jar OData Checkstyle diff --git a/odata_client/pom.xml b/odata_client/pom.xml index 70389010..18efa309 100644 --- a/odata_client/pom.xml +++ b/odata_client/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_client diff --git a/odata_client_api/pom.xml b/odata_client_api/pom.xml index 8d63c763..d067d0b4 100644 --- a/odata_client_api/pom.xml +++ b/odata_client_api/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_client_api diff --git a/odata_client_tracing/pom.xml b/odata_client_tracing/pom.xml index aa37136c..72799629 100644 --- a/odata_client_tracing/pom.xml +++ b/odata_client_tracing/pom.xml @@ -20,7 +20,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT 4.0.0 diff --git a/odata_common/pom.xml b/odata_common/pom.xml index 42e7d6bd..ee51f754 100644 --- a/odata_common/pom.xml +++ b/odata_common/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_common diff --git a/odata_controller/pom.xml b/odata_controller/pom.xml index c443a723..f599ca27 100644 --- a/odata_controller/pom.xml +++ b/odata_controller/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_controller diff --git a/odata_edm/pom.xml b/odata_edm/pom.xml index fc2cecb6..9a466cf3 100644 --- a/odata_edm/pom.xml +++ b/odata_edm/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_edm diff --git a/odata_parser/pom.xml b/odata_parser/pom.xml index c95b68fc..cf1a68d8 100644 --- a/odata_parser/pom.xml +++ b/odata_parser/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_parser diff --git a/odata_processor/pom.xml b/odata_processor/pom.xml index dfa28739..688c42d9 100644 --- a/odata_processor/pom.xml +++ b/odata_processor/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_processor diff --git a/odata_renderer/pom.xml b/odata_renderer/pom.xml index f65bf106..0f567d1d 100644 --- a/odata_renderer/pom.xml +++ b/odata_renderer/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_renderer diff --git a/odata_service/pom.xml b/odata_service/pom.xml index f3604ace..c9e3db47 100644 --- a/odata_service/pom.xml +++ b/odata_service/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_service diff --git a/odata_test/pom.xml b/odata_test/pom.xml index 2745c88e..f6015d57 100644 --- a/odata_test/pom.xml +++ b/odata_test/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_test diff --git a/odata_war/pom.xml b/odata_war/pom.xml index fc4d787c..0c5dbc84 100644 --- a/odata_war/pom.xml +++ b/odata_war/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_war diff --git a/odata_webservice/pom.xml b/odata_webservice/pom.xml index 27bafa50..c988aa4e 100644 --- a/odata_webservice/pom.xml +++ b/odata_webservice/pom.xml @@ -22,7 +22,7 @@ odata com.sdl - 2.9.16 + 2.9-SNAPSHOT odata_webservice diff --git a/pom.xml b/pom.xml index 260af05d..c47a1e46 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.sdl odata - 2.9.16 + 2.9-SNAPSHOT pom Tridion OData v4 Framework @@ -73,7 +73,7 @@ scm:git:git@github.com:sdl/odata.git scm:git:git@github.com:sdl/odata.git git@github.com:sdl/odata.git - release/2.9/2.9.16 + HEAD From 281ca2726a63f1781b5b6862d5d722a1c996137f Mon Sep 17 00:00:00 2001 From: Ben Middleton Date: Thu, 5 Feb 2026 10:09:25 +0000 Subject: [PATCH 6/8] UDP-11494 : Added automerge --- .github/workflows/auto-merge.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 00000000..b9e30f7b --- /dev/null +++ b/.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.1.0 + with: + github_token: \${{ secrets.GITHUB_TOKEN }} + prefixes: release/ + ref_branch: develop \ No newline at end of file From 634d9700c7cbb2f1039a7c03ccaa4b4dac8e66cb Mon Sep 17 00:00:00 2001 From: Ben Middleton Date: Fri, 20 Mar 2026 20:58:31 +0000 Subject: [PATCH 7/8] 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 8/8] 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: