summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2023-03-24 11:00:37 +0100
committerGitHub <noreply@github.com>2023-03-24 11:00:37 +0100
commit3d5479a851426db589d73f9777bed55fb5ca42e5 (patch)
tree26fc71527b4db4f0af9e2dc031b465f9d37a5b50 /core
parentd979a7a028bfc543ef4d2d524b541db2ec4849c9 (diff)
parent195c2674fe3e914be20385afdb1482fab8ca8d02 (diff)
Move from Javax JSON to Jakarta JSON (#11)
Moves from the old Jakarta EE 8/9 namespaces to Jakarta EE 10.
Diffstat (limited to 'core')
-rw-r--r--core/pom.xml6
-rw-r--r--core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/KeyValueParameter.java6
-rw-r--r--core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/LogEntry.java6
-rw-r--r--core/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/StructuredParameter.java2
4 files changed, 10 insertions, 10 deletions
diff --git a/core/pom.xml b/core/pom.xml
index 601e83f..20713c2 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.0-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>org.eclipse.parsson</groupId>
+ <artifactId>parsson</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.