Begin preparations of maven central upload

Author: malczuuu

.github/workflows/gradle-build.yml

@@ -16,10 +16,10 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
-          java-version: "17"
+          java-version: "11"
           distribution: "temurin"
 
       # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.

.github/workflows/gradle-dependency-submission.yml

@@ -3,6 +3,11 @@ name: Dependency Submission
 on:
   push:
     branches: [ "main" ]
+    paths:
+      - 'build.gradle.kts'
+      - 'settings.gradle.kts'
+      - 'gradle/**'
+      - 'buildSrc/**'
 
 jobs:
   dependency-submission:
@@ -12,10 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v5
         with:
-          java-version: "17"
+          java-version: "11"
           distribution: "temurin"
 
       # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.

.jitpack.yml

@@ -57,8 +57,7 @@ public class ExampleClass {
 
 ## Usage
 
-This library is available through [Jitpack][jitpack] repository. Add it along with repository in your dependency
-manager.
+Add library as dependency to Maven or Gradle. See the actual versions on [Maven Central][maven-central]. **Java 11** or higher is required to use this library.
 
 1. Maven:
    ```xml
@@ -83,7 +82,7 @@ manager.
 - [`problem4j-spring-web`][problem4j-spring-web] - Spring Web module extending `ResponseEntityExceptionHandler` for
   handling exceptions and returning `Problem` responses.
 
-[jitpack]: https://jitpack.io/#malczuuu/problem4j-core
+[maven-central]: https://central.sonatype.com/artifact/io.github.malczuuu.problem4j/problem4j-core
 
 [problem4j]: https://github.com/malczuuu/problem4j
 

README.md

@@ -1,19 +1,27 @@
 import com.diffplug.spotless.LineEnding
 
 plugins {
-    `java-library`
-    `maven-publish`
-    id("com.diffplug.spotless") version "7.2.1"
+    id("java-library")
+    id("maven-publish")
+    id("signing")
+    id("com.diffplug.spotless").version("7.2.1")
+    id("com.gradleup.nmcp.aggregation").version("1.1.0")
 }
 
 group = "io.github.malczuuu.problem4j"
 
-if (version == "unspecified") {
-    version = Versioning.getSnapshotVersion(rootProject.rootDir)
-}
+/**
+ * In order to avoid hardcoding snapshot versions, we derive the version from the current Git commit hash. For CI/CD add
+ * -Pversion={releaseVersion} parameter to match Git tag.
+ */
+version =
+    if (version == "unspecified")
+        getSnapshotVersion(rootProject.rootDir)
+    else
+        version
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(11))
+    toolchain.languageVersion = JavaLanguageVersion.of(11)
     withSourcesJar()
     withJavadocJar()
 }
@@ -38,20 +46,57 @@ publishing {
             from(components["java"])
 
             pom {
-                name.set(project.name)
-                description.set("Core library implementing Problem model according to RFC7807")
-                url.set("https://github.com/malczuuu/${project.name}")
+                name = project.name
+                description = "Core library implementing Problem model according to RFC7807"
+                url = "https://github.com/malczuuu/${project.name}"
+                inceptionYear = "2025"
                 licenses {
                     license {
-                        name.set("MIT License")
-                        url.set("https://opensource.org/licenses/MIT")
+                        name = "MIT License"
+                        url = "https://opensource.org/licenses/MIT"
                     }
                 }
+                developers {
+                    developer {
+                        id = "malczuuu"
+                        name = "Damian Malczewski"
+                        url = "https://github.com/malczuuu"
+                    }
+                }
+                issueManagement {
+                    system = "GitHub Issues"
+                    url = "https://github.com/malczuuu/${project.name}/issues"
+                }
+                scm {
+                    connection = "scm:git:git://github.com/malczuuu/${project.name}.git"
+                    developerConnection = "scm:git:[email protected]:malczuuu/${project.name}.git"
+                    url = "https://github.com/malczuuu/${project.name}"
+                }
             }
         }
     }
 }
 
+nmcpAggregation {
+    centralPortal {
+        username = System.getenv("PUBLISHING_USERNAME")
+        password = System.getenv("PUBLISHING_PASSWORD")
+
+        publishingType = "USER_MANAGED"
+    }
+    publishAllProjectsProbablyBreakingProjectIsolation()
+}
+
+signing {
+    if (project.hasProperty("sign")) {
+        useInMemoryPgpKeys(
+            System.getenv("SIGNING_KEY"),
+            System.getenv("SIGNING_PASSWORD")
+        )
+        sign(publishing.publications["maven"])
+    }
+}
+
 spotless {
     format("misc") {
         target("**/*.gradle.kts", "**/.gitattributes", "**/.gitignore")

build.gradle.kts

@@ -3,34 +3,32 @@ import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 import java.io.File
 
-object Versioning {
 
-    private const val UNSPECIFIED = "unspecified"
+private const val UNSPECIFIED = "unspecified"
 
-    /**
-     * Returns a snapshot version string based on the abbreviated Git commit hash of HEAD.
-     * On error, returns "unspecified".
-     *
-     * @param projectRootDir the root directory of the project (containing .git)
-     */
-    fun getSnapshotVersion(projectRootDir: File): String {
-        return try {
-            val builder = FileRepositoryBuilder()
-                .setGitDir(File(projectRootDir, ".git"))
-                .readEnvironment()
-                .findGitDir()
+/**
+ * Returns a snapshot version string based on the abbreviated Git commit hash of HEAD.
+ * On error, returns "unspecified".
+ *
+ * @param projectRootDir the root directory of the project (containing .git)
+ */
+fun getSnapshotVersion(projectRootDir: File): String {
+    return try {
+        val builder = FileRepositoryBuilder()
+            .setGitDir(File(projectRootDir, ".git"))
+            .readEnvironment()
+            .findGitDir()
 
-            builder.build().use { repository ->
-                val headId = repository.resolve("HEAD") ?: return UNSPECIFIED
+        builder.build().use { repository ->
+            val headId = repository.resolve("HEAD") ?: return UNSPECIFIED
 
-                RevWalk(repository).use { revWalk ->
-                    val headCommit: RevCommit = revWalk.parseCommit(headId)
-                    headCommit.id.name.substring(0, 7)
-                }
+            RevWalk(repository).use { revWalk ->
+                val headCommit: RevCommit = revWalk.parseCommit(headId)
+                headCommit.id.name.substring(0, 7)
             }
-        } catch (e: Exception) {
-            System.err.println("Error determining version: $e")
-            UNSPECIFIED
         }
+    } catch (e: Exception) {
+        System.err.println("Error determining version: $e")
+        UNSPECIFIED
     }
 }

buildSrc/src/main/kotlin/Versioning.kt

@@ -1,22 +1,19 @@
 package io.github.malczuuu.problem4j.core;
 
-import java.util.HashMap;
 import java.util.Map;
 
 final class JsonEscape {
 
-  private static final Map<Character, String> REPLACEMENTS = new HashMap<>();
-
-  static {
-    REPLACEMENTS.put('"', "\\\"");
-    REPLACEMENTS.put('\\', "\\\\");
-    REPLACEMENTS.put('\b', "\\b");
-    REPLACEMENTS.put('\f', "\\f");
-    REPLACEMENTS.put('\n', "\\n");
-    REPLACEMENTS.put('\r', "\\r");
-    REPLACEMENTS.put('\t', "\\t");
-    REPLACEMENTS.put('/', "\\/");
-  }
+  private static final Map<Character, String> REPLACEMENTS =
+      Map.of(
+          '"', "\\\"",
+          '\\', "\\\\",
+          '\b', "\\b",
+          '\f', "\\f",
+          '\n', "\\n",
+          '\r', "\\r",
+          '\t', "\\t",
+          '/', "\\/");
 
   static String escape(String value) {
     StringBuilder result = new StringBuilder();

src/main/java/io/github/malczuuu/problem4j/core/JsonEscape.java

@@ -1,10 +1,8 @@
 package io.github.malczuuu.problem4j.core;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.net.URI;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -15,7 +13,7 @@
 
 public class Problem implements Serializable {
 
-  @Serial private static final long serialVersionUID = 1L;
+  private static final long serialVersionUID = 1L;
 
   public static final URI BLANK_TYPE = URI.create("about:blank");
   public static final String CONTENT_TYPE = "application/problem+json";
@@ -24,22 +22,6 @@ public static ProblemBuilder builder() {
     return new ProblemBuilderImpl();
   }
 
-  public static ProblemBuilder builder(Problem problem) {
-    ProblemBuilder builder =
-        builder()
-            .type(problem.getType())
-            .title(problem.getTitle())
-            .status(problem.getStatus())
-            .detail(problem.getDetail())
-            .instance(problem.getInstance());
-
-    for (String extension : problem.getExtensions()) {
-      builder = builder.extension(extension, problem.getExtensionValue(extension));
-    }
-
-    return builder;
-  }
-
   public static Extension extension(String key, Object value) {
     return new Extension(key, value);
   }
@@ -85,6 +67,22 @@ public Problem(
     this(type, title, status, detail, instance, buildMapFromRawArgs(extensions));
   }
 
+  public ProblemBuilder toBuilder() {
+    ProblemBuilder builder =
+        builder()
+            .type(getType())
+            .title(getTitle())
+            .status(getStatus())
+            .detail(getDetail())
+            .instance(getInstance());
+
+    for (String extension : getExtensions()) {
+      builder = builder.extension(extension, getExtensionValue(extension));
+    }
+
+    return builder;
+  }
+
   private static Map<String, Object> buildMapFromExtensions(Set<Extension> extensions) {
     Map<String, Object> map = new HashMap<>(extensions.size());
     extensions.forEach(e -> map.put(e.getKey(), e.getValue()));
@@ -107,11 +105,6 @@ private static Map<String, Object> buildMapFromRawArgs(Object[] arguments)
 
     Map<String, Object> map = new HashMap<>(arguments.length / 2);
 
-    List<Object> valuesAsList = new ArrayList<>(Arrays.asList(arguments));
-    if (valuesAsList.size() % 2 != 0) {
-      valuesAsList.add(valuesAsList.size() - 1);
-    }
-
     for (int i = 0; i < arguments.length; i += 2) {
       String key = arguments[i].toString();
       Object value = arguments[i + 1];
@@ -155,7 +148,7 @@ public boolean hasExtension(String extension) {
 
   @Override
   public boolean equals(Object o) {
-    if (o == null || getClass() != o.getClass()) {
+    if (!(o instanceof Problem)) {
       return false;
     }
     Problem problem = (Problem) o;
@@ -176,23 +169,22 @@ public int hashCode() {
   public String toString() {
     List<String> lines = new ArrayList<>(4);
     if (getType() != null) {
-      lines.add("\"type\": \"" + quote(getType().toString()) + "\"");
+      lines.add("\"type\" : \"" + quote(getType().toString()) + "\"");
     }
     if (getTitle() != null) {
-      lines.add("\"title\": \"" + quote(getTitle()) + "\"");
+      lines.add("\"title\" : \"" + quote(getTitle()) + "\"");
     }
-    lines.add("\"status\": " + getStatus());
+    lines.add("\"status\" : " + getStatus());
     if (getDetail() != null) {
-      lines.add("\"detail\": \"" + quote(getDetail()) + "\"");
+      lines.add("\"detail\" : \"" + quote(getDetail()) + "\"");
+    }
+    if (getInstance() != null) {
+      lines.add("\"instance\" : \"" + quote(getInstance().toString()) + "\"");
     }
     return lines.stream().collect(Collectors.joining(", ", "{ ", " }"));
   }
 
-  /**
-   * @deprecated method was accidentally made public
-   */
-  @Deprecated(since = "3.2.0")
-  public static String quote(String string) {
+  private static String quote(String string) {
     return JsonEscape.escape(string);
   }
 

src/main/java/io/github/malczuuu/problem4j/core/Problem.java

@@ -1,6 +1,8 @@
 package io.github.malczuuu.problem4j.core;
 
 import java.net.URI;
+import java.util.Collection;
+import java.util.Map;
 
 public interface ProblemBuilder {
 
@@ -22,5 +24,11 @@ public interface ProblemBuilder {
 
   ProblemBuilder extension(String name, Object value);
 
+  ProblemBuilder extension(Map<String, Object> extensions);
+
+  ProblemBuilder extension(Problem.Extension... extensions);
+
+  ProblemBuilder extension(Collection<Problem.Extension> extensions);
+
   Problem build();
 }