From 1ed0e879a2a2a40e7f1756cec9ff2590cbc00f82 Mon Sep 17 00:00:00 2001 From: RandySun228 Date: Tue, 7 Apr 2026 13:38:58 -0700 Subject: [PATCH 1/8] RELEASE: 2.0.4-RELEASE --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9ef9745..f124acb 100644 --- a/README.md +++ b/README.md @@ -377,14 +377,14 @@ Alternatively you can pull it from the central Maven repositories: com.ebay.ejmask ejmask-bom - 2.0.3 + 2.0.4-RELEASE ``` ### Using in your Gradle Project. ```groovy -compile group: 'com.ebay.ejmask', name: 'ejmask-bom', version: '2.0.3' +compile group: 'com.ebay.ejmask', name: 'ejmask-bom', version: '2.0.4-RELEASE' ``` ## Roadmap diff --git a/pom.xml b/pom.xml index 489bfd3..c9b2869 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 17 17 2.0.4 - -SNAPSHOT + -RELEASE From 89b482a4ae733e4ccb408d7e777fa4b0dd44a2bd Mon Sep 17 00:00:00 2001 From: RandySun228 Date: Tue, 7 Apr 2026 13:43:50 -0700 Subject: [PATCH 2/8] update build script --- .github/workflows/on_push_build.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index 747d107..48022d5 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -40,7 +40,7 @@ jobs: - name: Build & Deploy run: | if [[ "${{ github.ref_name }}" == "master" ]]; then - mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist= + mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist=-RELEASE else mvn clean deploy -s settings.xml --batch-mode -P snapshot -Dchangelist=-SNAPSHOT fi diff --git a/pom.xml b/pom.xml index c9b2869..0017413 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 17 17 2.0.4 - -RELEASE + From 082c3d6ab271c4fa2015de60ffac513a5e20a2a1 Mon Sep 17 00:00:00 2001 From: RandySun228 Date: Tue, 7 Apr 2026 13:44:30 -0700 Subject: [PATCH 3/8] update build script --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0017413..489bfd3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 17 17 2.0.4 - + -SNAPSHOT From 4039bcaa27180331e47eee045c408ea5909b768b Mon Sep 17 00:00:00 2001 From: RandySun228 Date: Tue, 7 Apr 2026 14:08:11 -0700 Subject: [PATCH 4/8] add new workflow for develop --- .github/workflows/on_push_build.yml | 32 ++++++++++++++++--------- .github/workflows/on_push_dev.yml | 36 +++++++++++++++++++++++++++++ pom.xml | 2 +- 3 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 .github/workflows/on_push_dev.yml diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index 48022d5..11fffc0 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -4,14 +4,11 @@ on: push: branches: - master - - develop - permissions: - contents: read - + contents: write + jobs: build: - runs-on: ubuntu-latest steps: @@ -39,11 +36,24 @@ jobs: - name: Build & Deploy run: | - if [[ "${{ github.ref_name }}" == "master" ]]; then - mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist=-RELEASE - else - mvn clean deploy -s settings.xml --batch-mode -P snapshot -Dchangelist=-SNAPSHOT - fi + mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist= env: CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} - CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} \ No newline at end of file + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} + + - name: Extract Revision from POM + id: get_version + run: | + REVISION=$(xmllint --xpath "//*[local-name()='properties']/*[local-name()='revision']/text()" pom.xml) + echo "VERSION=$REVISION" >> $GITHUB_OUTPUT + + - name: Create Tag and Release + uses: softprops/action-gh-release@v2 + with: + tag_name: v${{ steps.get_version.outputs.VERSION }} + name: Release v${{ steps.get_version.outputs.VERSION }} + generate_release_notes: true + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/on_push_dev.yml b/.github/workflows/on_push_dev.yml new file mode 100644 index 0000000..4e7b07d --- /dev/null +++ b/.github/workflows/on_push_dev.yml @@ -0,0 +1,36 @@ +name: Build & Deploy (Develop) + +on: + push: + branches: + - develop + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + + - name: Cache local Maven repository + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-maven- + + - name: Build & Deploy + run: | + mvn clean deploy -s settings.xml --batch-mode -P snapshot -Dchangelist=-SNAPSHOT \ No newline at end of file diff --git a/pom.xml b/pom.xml index 489bfd3..c9b2869 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 17 17 2.0.4 - -SNAPSHOT + -RELEASE From 4ba9fc64229edec9de2c05005a6a73dea3fb5a47 Mon Sep 17 00:00:00 2001 From: RandySun228 Date: Tue, 7 Apr 2026 14:09:53 -0700 Subject: [PATCH 5/8] udpate push build --- .github/workflows/on_push_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index 11fffc0..9ef24ac 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -36,7 +36,7 @@ jobs: - name: Build & Deploy run: | - mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist= + mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist=-RELEASE env: CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} From f3307a29243506c959e79f912d8f718fe173003c Mon Sep 17 00:00:00 2001 From: Prasanth Thampi Date: Tue, 7 Apr 2026 14:50:22 -0700 Subject: [PATCH 6/8] Apply suggestion from @prasanthkv --- .github/workflows/on_push_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index 9ef24ac..151c986 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -1,4 +1,4 @@ -name: Build & Deploy (Master & Develop) +name: Build & Deploy (Master) on: push: From b984877cc586395ea86a542df8bf5a7f96404a30 Mon Sep 17 00:00:00 2001 From: Prasanth Thampi Date: Tue, 7 Apr 2026 14:54:26 -0700 Subject: [PATCH 7/8] Apply suggestion from @prasanthkv --- .github/workflows/on_push_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index 151c986..fc1e89e 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -36,7 +36,7 @@ jobs: - name: Build & Deploy run: | - mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist=-RELEASE + mvn clean deploy -s settings.xml --batch-mode -P release -Dchangelist=- env: CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} From b553fedac7631a953f1c5fea9e49544a553e2117 Mon Sep 17 00:00:00 2001 From: Prasanth Thampi Date: Tue, 7 Apr 2026 14:56:15 -0700 Subject: [PATCH 8/8] Apply suggestion from @prasanthkv --- .github/workflows/on_push_build.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/on_push_build.yml b/.github/workflows/on_push_build.yml index fc1e89e..c4787de 100644 --- a/.github/workflows/on_push_build.yml +++ b/.github/workflows/on_push_build.yml @@ -40,20 +40,3 @@ jobs: env: CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} - - - name: Extract Revision from POM - id: get_version - run: | - REVISION=$(xmllint --xpath "//*[local-name()='properties']/*[local-name()='revision']/text()" pom.xml) - echo "VERSION=$REVISION" >> $GITHUB_OUTPUT - - - name: Create Tag and Release - uses: softprops/action-gh-release@v2 - with: - tag_name: v${{ steps.get_version.outputs.VERSION }} - name: Release v${{ steps.get_version.outputs.VERSION }} - generate_release_notes: true - draft: false - prerelease: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file