From 416b68cb8c0e9ecb26f1fef5f29cc873bc864eaf Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Sun, 8 Oct 2023 20:12:55 +0200
Subject: [PATCH 1/2] 
 https://github.com/git-commit-id/git-commit-id-plugin-core/issues/57: Use
 relocated json dependencies

- The dependency javax.json:javax.json-api was relocated to jakarta.json:jakarta.json-api (implicit bump from version 1.1.4 to 2.1.2)
- The dependency org.glassfish:javax.json was relocated to org.glassfish:jakarta.json (implicit bump from version 1.1.4 to 2.0.1)
---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2675fb3..6bccd8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,14 +196,14 @@
         </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>
-            <version>1.1.4</version>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <!-- yaml -->
         <dependency>

From b9b6273220fa0f7308e7451eba899f83d2f1b2f4 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Sun, 8 Oct 2023 20:37:25 +0200
Subject: [PATCH 2/2] 
 https://github.com/git-commit-id/git-commit-id-plugin-core/issues/57: Fix
 imports and dependencies

Aparently we now need to stop relying on
```
            <groupId>org.glassfish</groupId>
            <artifactId>jakarta.json</artifactId>
            <version>2.0.1</version>
```
and instead use
```
            <groupId>org.eclipse.parsson</groupId>
            <artifactId>parsson</artifactId>
            <version>1.1.4</version>
```

See https://github.com/elastic/elasticsearch-java/pull / 63
and https://jakarta.ee/blogs/javax-jakartaee-namespace-ecosystem-progress/
---
 pom.xml                                                |  6 +++---
 src/main/java/pl/project13/core/util/JsonManager.java  | 10 +++++-----
 .../java/pl/project13/core/util/TestJsonManager.java   |  3 ---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6bccd8e..4ef3ef4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -201,9 +201,9 @@
             <version>2.1.2</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
-            <version>2.0.1</version>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
+            <version>1.1.4</version>
         </dependency>
         <!-- yaml -->
         <dependency>
diff --git a/src/main/java/pl/project13/core/util/JsonManager.java b/src/main/java/pl/project13/core/util/JsonManager.java
index 072abc4..5fd9a04 100644
--- 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
index 96d930c..0fb3b42 100644
--- 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áš\"",