diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml index 1e2d24a..5a6b9c8 100644 --- a/.github/workflows/check-branch.yml +++ b/.github/workflows/check-branch.yml @@ -8,13 +8,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Comment PR - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' uses: thollander/actions-comment-pull-request@v2 with: message: | We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch. - name: Check branch - if: github.base_ref == 'master' && github.head_ref != 'next' + if: github.base_ref == 'master' && github.head_ref != 'staging' run: | echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch." - exit 1 \ No newline at end of file + exit 1 diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index bd74108..e7e1b76 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -15,16 +15,16 @@ jobs: with: java-version: '17' distribution: 'adopt' - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - name: Publish package + - name: Publish to the Maven Central Repository run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} publish-github: runs-on: ubuntu-latest @@ -38,15 +38,15 @@ jobs: server-id: github gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} - - name: Set up Maven settings for OSSRH + - name: Set up Maven settings for Central and GitHub run: | mkdir -p $HOME/.m2 echo " - ossrh - ${{ secrets.OSSRH_USERNAME }} - ${{ secrets.OSSRH_PASSWORD }} + central + ${{ secrets.MAVEN_USERNAME }} + ${{ secrets.MAVEN_PASSWORD }} github diff --git a/pom.xml b/pom.xml index 885a39e..ab83569 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ 1.1.1 3.3 1.5 - 1.6.7 + 0.8.0 2.5.3 2.0.1.Final 20250107 - 6.2.2 - 1.13.0 + 6.2.11 + 1.14.0 @@ -41,6 +41,8 @@ + + https://github.com/contentstack/contentstack-utils-java @@ -228,6 +231,8 @@ + + + + + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} + true + + central + true + published + + org.apache.maven.plugins maven-compiler-plugin