Merge branch 'main' into jackson-3-phase-2

Author: pvillard31

.github/dependabot.yml

@@ -3,12 +3,32 @@ updates:
 - package-ecosystem: "maven"
   directory: "/"
   rebase-strategy: "disabled"
+  target-branch: "main"
+  open-pull-requests-limit: 10
   schedule:
     interval: "monthly"
     time: "02:00"
 - package-ecosystem: "github-actions"
   directory: "/"
   rebase-strategy: "disabled"
+  target-branch: "main"
+  open-pull-requests-limit: 10
+  schedule:
+    interval: "monthly"
+    time: "02:00"
+- package-ecosystem: "maven"
+  directory: "/"
+  rebase-strategy: "disabled"
+  target-branch: "main-1.x"
+  open-pull-requests-limit: 10
+  schedule:
+    interval: "monthly"
+    time: "02:00"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  rebase-strategy: "disabled"
+  target-branch: "main-1.x"
+  open-pull-requests-limit: 10
   schedule:
     interval: "monthly"
     time: "02:00"

.github/workflows/maven-build.yml

@@ -126,7 +126,7 @@ jobs:
         name: maven-test-target-directory
         path: target
     - name: Codecov Report
-      uses: codecov/codecov-action@v5.5.2
+      uses: codecov/codecov-action@v6.0.0
       with:
         # Codecov token from https://app.codecov.io/gh/hub4j/github-api/settings
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release-drafter.yml

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Release Drafter
-        uses: release-drafter/release-drafter@v6
+        uses: release-drafter/release-drafter@v7
         env:
           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.6-SNAPSHOT</version>
+  <version>2.0-rc.7-SNAPSHOT</version>
   <name>GitHub API for Java</name>
   <description>GitHub API for Java</description>
   <url>https://hub4j.github.io/github-api/</url>

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

@@ -56,6 +56,34 @@ static String getApiRoute(GHRepository repository, String path) {
     public GHContent() {
     }
 
+    /**
+     * Creates a builder that can be used to delete this file.
+     *
+     * <p>
+     * Unlike the {@link #delete(String)} convenience methods, this builder supports setting the author and committer of
+     * the resulting commit.
+     *
+     * @return a content deleter
+     * @see GHContentDeleter
+     */
+    public GHContentDeleter createDelete() {
+        return new GHContentDeleter(this);
+    }
+
+    /**
+     * Creates a builder that can be used to update this file's content.
+     *
+     * <p>
+     * Unlike the {@link #update(String, String)} convenience methods, this builder supports setting the author and
+     * committer of the resulting commit.
+     *
+     * @return a content updater
+     * @see GHContentUpdater
+     */
+    public GHContentUpdater createUpdate() {
+        return new GHContentUpdater(this);
+    }
+
     /**
      * Delete gh content update response.
      *

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

@@ -1,8 +1,13 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.Base64;
+import java.util.Date;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -15,6 +20,19 @@
  * @see GHRepository#createContent() GHRepository#createContent()
  */
 public final class GHContentBuilder {
+    @JsonInclude(Include.NON_NULL)
+    private static final class UserInfo {
+        private final String date;
+        private final String email;
+        private final String name;
+
+        private UserInfo(String name, String email, Instant date) {
+            this.name = name;
+            this.email = email;
+            this.date = date != null ? GitHubClient.printInstant(date) : null;
+        }
+    }
+
     private String path;
     private final GHRepository repo;
     private final Requester req;
@@ -30,6 +48,52 @@ public final class GHContentBuilder {
         this.req = repo.root().createRequest().method("PUT");
     }
 
+    /**
+     * Configures the author of the commit. If not specified, the authenticated user is used as the author.
+     *
+     * @param name
+     *            the name of the author
+     * @param email
+     *            the email of the author
+     * @return the gh content builder
+     */
+    public GHContentBuilder author(String name, String email) {
+        return author(name, email, (Instant) null);
+    }
+
+    /**
+     * Configures the author of the commit. If not specified, the authenticated user is used as the author.
+     *
+     * @param name
+     *            the name of the author
+     * @param email
+     *            the email of the author
+     * @param date
+     *            the date of the authoring
+     * @return the gh content builder
+     * @deprecated use {@link #author(String, String, Instant)} instead
+     */
+    @Deprecated
+    public GHContentBuilder author(String name, String email, Date date) {
+        return author(name, email, GitHubClient.toInstantOrNull(date));
+    }
+
+    /**
+     * Configures the author of the commit. If not specified, the authenticated user is used as the author.
+     *
+     * @param name
+     *            the name of the author
+     * @param email
+     *            the email of the author
+     * @param date
+     *            the timestamp for the authoring
+     * @return the gh content builder
+     */
+    public GHContentBuilder author(String name, String email, Instant date) {
+        req.with("author", new UserInfo(name, email, date));
+        return this;
+    }
+
     /**
      * Branch gh content builder.
      *
@@ -59,6 +123,52 @@ public GHContentUpdateResponse commit() throws IOException {
         return response;
     }
 
+    /**
+     * Configures the committer of the commit. If not specified, the authenticated user is used as the committer.
+     *
+     * @param name
+     *            the name of the committer
+     * @param email
+     *            the email of the committer
+     * @return the gh content builder
+     */
+    public GHContentBuilder committer(String name, String email) {
+        return committer(name, email, (Instant) null);
+    }
+
+    /**
+     * Configures the committer of the commit. If not specified, the authenticated user is used as the committer.
+     *
+     * @param name
+     *            the name of the committer
+     * @param email
+     *            the email of the committer
+     * @param date
+     *            the date of the commit
+     * @return the gh content builder
+     * @deprecated use {@link #committer(String, String, Instant)} instead
+     */
+    @Deprecated
+    public GHContentBuilder committer(String name, String email, Date date) {
+        return committer(name, email, GitHubClient.toInstantOrNull(date));
+    }
+
+    /**
+     * Configures the committer of the commit. If not specified, the authenticated user is used as the committer.
+     *
+     * @param name
+     *            the name of the committer
+     * @param email
+     *            the email of the committer
+     * @param date
+     *            the timestamp of the commit
+     * @return the gh content builder
+     */
+    public GHContentBuilder committer(String name, String email, Instant date) {
+        req.with("committer", new UserInfo(name, email, date));
+        return this;
+    }
+
     /**
      * Content gh content builder.
      *