diff --git a/.github/workflows/create_release_tag_and_pr.yml b/.github/workflows/create_release_tag_and_pr.yml index 16a59223f5..a959995177 100644 --- a/.github/workflows/create_release_tag_and_pr.yml +++ b/.github/workflows/create_release_tag_and_pr.yml @@ -21,11 +21,13 @@ jobs: distribution: 'temurin' cache: 'maven' - - name: Reset staging/main + - name: Reset staging id: staging run: | - git checkout -B staging/main - git push --set-upstream -f origin staging/main + git checkout -B staging/$GITHUB_REF_NAME + git push --set-upstream -f origin staging/$GITHUB_REF_NAME + env: + GITHUB_REF_NAME: ${{ github.ref_name }} - name: Set Release Version id: release @@ -37,7 +39,7 @@ jobs: with: commit_message: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}" tagging_message: 'github-api-${{ steps.release.outputs.version }}' - branch: staging/main + branch: staging/${{ github.ref_name }} - name: Increment Snapshot Version run: | @@ -46,12 +48,12 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: "Prepare for next development iteration" - branch: staging/main + branch: staging/${{ github.ref_name }} - - name: pull-request to main + - name: Create pull-request uses: repo-sync/pull-request@v2 with: pr_title: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}" - source_branch: "staging/main" - destination_branch: "main" + source_branch: "staging/${{ github.ref_name }}" + destination_branch: "${{ github.ref_name }}" github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/pom.xml b/pom.xml index 594083c3b8..0799d1e66a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.kohsuke github-api - 1.327 + 1.329 GitHub API for Java https://github-api.kohsuke.org/ GitHub API for Java @@ -18,12 +18,12 @@ sonatype-nexus-snapshots Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ + ${nexus.serverUrl}/content/repositories/snapshots/ sonatype-nexus-staging Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + ${nexus.serverUrl}/service/local/staging/deploy/maven2/ github-pages @@ -49,6 +49,9 @@ + + + https://ossrh-staging-api.central.sonatype.com @@ -486,7 +489,7 @@ org.apache.commons commons-lang3 - 3.17.0 + 3.18.0 com.tngtech.archunit