From 40cae5540161b50fc0d06e56101cc3f0eeefa96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 26 May 2023 17:16:48 +0200 Subject: [PATCH] Upgrade to Quarkus 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the main change is migrating from JavaEE to JakartaEE. - 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) - deactivated tests CompasOclFileCollectorTest and SclRiseClipseValidatorTest which are failign locally so that I can build locally the whole project and have the Quarkus migration tool working - 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. fix #204 Currently build failure: ``` [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.11.0:compile (default-compile) on project app: Compilation failure: Compilation failure: [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoder.java:[10,8] cannot access javax.websocket.Encoder [ERROR] class file for javax.websocket.Encoder not found [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.java:[10,8] cannot access javax.websocket.Decoder [ERROR] class file for javax.websocket.Decoder not found [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java:[30,48] incompatible types: java.lang.Class cannot be converted to java.lang.Class [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java:[31,49] incompatible types: java.lang.Class cannot be converted to java.lang.Class [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java:[31,77] incompatible types: java.lang.Class cannot be converted to java.lang.Class [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java:[59,9] cannot access javax.websocket.Session [ERROR] class file for javax.websocket.Session not found [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsResponseEncoder.java:[11,5] method does not override or implement a method from a supertype [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.java:[11,5] method does not override or implement a method from a supertype [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoder.java:[16,5] method does not override or implement a method from a supertype [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoder.java:[11,5] method does not override or implement a method from a supertype [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoder.java:[16,5] method does not override or implement a method from a supertype [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java:[29,81] incompatible types: jakarta.websocket.Session cannot be converted to javax.websocket.Session [ERROR] /home/apupier/git/compas-scl-validator/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/encoder/SclValidateWsRequestEncoder.java:[11,5] method does not override or implement a method from a supertype ``` Signed-off-by: Aurélien Pupier --- .../rest/CompasSclValidatorConfiguration.java | 4 ++-- .../exception/NsdocNotFoundExceptionHandler.java | 6 +++--- .../rest/monitoring/LivenessHealthCheck.java | 2 +- .../rest/monitoring/ReadinessHealthCheck.java | 2 +- .../compas/scl/validator/rest/v1/NsdocResource.java | 6 +++--- .../scl/validator/rest/v1/SclValidatorResource.java | 10 +++++----- .../validator/rest/v1/model/NsdocListResponse.java | 8 ++++---- .../scl/validator/rest/v1/model/NsdocResponse.java | 8 ++++---- .../validator/rest/v1/model/SclValidateRequest.java | 10 +++++----- .../validator/rest/v1/model/SclValidateResponse.java | 8 ++++---- .../scl/validator/rest/v1/model/package-info.java | 4 ++-- .../websocket/event/SclValidatorEventHandler.java | 4 ++-- .../event/model/SclValidatorEventRequest.java | 2 +- .../websocket/v1/SclValidatorServerEndpoint.java | 12 ++++++------ .../websocket/v1/model/SclValidateWsRequest.java | 8 ++++---- .../websocket/v1/model/SclValidateWsResponse.java | 8 ++++---- .../exception/NsdocNotFoundExceptionHandlerTest.java | 2 +- .../event/SclValidatorEventHandlerTest.java | 4 ++-- .../event/model/SclValidatorEventRequestTest.java | 2 +- .../websocket/v1/SclValidatorServerEndpointTest.java | 8 ++++---- .../v1/decoder/SclValidateWsRequestDecoderTest.java | 2 +- .../v1/decoder/SclValidateWsResponseDecoderTest.java | 2 +- pom.xml | 6 +++--- .../compas/scl/validator/service/NsdocService.java | 4 ++-- .../scl/validator/service/SclValidatorService.java | 4 ++-- .../compas/scl/validator/model/NsdocFile.java | 8 ++++---- .../compas/scl/validator/model/ValidationError.java | 6 +++--- 27 files changed, 75 insertions(+), 75 deletions(-) diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfiguration.java index 67732ee..d64ab42 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfiguration.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfiguration.java @@ -11,8 +11,8 @@ import org.lfenergy.compas.scl.validator.common.NsdocFinder; import org.lfenergy.compas.scl.validator.impl.SclRiseClipseValidator; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; /** * Create Beans from other dependencies that are used in the application. diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandler.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandler.java index 8a49eb9..3649211 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandler.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandler.java @@ -6,9 +6,9 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; import org.lfenergy.compas.scl.validator.exception.NsdocFileNotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class NsdocNotFoundExceptionHandler implements ExceptionMapper { diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/LivenessHealthCheck.java index a8895f6..3b4f233 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/LivenessHealthCheck.java @@ -7,7 +7,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/scl/validator/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/ReadinessHealthCheck.java index 0412322..55500ec 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/monitoring/ReadinessHealthCheck.java @@ -7,7 +7,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/scl/validator/rest/v1/NsdocResource.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java index 5e8be64..a48f3a1 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResource.java @@ -11,9 +11,9 @@ import org.lfenergy.compas.scl.validator.rest.v1.model.NsdocResponse; import org.lfenergy.compas.scl.validator.service.NsdocService; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.util.UUID; import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.ID_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java index 8bb44ac..bb39f1c 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResource.java @@ -12,11 +12,11 @@ import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; import org.lfenergy.compas.scl.validator.service.SclValidatorService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocListResponse.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocListResponse.java index a2e3bdb..2c39731 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocListResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocListResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.validator.model.NsdocFile; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.Collection; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponse.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponse.java index 32cd342..cad6908 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/NsdocResponse.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateRequest.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateRequest.java index 41c88c8..f9fb7c6 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateRequest.java @@ -6,11 +6,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateResponse.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateResponse.java index 02462aa..5b7e5ba 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/SclValidateResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.validator.model.ValidationError; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.List; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/package-info.java index 90ca604..534caf0 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/rest/v1/model/package-info.java @@ -8,7 +8,7 @@ ) package org.lfenergy.compas.scl.validator.rest.v1.model; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlSchema; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java index efa911f..f04ce2f 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandler.java @@ -9,8 +9,8 @@ import org.lfenergy.compas.scl.validator.websocket.event.model.SclValidatorEventRequest; import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; /** * Event Handler used to execute the validation asynchronized. diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java index 93798c2..3d3843b 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequest.java @@ -5,7 +5,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; -import javax.websocket.Session; +import jakarta.websocket.Session; public class SclValidatorEventRequest { private Session session; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java index dcbbc3a..3403073 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpoint.java @@ -14,12 +14,12 @@ import org.lfenergy.compas.scl.validator.websocket.v1.encoder.SclValidateWsResponseEncoder; import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.websocket.*; -import javax.websocket.server.PathParam; -import javax.websocket.server.ServerEndpoint; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.websocket.*; +import jakarta.websocket.server.PathParam; +import jakarta.websocket.server.ServerEndpoint; import static org.lfenergy.compas.core.websocket.WebsocketSupport.handleException; import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.TYPE_PATH_PARAM; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java index 663b264..5b84e88 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsRequest.java @@ -7,10 +7,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateRequest; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java index 7ebaceb..c9dae44 100644 --- a/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java +++ b/app/src/main/java/org/lfenergy/compas/scl/validator/websocket/v1/model/SclValidateWsResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl.validator.rest.v1.model.SclValidateResponse; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandlerTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandlerTest.java index 05f50f5..a76a88b 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandlerTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/rest/exception/NsdocNotFoundExceptionHandlerTest.java @@ -7,7 +7,7 @@ import org.lfenergy.compas.core.commons.model.ErrorResponse; import org.lfenergy.compas.scl.validator.exception.NsdocFileNotFoundException; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java index 494e005..ed1d57c 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/SclValidatorEventHandlerTest.java @@ -18,8 +18,8 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import javax.websocket.RemoteEndpoint; -import javax.websocket.Session; +import jakarta.websocket.RemoteEndpoint; +import jakarta.websocket.Session; import java.util.ArrayList; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java index 1b047b2..fd313c1 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/event/model/SclValidatorEventRequestTest.java @@ -11,7 +11,7 @@ import org.lfenergy.compas.scl.extensions.model.SclFileType; import org.mockito.Mockito; -import javax.websocket.Session; +import jakarta.websocket.Session; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java index 50f94e8..f6b37e5 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/SclValidatorServerEndpointTest.java @@ -20,10 +20,10 @@ import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsRequest; import org.lfenergy.compas.scl.validator.websocket.v1.model.SclValidateWsResponse; -import javax.websocket.ClientEndpoint; -import javax.websocket.ContainerProvider; -import javax.websocket.OnMessage; -import javax.websocket.Session; +import jakarta.websocket.ClientEndpoint; +import jakarta.websocket.ContainerProvider; +import jakarta.websocket.OnMessage; +import jakarta.websocket.Session; import java.net.URI; import java.util.List; import java.util.concurrent.LinkedBlockingDeque; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java index c15f5c6..534eed2 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsRequestDecoderTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.core.commons.exception.CompasException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.UnmarshalException; import static org.junit.jupiter.api.Assertions.*; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java index 7a4ea0c..36c4838 100644 --- a/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java +++ b/app/src/test/java/org/lfenergy/compas/scl/validator/websocket/v1/decoder/SclValidateWsResponseDecoderTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.core.commons.exception.CompasException; -import javax.xml.bind.UnmarshalException; +import jakarta.xml.bind.UnmarshalException; import static org.junit.jupiter.api.Assertions.*; import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE; diff --git a/pom.xml b/pom.xml index 72c22e8..f82f59e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.0.4 0.12.0 - 2.16.5.Final + 3.0.4.Final 2.20.0 0.9.1 17 @@ -62,8 +62,8 @@ SPDX-License-Identifier: Apache-2.0 - io.quarkus - quarkus-universe-bom + io.quarkus.platform + quarkus-bom ${quarkus.platform.version} pom import diff --git a/service/src/main/java/org/lfenergy/compas/scl/validator/service/NsdocService.java b/service/src/main/java/org/lfenergy/compas/scl/validator/service/NsdocService.java index 82d2c99..43f6fa4 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/validator/service/NsdocService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/validator/service/NsdocService.java @@ -6,8 +6,8 @@ import org.lfenergy.compas.scl.validator.common.NsdocFinder; import org.lfenergy.compas.scl.validator.model.NsdocFile; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.Collection; import java.util.UUID; diff --git a/service/src/main/java/org/lfenergy/compas/scl/validator/service/SclValidatorService.java b/service/src/main/java/org/lfenergy/compas/scl/validator/service/SclValidatorService.java index ab57554..52119cc 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/validator/service/SclValidatorService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/validator/service/SclValidatorService.java @@ -8,8 +8,8 @@ import org.lfenergy.compas.scl.validator.model.ValidationError; import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.List; @ApplicationScoped diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/model/NsdocFile.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/model/NsdocFile.java index 8804f2b..ce98ff1 100644 --- a/validator/src/main/java/org/lfenergy/compas/scl/validator/model/NsdocFile.java +++ b/validator/src/main/java/org/lfenergy/compas/scl/validator/model/NsdocFile.java @@ -5,10 +5,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.validation.constraints.NotBlank; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.validation.constraints.NotBlank; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import java.util.UUID; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI; diff --git a/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java b/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java index a308ed6..7a8519f 100644 --- a/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java +++ b/validator/src/main/java/org/lfenergy/compas/scl/validator/model/ValidationError.java @@ -5,9 +5,9 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI;