diff options
author | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2023-03-24 11:00:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-24 11:00:37 +0100 |
commit | 3d5479a851426db589d73f9777bed55fb5ca42e5 (patch) | |
tree | 26fc71527b4db4f0af9e2dc031b465f9d37a5b50 /examples | |
parent | d979a7a028bfc543ef4d2d524b541db2ec4849c9 (diff) | |
parent | 195c2674fe3e914be20385afdb1482fab8ca8d02 (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 'examples')
5 files changed, 10 insertions, 10 deletions
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 <parent> <groupId>eu.mulk.quarkus-googlecloud-jsonlogging</groupId> <artifactId>quarkus-googlecloud-jsonlogging-parent</artifactId> - <version>5.0.0</version> + <version>6.0.0</version> </parent> <artifactId>quarkus-googlecloud-jsonlogging-quarkus-example</artifactId> 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; diff --git a/examples/spring-boot/pom.xml b/examples/spring-boot/pom.xml index d646316..2940c66 100644 --- a/examples/spring-boot/pom.xml +++ b/examples/spring-boot/pom.xml @@ -16,14 +16,14 @@ SPDX-License-Identifier: GPL-3.0-or-later <parent> <groupId>eu.mulk.quarkus-googlecloud-jsonlogging</groupId> <artifactId>quarkus-googlecloud-jsonlogging-parent</artifactId> - <version>5.0.0</version> + <version>6.0.0</version> </parent> <artifactId>quarkus-googlecloud-jsonlogging-spring-boot-example</artifactId> <name>Quarkus Google Cloud JSON Logging Extension - Spring Boot Example</name> <properties> - <spring-boot.version>2.7.3</spring-boot.version> + <spring-boot.version>3.0.4</spring-boot.version> </properties> <dependencyManagement> 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; |