From 03ebc118b8b6a65005ded569388aa07c91134844 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 16:57:04 -0600 Subject: [PATCH 1/6] DEVHUB-65 - Attempting to update publish config for maven central --- .github/workflows/release-sdk.yaml | 35 +++++++++++++++++++++++++----- code/pom.xml | 18 +++++++++++---- 2 files changed, 44 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index f06e031614..0c4ed41e7d 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -21,8 +21,33 @@ jobs: # jdk: ${{ matrix.jdk }} release-sdk: - uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@legacy -# needs: [ run-examples ] - secrets: inherit - with: - branch: ${{ inputs.core-ref }} + runs-on: ubuntu-latest + steps: + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + server-id: central + server-username: SONATYPE_USERNAME + server-password: SONATYPE_PASSWORD + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + gpg-passphrase: GPG_PASSPHRASE + settings-path: ${{ github.workspace }} + + - name: Checkout SDK branch + uses: actions/checkout@v4 + with: + ref: ${{ inputs.branch }} + path: product-repo + + - name: Release SDK + working-directory: product-repo/${{ inputs.sdk_path }} + env: + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }} + run: | + echo "Starting SDK Release - version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" + mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -P release -DskipTests=true + echo "SDK Released" diff --git a/code/pom.xml b/code/pom.xml index ace4fe7d62..7306550c77 100644 --- a/code/pom.xml +++ b/code/pom.xml @@ -7,7 +7,7 @@ 5.4.1 EG rapid-sdk for Java EG rapid-sdk v5.4.1 - https://github.com/ExpediaGroup/test-sdk + https://github.com/ExpediaGroup/rapid-java-sdk 2022 jar @@ -28,9 +28,9 @@ - scm:git:git@github.com:ExpediaGroup/test-sdk.git - scm:git:git@github.com:ExpediaGroup/test-sdk.git - https://github.com/ExpediaGroup/test-sdk/ + scm:git:git@github.com:ExpediaGroup/rapid-java-sdk.git + scm:git:git@github.com:ExpediaGroup/rapid-java-sdk.git + https://github.com/ExpediaGroup/rapid-java-sdk/ @@ -160,6 +160,16 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + true + + org.apache.maven.plugins maven-resources-plugin From a42cd56ec9cbf5116353d32e0e89ae185dad7738 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 17:02:21 -0600 Subject: [PATCH 2/6] DEVHUB-65 - Removing specified profile --- .github/workflows/release-sdk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index 0c4ed41e7d..2f83723a1a 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -49,5 +49,5 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }} run: | echo "Starting SDK Release - version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" - mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -P release -DskipTests=true + mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -DskipTests=true echo "SDK Released" From ec5d1e37e07b545ccfc160111021813bf568a7d4 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 17:06:13 -0600 Subject: [PATCH 3/6] DEVHUB-65 - Removing functionality from dual repo implementation --- .github/workflows/release-sdk.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index 2f83723a1a..bb47bdc12f 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -35,14 +35,8 @@ jobs: gpg-passphrase: GPG_PASSPHRASE settings-path: ${{ github.workspace }} - - name: Checkout SDK branch - uses: actions/checkout@v4 - with: - ref: ${{ inputs.branch }} - path: product-repo - - name: Release SDK - working-directory: product-repo/${{ inputs.sdk_path }} + working-directory: code env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From c05b1b79deead86d7d68f5434a76f664cad84396 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 17:12:00 -0600 Subject: [PATCH 4/6] DEVHUB-65 - Putting back a repo checkout --- .github/workflows/release-sdk.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index bb47bdc12f..c72455cc2a 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -35,6 +35,12 @@ jobs: gpg-passphrase: GPG_PASSPHRASE settings-path: ${{ github.workspace }} + - name: Checkout SDK branch + uses: actions/checkout@v4 + with: + ref: ${{ inputs.branch }} + path: ${{ github.workspace }} + - name: Release SDK working-directory: code env: From 34ce5f8a65604a1168be071251d5147ee43a55b6 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 17:17:02 -0600 Subject: [PATCH 5/6] DEVHUB-65 - Reordering setup and checkout --- .github/workflows/release-sdk.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index c72455cc2a..d9ce6a9eb4 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -23,6 +23,12 @@ jobs: release-sdk: runs-on: ubuntu-latest steps: + - name: Checkout SDK branch + uses: actions/checkout@v4 + with: + ref: ${{ inputs.branch }} + path: ${{ github.workspace }} + - name: Set up JDK 21 uses: actions/setup-java@v4 with: @@ -35,14 +41,8 @@ jobs: gpg-passphrase: GPG_PASSPHRASE settings-path: ${{ github.workspace }} - - name: Checkout SDK branch - uses: actions/checkout@v4 - with: - ref: ${{ inputs.branch }} - path: ${{ github.workspace }} - - name: Release SDK - working-directory: code + working-directory: ${{ github.workspace }}/code env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} From 6a5afa5bf2ae3642e34b635b7211c54a49e372d3 Mon Sep 17 00:00:00 2001 From: "Jeremy D. Young" Date: Fri, 5 Dec 2025 17:28:59 -0600 Subject: [PATCH 6/6] DEVHUB-65 - Moving plugin to release profile and using profile again --- .github/workflows/release-sdk.yaml | 2 +- code/pom.xml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-sdk.yaml b/.github/workflows/release-sdk.yaml index d9ce6a9eb4..e12373e851 100644 --- a/.github/workflows/release-sdk.yaml +++ b/.github/workflows/release-sdk.yaml @@ -49,5 +49,5 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }} run: | echo "Starting SDK Release - version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" - mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -DskipTests=true + mvn deploy --settings $GITHUB_WORKSPACE/settings.xml -B -U -P release -DskipTests=true echo "SDK Released" diff --git a/code/pom.xml b/code/pom.xml index 7306550c77..b24ff7858b 100644 --- a/code/pom.xml +++ b/code/pom.xml @@ -160,16 +160,6 @@ - - org.sonatype.central - central-publishing-maven-plugin - 0.9.0 - true - - central - true - - org.apache.maven.plugins maven-resources-plugin @@ -775,6 +765,16 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + true + + org.apache.maven.plugins maven-gpg-plugin