Merge remote-tracking branch 'upstream/main' into bugfix/webhook-label-null-handling

Author: Haarolean

.github/workflows/codeql-analysis.yml

@@ -48,7 +48,7 @@ jobs:
         java-version: 17
 
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/create_release_tag_and_pr.yml

@@ -10,7 +10,7 @@ jobs:
   create_release_tag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -35,7 +35,7 @@ jobs:
           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@v6
+      - uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}" 
           tagging_message: 'github-api-${{ steps.release.outputs.version }}'
@@ -45,7 +45,7 @@ jobs:
         run: |
           mvn versions:set versions:commit -DnextSnapshot 
 
-      - uses: stefanzweifel/git-auto-commit-action@v6
+      - uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: "Prepare for next development iteration"
           branch: staging/${{ github.ref_name }}

.github/workflows/maven-build.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
@@ -36,7 +36,7 @@ jobs:
       env:
         MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
       run: mvn -B clean install -DskipTests --file pom.xml
-    - uses: actions/upload-artifact@v5
+    - uses: actions/upload-artifact@v7
       with:
         name: maven-target-directory
         path: target/
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
@@ -90,7 +90,7 @@ jobs:
         os: [ ubuntu, windows ]
         java: [ 17, 21 ]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
@@ -110,7 +110,7 @@ jobs:
       run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
     - name: Save coverage data
       if: matrix.os == 'ubuntu' && matrix.java == '17'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v7
       with:
         name: maven-test-target-directory
         path: target/
@@ -120,13 +120,13 @@ jobs:
     needs: test
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/download-artifact@v6
+    - uses: actions/checkout@v6
+    - uses: actions/download-artifact@v8
       with:
         name: maven-test-target-directory
         path: target
     - name: Codecov Report
-      uses: codecov/codecov-action@v5.5.1
+      uses: codecov/codecov-action@v5.5.2
       with:
         # Codecov token from https://app.codecov.io/gh/hub4j/github-api/settings
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -138,8 +138,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/download-artifact@v6
+    - uses: actions/checkout@v6
+    - uses: actions/download-artifact@v8
       with:
         name: maven-target-directory
         path: target

.github/workflows/publish_release_branch.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v5
         with:
@@ -25,7 +25,7 @@ jobs:
           MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
         run: mvn -B clean install site -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v7
         with:
           name: maven-release-target-directory
           path: target/
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v5
         with:
@@ -69,7 +69,7 @@ jobs:
     needs: build
     if:  ${{ github.ref == 'refs/heads/release/v2.x' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         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@v6
+      - uses: actions/download-artifact@v8
         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@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: "Release (${{ github.actor }}): v${{ steps.release.outputs.version }}" 
           branch: gh-pages

pom.xml

@@ -71,14 +71,14 @@
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>
 
     <jacoco.surefire.argLine></jacoco.surefire.argLine>
-    <jjwt.suite.version>0.12.6</jjwt.suite.version>
+    <jjwt.suite.version>0.13.0</jjwt.suite.version>
     <!-- This project was registered before 2021, so it uses the old server. -->
     <nexus.serverUrl>https://ossrh-staging-api.central.sonatype.com</nexus.serverUrl>
     <okhttp3.version>4.12.0</okhttp3.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.8.1</spotbugs-maven-plugin.version>
+    <spotbugs-maven-plugin.version>4.9.8.2</spotbugs-maven-plugin.version>
     <spotbugs.version>4.8.6</spotbugs.version>
     <spring.boot.version>3.4.5</spring.boot.version>
     <surefire.argLine></surefire.argLine>
@@ -89,7 +89,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.20.0</version>
+        <version>2.21.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -268,7 +268,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.16.1</version>
+      <version>5.21.0</version>
       <scope>test</scope>
     </dependency>
     <!--
@@ -320,7 +320,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>3.2.7</version>
+          <version>3.2.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -348,7 +348,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.3</version>
+          <version>3.5.5</version>
           <configuration>
             <!-- SUREFIRE-1226 workaround -->
             <trimStackTrace>false</trimStackTrace>
@@ -362,7 +362,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.13</version>
+          <version>0.8.14</version>
           <configuration>
             <!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
             <excludes>
@@ -619,7 +619,7 @@
           <dependency>
             <groupId>org.apache.bcel</groupId>
             <artifactId>bcel</artifactId>
-            <version>6.10.0</version>
+            <version>6.12.0</version>
           </dependency>
         </dependencies>
       </plugin>

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

@@ -1,6 +1,5 @@
 package org.kohsuke.github;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -84,8 +83,7 @@ static GHEvent transformTypeToGHEvent(String type) {
     private long id;
     private GHOrganization org;
 
-    // we don't want to expose Jackson dependency to the user. This needs databinding
-    private ObjectNode payload;
+    private Object payload;
 
     // these are all shallow objects
     private GHEventRepository repo;
@@ -174,7 +172,9 @@ public GHOrganization getOrganization() throws IOException {
      *             if payload cannot be parsed
      */
     public <T extends GHEventPayload> T getPayload(Class<T> type) throws IOException {
-        T v = GitHubClient.getMappingObjectReader(root()).readValue(payload.traverse(), type);
+        T v = GitHubClient.getMappingObjectReader(root())
+                .forType(type)
+                .readValue(GitHubClient.getMappingObjectWriter().writeValueAsString(payload));
         v.lateBind();
         return v;
     }

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

@@ -57,6 +57,16 @@ public GHIssueSearchBuilder isClosed() {
         return q("is:closed");
     }
 
+    /**
+     * Filters results to only include issues (excludes pull requests).
+     *
+     * @return the gh issue search builder
+     */
+    public GHIssueSearchBuilder isIssue() {
+        terms.removeIf("is:pr"::equals);
+        return q("is:issue");
+    }
+
     /**
      * Is merged gh issue search builder.
      *
@@ -75,6 +85,16 @@ public GHIssueSearchBuilder isOpen() {
         return q("is:open");
     }
 
+    /**
+     * Filters results to only include pull requests (excludes issues).
+     *
+     * @return the gh issue search builder
+     */
+    public GHIssueSearchBuilder isPullRequest() {
+        terms.removeIf("is:issue"::equals);
+        return q("is:pr");
+    }
+
     /**
      * Mentions gh issue search builder.
      *
@@ -121,6 +141,19 @@ public GHIssueSearchBuilder q(String term) {
         return this;
     }
 
+    /**
+     * Filters results to a specific repository.
+     *
+     * @param owner
+     *            the repository owner
+     * @param name
+     *            the repository name
+     * @return the gh issue search builder
+     */
+    public GHIssueSearchBuilder repo(String owner, String name) {
+        return q("repo:" + owner + "/" + name);
+    }
+
     /**
      * Sort gh issue search builder.
      *

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

@@ -492,6 +492,16 @@ public boolean isMerged() throws IOException {
         return merged;
     }
 
+    /**
+     * Since a GHPullRequest is always a pull request, this method always returns true.
+     *
+     * @return true
+     */
+    @Override
+    public boolean isPullRequest() {
+        return true;
+    }
+
     /**
      * Retrieves all the commits associated to this pull request.
      *
@@ -520,7 +530,13 @@ public PagedIterable<GHPullRequestFileDetail> listFiles() {
     /**
      * Obtains all the review comments associated with this pull request.
      *
+     * <p>
+     * Unlike {@link GHPullRequestReview#listReviewComments()}, this method returns full
+     * {@link GHPullRequestReviewComment} objects including line-related fields such as
+     * {@link GHPullRequestReviewComment#getLine() line}, {@link GHPullRequestReviewComment#getSide() side}, etc.
+     *
      * @return the paged iterable
+     * @see GHPullRequestReview#listReviewComments()
      */
     public PagedIterable<GHPullRequestReviewComment> listReviewComments() {
         return root().createRequest()
@@ -539,6 +555,30 @@ public PagedIterable<GHPullRequestReview> listReviews() {
                 .toIterable(GHPullRequestReview[].class, item -> item.wrapUp(this));
     }
 
+    /**
+     * Converts a draft pull request to ready for review.
+     *
+     * @throws IOException
+     *             the io exception
+     * @throws IllegalStateException
+     *             if the pull request is not a draft
+     */
+    public void markReadyForReview() throws IOException {
+        if (!draft) {
+            throw new IllegalStateException("Pull request is not a draft");
+        }
+
+        StringBuilder inputBuilder = new StringBuilder();
+        addParameter(inputBuilder, "pullRequestId", this.getNodeId());
+
+        String graphqlBody = "mutation MarkReadyForReview { markPullRequestReadyForReview(input: {" + inputBuilder
+                + "}) { pullRequest { id } } }";
+
+        root().createGraphQLRequest(graphqlBody).sendGraphQL();
+
+        refresh();
+    }
+
     /**
      * Merge this pull request.
      *