Merge branch 'main' into feature/author-from-release

Author: bitwiseman

.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@v6
         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 }}

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke</groupId>
   <artifactId>${github-api.artifactId}</artifactId>
-  <version>2.0-rc.4-SNAPSHOT</version>
+  <version>2.0-rc.5-SNAPSHOT</version>
   <name>GitHub API for Java</name>
   <description>GitHub API for Java</description>
   <url>https://hub4j.github.io/github-api/</url>
@@ -73,7 +73,7 @@
     <jacoco.surefire.argLine></jacoco.surefire.argLine>
     <jjwt.suite.version>0.12.6</jjwt.suite.version>
     <!-- This project was registered before 2021, so it uses the old server. -->
-    <nexus.serverUrl>https://oss.sonatype.org</nexus.serverUrl>
+    <nexus.serverUrl>https://ossrh-staging-api.central.sonatype.com</nexus.serverUrl>
     <okhttp3.version>4.12.0</okhttp3.version>
     <okio.version>3.10.2</okio.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>