From fe91d3a8bdd0c933b962f15b4634c2001d639853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 26 May 2023 14:59:49 +0200 Subject: [PATCH] Upgrade to Quarkus 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update Quarkus bom from `io.quarkus:quarkus-universe-bom` to `io.quarkus.platform:quarkus-bom` as it was deprecated since Quarkus 2.1 https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.1#quarkus-universe-bom-is-deprecated (and it is required to use the Quarkus migration tool) - launched quarkus `quarkus update --stream=3.0` as mentioned in https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.0#automatic-update-tool which dealt with a fair part of the migration. Then it remained few little tasks. - removed no more necessary com.sun.xml.bind:jaxb-impl fixes #4 Signed-off-by: Aurélien Pupier --- .../rest/monitoring/LivenessHealthCheck.java | 2 +- .../rest/monitoring/ReadinessHealthCheck.java | 2 +- .../sitipe/rest/v1/CompasSitipeResource.java | 14 +++++++------- .../sitipe/rest/v2/CompasSitipeResource.java | 14 +++++++------- pom.xml | 13 +++---------- .../sitipe/data/repository/SitipeRepository.java | 2 +- .../compas/sitipe/service/CompasSitipeService.java | 4 ++-- 7 files changed, 22 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/LivenessHealthCheck.java index ff8f3d7..712b935 100644 --- a/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/LivenessHealthCheck.java @@ -8,7 +8,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Liveness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Liveness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/ReadinessHealthCheck.java index f087eee..2ea1fd9 100644 --- a/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/sitipe/rest/monitoring/ReadinessHealthCheck.java @@ -8,7 +8,7 @@ import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.Readiness; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @Readiness @ApplicationScoped diff --git a/app/src/main/java/org/lfenergy/compas/sitipe/rest/v1/CompasSitipeResource.java b/app/src/main/java/org/lfenergy/compas/sitipe/rest/v1/CompasSitipeResource.java index 736d72b..00d9011 100644 --- a/app/src/main/java/org/lfenergy/compas/sitipe/rest/v1/CompasSitipeResource.java +++ b/app/src/main/java/org/lfenergy/compas/sitipe/rest/v1/CompasSitipeResource.java @@ -8,13 +8,13 @@ import io.smallrye.mutiny.Uni; import org.lfenergy.compas.sitipe.service.CompasSitipeService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; // @Authenticated @RequestScoped diff --git a/app/src/main/java/org/lfenergy/compas/sitipe/rest/v2/CompasSitipeResource.java b/app/src/main/java/org/lfenergy/compas/sitipe/rest/v2/CompasSitipeResource.java index c470c0d..9518322 100644 --- a/app/src/main/java/org/lfenergy/compas/sitipe/rest/v2/CompasSitipeResource.java +++ b/app/src/main/java/org/lfenergy/compas/sitipe/rest/v2/CompasSitipeResource.java @@ -7,13 +7,13 @@ import io.smallrye.mutiny.Uni; import org.lfenergy.compas.sitipe.service.CompasSitipeService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; // @Authenticated @RequestScoped diff --git a/pom.xml b/pom.xml index 4c9d8bd..5c07ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,8 @@ SPDX-License-Identifier: Apache-2.0 3.2.0 0.12.0 - 2.16.3.Final + 3.0.4.Final - 2.3.8 3.1 2.20.0 0.9.1 @@ -57,8 +56,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import @@ -91,12 +90,6 @@ SPDX-License-Identifier: Apache-2.0 ${compas.core.version} - - com.sun.xml.bind - jaxb-impl - ${jaxb-impl.version} - - org.eclipse.microprofile.openapi microprofile-openapi-api diff --git a/repository/src/main/java/org/lfenergy/compas/sitipe/data/repository/SitipeRepository.java b/repository/src/main/java/org/lfenergy/compas/sitipe/data/repository/SitipeRepository.java index dbef1cc..514836c 100644 --- a/repository/src/main/java/org/lfenergy/compas/sitipe/data/repository/SitipeRepository.java +++ b/repository/src/main/java/org/lfenergy/compas/sitipe/data/repository/SitipeRepository.java @@ -6,7 +6,7 @@ import io.quarkus.hibernate.orm.panache.PanacheRepository; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class SitipeRepository implements PanacheRepository { diff --git a/service/src/main/java/org/lfenergy/compas/sitipe/service/CompasSitipeService.java b/service/src/main/java/org/lfenergy/compas/sitipe/service/CompasSitipeService.java index 0123333..47e0ad8 100644 --- a/service/src/main/java/org/lfenergy/compas/sitipe/service/CompasSitipeService.java +++ b/service/src/main/java/org/lfenergy/compas/sitipe/service/CompasSitipeService.java @@ -6,8 +6,8 @@ import org.lfenergy.compas.sitipe.data.repository.SitipeRepository; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Service class that will be using a Repository instance to retrieve, Sitipe configuration.