From c59bf52dd18cc26ab5bbccbff1c1782d3fbed08c Mon Sep 17 00:00:00 2001 From: "siddik.acil" 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. --- examples/quarkus/pom.xml | 2 +- examples/spring-boot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/quarkus/pom.xml b/examples/quarkus/pom.xml index 6e4f042..25e4f8b 100644 --- a/examples/quarkus/pom.xml +++ b/examples/quarkus/pom.xml @@ -14,7 +14,7 @@ SPDX-License-Identifier: GPL-3.0-or-later eu.mulk.quarkus-googlecloud-jsonlogging quarkus-googlecloud-jsonlogging-parent - 5.0.0 + 6.0.0 quarkus-googlecloud-jsonlogging-quarkus-example diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index d646316..abd2a1b 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -16,7 +16,7 @@ SPDX-License-Identifier: GPL-3.0-or-later eu.mulk.quarkus-googlecloud-jsonlogging quarkus-googlecloud-jsonlogging-parent - 5.0.0 + 6.0.0 quarkus-googlecloud-jsonlogging-spring-boot-example -- cgit v1.2.3 From 0c4bbce114364c4af10fe1d05cf2157434150f23 Mon Sep 17 00:00:00 2001 From: "siddik.acil" Date: Fri, 24 Mar 2023 09:54:36 +0100 Subject: Update Spring Boot Example --- examples/spring-boot/pom.xml | 2 +- .../eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index abd2a1b..2940c66 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -23,7 +23,7 @@ SPDX-License-Identifier: GPL-3.0-or-later Quarkus Google Cloud JSON Logging Extension - Spring Boot Example - 2.7.3 + 3.0.4 diff --git a/examples/spring-boot/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java b/examples/spring-boot/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java index 78331ce..a2b824a 100644 --- a/examples/spring-boot/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java +++ b/examples/spring-boot/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java @@ -6,7 +6,7 @@ package eu.mulk.quarkus.googlecloud.jsonlogging.example; import eu.mulk.quarkus.googlecloud.jsonlogging.KeyValueParameter; import eu.mulk.quarkus.googlecloud.jsonlogging.Label; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.jboss.logging.Logger; import org.jboss.logging.MDC; import org.springframework.web.bind.annotation.GetMapping; -- cgit v1.2.3 From 195c2674fe3e914be20385afdb1482fab8ca8d02 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Fri, 24 Mar 2023 10:58:57 +0100 Subject: Update Quarkus example. Change-Id: Ia52fac7ab966761d4a9eebc6fbf615ab5c97697d --- .../jsonlogging/example/RandomNumberParameterProvider.java | 2 +- .../quarkus/googlecloud/jsonlogging/example/RootResource.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RandomNumberParameterProvider.java b/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RandomNumberParameterProvider.java index 5d70079..65654e6 100644 --- a/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RandomNumberParameterProvider.java +++ b/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RandomNumberParameterProvider.java @@ -8,8 +8,8 @@ import eu.mulk.quarkus.googlecloud.jsonlogging.KeyValueParameter; import eu.mulk.quarkus.googlecloud.jsonlogging.StructuredParameter; import eu.mulk.quarkus.googlecloud.jsonlogging.StructuredParameterProvider; import io.quarkus.arc.Unremovable; +import jakarta.inject.Singleton; import java.util.concurrent.ThreadLocalRandom; -import javax.inject.Singleton; @Singleton @Unremovable diff --git a/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java b/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java index eb4443b..72eaba3 100644 --- a/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java +++ b/examples/quarkus/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/example/RootResource.java @@ -6,11 +6,11 @@ package eu.mulk.quarkus.googlecloud.jsonlogging.example; import eu.mulk.quarkus.googlecloud.jsonlogging.KeyValueParameter; import eu.mulk.quarkus.googlecloud.jsonlogging.Label; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jboss.logging.Logger; import org.jboss.logging.MDC; -- cgit v1.2.3