Merge remote-tracking branch 'upstream/main' into pagination-cleanup2

Author: bitwiseman

.github/workflows/codeql-analysis.yml

@@ -42,13 +42,13 @@ jobs:
 
     steps:
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: 17
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/create_release_tag_and_pr.yml

@@ -10,48 +10,50 @@ jobs:
   create_release_tag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Set up Maven Central Repository
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           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
         run: |
           mvn -B versions:set versions:commit -DremoveSnapshot 
           echo "version=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: stefanzweifel/git-auto-commit-action@v6
         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: |
           mvn versions:set versions:commit -DnextSnapshot 
 
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - 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 }}

.github/workflows/maven-build.yml

@@ -25,9 +25,9 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
@@ -47,9 +47,9 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
@@ -68,9 +68,9 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 17
         distribution: 'temurin'
@@ -90,9 +90,9 @@ jobs:
         os: [ ubuntu, windows ]
         java: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.java }}
         distribution: 'temurin'
@@ -120,13 +120,13 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: maven-test-target-directory
         path: target
     - name: Codecov Report
-      uses: codecov/codecov-action@v5.4.0
+      uses: codecov/codecov-action@v5.5.0
       with:
         # Codecov token from https://app.codecov.io/gh/hub4j/github-api/settings
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -138,13 +138,13 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: maven-target-directory
         path: target
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 11
         distribution: 'temurin'

.github/workflows/publish_release_branch.yml

@@ -12,9 +12,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Maven Central Repository
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -35,9 +35,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Maven Central Repository
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -69,7 +69,7 @@ jobs:
     needs: build
     if:  ${{ github.ref == 'refs/heads/release/v2.x' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0  
 
@@ -78,7 +78,7 @@ jobs:
         run: |
           echo "version=$(mvn -B help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: maven-release-target-directory
           path: target
@@ -90,7 +90,7 @@ jobs:
           cp -r ./target/site/* ./
 
       - name: Publish GH Pages
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: "Release (${{ github.actor }}): v${{ steps.release.outputs.version }}" 
           branch: gh-pages

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.6-SNAPSHOT</version>
   <name>GitHub API for Java</name>
   <description>GitHub API for Java</description>
   <url>https://hub4j.github.io/github-api/</url>
@@ -73,9 +73,9 @@
     <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>
+    <okio.version>3.16.0</okio.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
@@ -89,14 +89,14 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.18.3</version>
+        <version>2.20.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.12.1</version>
+        <version>5.13.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -146,11 +146,15 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <version>${spotbugs.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.infradna.tool</groupId>
       <artifactId>bridge-method-annotation</artifactId>
-      <version>1.30</version>
-      <optional>true</optional>
+      <version>1.31</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
@@ -190,13 +194,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.17.0</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <version>${spotbugs.version}</version>
-      <scope>provided</scope>
+      <version>3.18.0</version>
     </dependency>
     <dependency>
       <groupId>com.github.npathai</groupId>
@@ -225,7 +223,7 @@
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
       <artifactId>archunit</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -310,7 +308,7 @@
         <plugin>
           <groupId>com.infradna.tool</groupId>
           <artifactId>bridge-method-injector</artifactId>
-          <version>1.30</version>
+          <version>1.31</version>
           <executions>
             <execution>
               <goals>
@@ -364,7 +362,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.12</version>
+          <version>0.8.13</version>
           <configuration>
             <!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
             <excludes>
@@ -475,7 +473,7 @@
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.44.3</version>
+        <version>2.46.1</version>
         <configuration>
           <java>
             <includes>
@@ -494,10 +492,10 @@
             <importOrder>
               <file>${basedir}/src/build/eclipse/eclipse.importorder</file>
             </importOrder>
-            
+
             <removeUnusedImports></removeUnusedImports>
-            <formatAnnotations />
-            
+            <formatAnnotations></formatAnnotations>
+
             <trimTrailingWhitespace></trimTrailingWhitespace>
             <endWithNewline></endWithNewline>
 

src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java

@@ -98,6 +98,19 @@ public GHCreateRepositoryBuilder gitignoreTemplate(String language) throws IOExc
         return with("gitignore_template", language);
     }
 
+    /**
+     * Include all branches when creating from a template repository
+     *
+     * @param includeAllBranches
+     *            whether or not to include all branches from the template repository
+     * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public GHCreateRepositoryBuilder includeAllBranches(boolean includeAllBranches) throws IOException {
+        return with("include_all_branches", includeAllBranches);
+    }
+
     /**
      * Desired license template to apply.
      *

src/main/java/org/kohsuke/github/GHRepository.java

@@ -1605,7 +1605,9 @@ public GHIssueEvent getIssueEvent(long id) throws IOException {
      * @return the issues
      * @throws IOException
      *             the io exception
+     * @deprecated Use {@link #queryIssues()} instead.
      */
+    @Deprecated
     public List<GHIssue> getIssues(GHIssueState state) throws IOException {
         return queryIssues().state(state).list().toList();
     }
@@ -1620,7 +1622,9 @@ public List<GHIssue> getIssues(GHIssueState state) throws IOException {
      * @return the issues
      * @throws IOException
      *             the io exception
+     * @deprecated Use {@link #queryIssues()} instead.
      */
+    @Deprecated
     public List<GHIssue> getIssues(GHIssueState state, GHMilestone milestone) throws IOException {
         return queryIssues().milestone(milestone == null ? "none" : "" + milestone.getNumber())
                 .state(state)

src/main/java/org/kohsuke/github/GHWorkflowRun.java

@@ -207,6 +207,7 @@ public String toString() {
             return name().toLowerCase(Locale.ROOT);
         }
     }
+    private GHUser actor;
     private String artifactsUrl;
     private String cancelUrl;
     private String checkSuiteUrl;
@@ -307,6 +308,16 @@ public <T> T downloadLogs(InputStreamFunction<T> streamFunction) throws IOExcept
         return root().createRequest().method("GET").withUrlPath(getApiRoute(), "logs").fetchStream(streamFunction);
     }
 
+    /**
+     * The actor which triggered the initial run.
+     *
+     * @return the triggering actor
+     */
+    @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected behavior")
+    public GHUser getActor() {
+        return actor;
+    }
+
     /**
      * The artifacts URL, like https://api.github.com/repos/octo-org/octo-repo/actions/runs/30433642/artifacts
      *