Merge pull request #58 from git-commit-id/57

#57: Use relocated json dependencies
git-commit-id · Oct 8, 2023 · bc503ab · bc503ab
2 parents 5a4e900 + b9b6273
commit bc503ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -196,13 +196,13 @@
         </dependency>
         <!-- json stuff -->
         <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>1.1.4</version>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.1.2</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
             <version>1.1.4</version>
         </dependency>
         <!-- yaml -->

diff --git a/src/main/java/pl/project13/core/util/JsonManager.java b/src/main/java/pl/project13/core/util/JsonManager.java
@@ -17,15 +17,15 @@
 
 package pl.project13.core.util;
 
+import jakarta.json.Json;
+import jakarta.json.JsonReader;
+import jakarta.json.JsonString;
+import jakarta.json.stream.JsonGenerator;
+import jakarta.json.stream.JsonGeneratorFactory;
 import nu.studer.java.util.OrderedProperties;
 import pl.project13.core.CannotReadFileException;
 
 import javax.annotation.Nonnull;
-import javax.json.Json;
-import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.stream.JsonGenerator;
-import javax.json.stream.JsonGeneratorFactory;
 import java.io.*;
 import java.nio.charset.Charset;
 import java.util.Collections;

diff --git a/src/test/java/pl/project13/core/util/TestJsonManager.java b/src/test/java/pl/project13/core/util/TestJsonManager.java
@@ -52,7 +52,6 @@ public void testDumpWithFlatGitProperty() throws Exception {
     // then
     Assert.assertEquals(
             Arrays.asList(
-                    "",
                     "{",
                     "    \"git.commit.id\": \"beef4e92e9cabd043b105a14514289f331b40bf2\",",
                     "    \"git.commit.id.abbrev\": \"beef4e9\"",
@@ -101,7 +100,6 @@ public void testDumpWithFullGitProperty() throws Exception {
     // then
     Assert.assertEquals(
             Arrays.asList(
-                    "",
                     "{",
                     "    \"git.commit.id.abbrev\": \"beef4e9\",",
                     "    \"git.commit.id.full\": \"beef4e92e9cabd043b105a14514289f331b40bf2\"",
@@ -150,7 +148,6 @@ public void testDumpWithUnicode() throws Exception {
     // then
     Assert.assertEquals(
             Arrays.asList(
-                    "",
                     "{",
                     "    \"git.commit.message.full\": \"initial commit on test project with some special characters äöüàñ.\",",
                     "    \"git.commit.user.name\": \"Александр Eliáš\"",