From c59bf52dd18cc26ab5bbccbff1c1782d3fbed08c Mon Sep 17 00:00:00 2001
From: "siddik.acil" <siddik.acil@egym.com>
Date: Thu, 23 Mar 2023 18:26:51 +0100
Subject: chore(deps): Javax JSON to Jakarta JSON

Move to Quarkus 3.x Beta for updating to Jakarta version of the libraries. That means moving away from org.glassfish:java.json to jakarta.json:jakarta.json-api.

The new version will be released as v6.0.0. Any changes should go to both 5.x and 6.x versions until Quarkus 3.x is Final and javax.json is finally history.

Points:
- We might want to change the Import Order to include Jakarta.
- We might want to move from Javax to Jakarta for annotation, ws etc. in the examples.
---
 core/pom.xml                                                        | 6 +++---
 .../eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java  | 6 +++---
 .../main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java | 6 +++---
 .../mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java   | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'core')

diff --git a/core/pom.xml b/core/pom.xml
index 601e83f..b239b3e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,7 +14,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
   <parent>
     <groupId>eu.mulk.quarkus-googlecloud-jsonlogging</groupId>
     <artifactId>quarkus-googlecloud-jsonlogging-parent</artifactId>
-    <version>5.0.1-SNAPSHOT</version>
+    <version>6.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>quarkus-googlecloud-jsonlogging-core</artifactId>
@@ -30,8 +30,8 @@ SPDX-License-Identifier: LGPL-3.0-or-later
       <artifactId>smallrye-common-constraint</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>jakarta.json</artifactId>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java
index ef5d06a..87a889c 100644
--- a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java
+++ b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java
@@ -7,9 +7,9 @@ package eu.mulk.quarkus.googlecloud.jsonlogging;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Objects;
-import javax.json.Json;
-import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonObjectBuilder;
+import jakarta.json.JsonValue;
 
 /**
  * A simple single key–value pair forming a {@link StructuredParameter}.
diff --git a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java
index dec18b2..69ebc93 100644
--- a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java
+++ b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java
@@ -8,9 +8,9 @@ import io.smallrye.common.constraint.Nullable;
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  * A JSON log entry compatible with Google Cloud Logging.
diff --git a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java
index c233158..17b3fe9 100644
--- a/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java
+++ b/core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java
@@ -4,7 +4,7 @@
 
 package eu.mulk.quarkus.googlecloud.jsonlogging;
 
-import javax.json.JsonObjectBuilder;
+import jakarta.json.JsonObjectBuilder;
 
 /**
  * A structured parameter usable as logging payload.
-- 
cgit v1.2.3


From 21805f62218f2a48cac18fcda4712893b14d3c79 Mon Sep 17 00:00:00 2001
From: "siddik.acil" <siddik.acil@egym.com>
Date: Fri, 24 Mar 2023 08:58:35 +0100
Subject: 6.0.0-SNAPSHOT

---
 core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/pom.xml b/core/pom.xml
index b239b3e..53fe709 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -14,7 +14,7 @@ SPDX-License-Identifier: LGPL-3.0-or-later
   <parent>
     <groupId>eu.mulk.quarkus-googlecloud-jsonlogging</groupId>
     <artifactId>quarkus-googlecloud-jsonlogging-parent</artifactId>
-    <version>6.0.1-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>quarkus-googlecloud-jsonlogging-core</artifactId>
-- 
cgit v1.2.3


From ca9b92912a0090af5e3c24ab922ffdc0849869e5 Mon Sep 17 00:00:00 2001
From: "siddik.acil" <siddik.acil@egym.com>
Date: Fri, 24 Mar 2023 09:54:22 +0100
Subject: Eclipse Parsson

---
 core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/pom.xml b/core/pom.xml
index 53fe709..20713c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -30,8 +30,8 @@ SPDX-License-Identifier: LGPL-3.0-or-later
       <artifactId>smallrye-common-constraint</artifactId>
     </dependency>
     <dependency>
-      <groupId>jakarta.json</groupId>
-      <artifactId>jakarta.json-api</artifactId>
+      <groupId>org.eclipse.parsson</groupId>
+      <artifactId>parsson</artifactId>
     </dependency>
   </dependencies>
 
-- 
cgit v1.2.3