From bca4aa76f608e5faae2e8c0ea6d8c7941cf25536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Fri, 26 May 2023 16:39:03 +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) - 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. - Updated quarkus.index-dependency for jaxb from org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec to `jakarta.xml.bind:jakarta.xml.bind-api` fix #333 current test failure: ``` [ERROR] org.lfenergy.compas.cim.mapping.rest.v1.CompasCimMappingResourceTest.mapCimToScl_WhenCalled_ThenCorrectMessageIsRetrieved Time elapsed: 1.465 s <<< FAILURE! org.opentest4j.AssertionFailedError: expected: not at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:152) at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132) at org.junit.jupiter.api.AssertNotNull.failNull(AssertNotNull.java:49) at org.junit.jupiter.api.AssertNotNull.assertNotNull(AssertNotNull.java:35) at org.junit.jupiter.api.AssertNotNull.assertNotNull(AssertNotNull.java:30) at org.junit.jupiter.api.Assertions.assertNotNull(Assertions.java:301) at org.lfenergy.compas.cim.mapping.rest.v1.CompasCimMappingResourceTest.mapCimToScl_WhenCalled_ThenCorrectMessageIsRetrieved(CompasCimMappingResourceTest.java:70) ``` suspect logs: ``` 2023-05-26 16:28:42,577 WARN [io.qua.dep.ste.ReflectiveHierarchyStep] (build-26) Unable to properly register the hierarchy of the following classes for reflection as they are not in the Jandex index: - javax.xml.bind.JAXBElement (source: SmallRyeOpenApiProcessor > org.lfenergy.compas.cim.mapping.rest.v1.model.MapResponse) - javax.xml.namespace.QName (source: SmallRyeOpenApiProcessor > org.lfenergy.compas.cim.mapping.rest.v1.model.MapResponse) Consider adding them to the index either by creating a Jandex index for your dependency via the Maven plugin, an empty META-INF/beans.xml or quarkus.index-dependency properties. 2023-05-26 16:28:42,895 WARN [io.qua.arc.pro.BeanArchives] (build-20) Failed to index javax.xml.bind.JAXBElement: Class does not exist in ClassLoader QuarkusClassLoader:Deployment Class Loader: TEST@4c579b5b ``` even if before migration there is similar (but not exactly the same) warning: ``` [WARNING] [io.quarkus.deployment.steps.ReflectiveHierarchyStep] Unable to properly register the hierarchy of the following classes for reflection as they are not in the Jandex index: - javax.xml.namespace.QName (source: SmallRyeOpenApiProcessor > org.lfenergy.compas.cim.mapping.rest.v1.model.MapResponse) Consider adding them to the index either by creating a Jandex index for your dependency via the Maven plugin, an empty META-INF/beans.xml or quarkus.index-dependency properties. ``` Signed-off-by: Aurélien Pupier --- .../rest/CompasCimMappingConfiguration.java | 2 +- .../rest/monitoring/LivenessHealthCheck.java | 2 +- .../rest/monitoring/ReadinessHealthCheck.java | 2 +- .../rest/v1/CompasCimMappingResource.java | 16 ++++++++-------- .../cim/mapping/rest/v1/model/MapRequest.java | 10 +++++----- .../cim/mapping/rest/v1/model/MapResponse.java | 8 ++++---- .../cim/mapping/rest/v1/model/package-info.java | 4 ++-- app/src/main/resources/application.properties | 4 ++-- pom.xml | 6 +++--- service/pom.xml | 6 +++--- .../compas/cim/mapping/cgmes/CgmesCimReader.java | 2 +- .../mapping/constraint/CimDataNamePattern.java | 4 ++-- .../impl/CimDataNamePatternValidator.java | 4 ++-- .../compas/cim/mapping/model/CimData.java | 10 +++++----- .../mapping/service/CompasCimMappingService.java | 4 ++-- .../impl/CimDataNamePatternValidatorTest.java | 4 ++-- 16 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/CompasCimMappingConfiguration.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/CompasCimMappingConfiguration.java index ee91d30d..503fc05f 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/CompasCimMappingConfiguration.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/CompasCimMappingConfiguration.java @@ -6,7 +6,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import org.lfenergy.compas.cim.mapping.mapper.CimToSclMapper; -import javax.enterprise.inject.Produces; +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/cim/mapping/rest/monitoring/LivenessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/monitoring/LivenessHealthCheck.java index e4aa8cdf..e1638efe 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/monitoring/LivenessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/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/cim/mapping/rest/monitoring/ReadinessHealthCheck.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/monitoring/ReadinessHealthCheck.java index 1c7d3ce4..4f9e59a3 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/monitoring/ReadinessHealthCheck.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/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/cim/mapping/rest/v1/CompasCimMappingResource.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/CompasCimMappingResource.java index c6cc4ed7..51f0bf3c 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/CompasCimMappingResource.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/CompasCimMappingResource.java @@ -12,14 +12,14 @@ import org.lfenergy.compas.cim.mapping.rest.v1.model.MapResponse; import org.lfenergy.compas.cim.mapping.service.CompasCimMappingService; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Authenticated @RequestScoped diff --git a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapRequest.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapRequest.java index 82a45856..11bd4e8b 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapRequest.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapRequest.java @@ -7,11 +7,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.cim.mapping.model.CimData; -import javax.validation.Valid; -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.Valid; +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.cim.mapping.CimMappingConstants.CIM_MAPPING_SERVICE_V1_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapResponse.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapResponse.java index cf3c3f7b..6a55be93 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapResponse.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/MapResponse.java @@ -6,10 +6,10 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.scl2007b4.model.SCL; -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.cim.mapping.CimMappingConstants.CIM_MAPPING_SERVICE_V1_NS_URI; import static org.lfenergy.compas.cim.mapping.CimMappingConstants.SCL_NS_URI; diff --git a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/package-info.java b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/package-info.java index 089be6d6..f4f69adc 100644 --- a/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/package-info.java +++ b/app/src/main/java/org/lfenergy/compas/cim/mapping/rest/v1/model/package-info.java @@ -8,7 +8,7 @@ ) package org.lfenergy.compas.cim.mapping.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.cim.mapping.CimMappingConstants.CIM_MAPPING_SERVICE_V1_NS_URI; diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index b9c8ce52..0f3344ac 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -18,8 +18,8 @@ quarkus.index-dependency.rest-commons.artifact-id = rest-commons quarkus.index-dependency.scl2007b4.group-id = org.lfenergy.compas.core quarkus.index-dependency.scl2007b4.artifact-id = scl2007b4 -quarkus.index-dependency.jaxb-api.group-id = org.jboss.spec.javax.xml.bind -quarkus.index-dependency.jaxb-api.artifact-id = jboss-jaxb-api_2.3_spec +quarkus.index-dependency.jaxb-api.group-id = jakarta.xml.bind +quarkus.index-dependency.jaxb-api.artifact-id = jakarta.xml.bind-api # Settings needed for native compilation of the project. quarkus.native.resources.includes=**/com.powsybl.triplestore.api.TripleStoreFactoryService,CIM*.sparql diff --git a/pom.xml b/pom.xml index 913ca084..20489544 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ SPDX-License-Identifier: Apache-2.0 0.11.0 - 2.16.6.Final + 3.0.4.Final 3.1 5.1.1 2.20.0 @@ -57,8 +57,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/pom.xml b/service/pom.xml index d8c5ffae..d0d6a848 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -88,9 +88,9 @@ SPDX-License-Identifier: Apache-2.0 hibernate-validator test - - org.glassfish - jakarta.el + + org.glassfish.expressly + expressly test diff --git a/service/src/main/java/org/lfenergy/compas/cim/mapping/cgmes/CgmesCimReader.java b/service/src/main/java/org/lfenergy/compas/cim/mapping/cgmes/CgmesCimReader.java index 2299ffa7..836e49e5 100644 --- a/service/src/main/java/org/lfenergy/compas/cim/mapping/cgmes/CgmesCimReader.java +++ b/service/src/main/java/org/lfenergy/compas/cim/mapping/cgmes/CgmesCimReader.java @@ -13,7 +13,7 @@ import org.lfenergy.compas.cim.mapping.exception.CompasCimMappingException; import org.lfenergy.compas.cim.mapping.model.CimData; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.io.InputStream; import java.io.StringReader; import java.nio.charset.StandardCharsets; diff --git a/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/CimDataNamePattern.java b/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/CimDataNamePattern.java index fcb2857a..828c470b 100644 --- a/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/CimDataNamePattern.java +++ b/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/CimDataNamePattern.java @@ -5,8 +5,8 @@ import org.lfenergy.compas.cim.mapping.constraint.impl.CimDataNamePatternValidator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidator.java b/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidator.java index 7954c37b..a812ae42 100644 --- a/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidator.java +++ b/service/src/main/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidator.java @@ -6,8 +6,8 @@ import com.powsybl.cgmes.model.CgmesSubset; import org.lfenergy.compas.cim.mapping.constraint.CimDataNamePattern; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.Arrays; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/service/src/main/java/org/lfenergy/compas/cim/mapping/model/CimData.java b/service/src/main/java/org/lfenergy/compas/cim/mapping/model/CimData.java index a9153af3..ac739fc8 100644 --- a/service/src/main/java/org/lfenergy/compas/cim/mapping/model/CimData.java +++ b/service/src/main/java/org/lfenergy/compas/cim/mapping/model/CimData.java @@ -6,11 +6,11 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.lfenergy.compas.cim.mapping.constraint.CimDataNamePattern; -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.XmlType; +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.XmlType; import static org.lfenergy.compas.cim.mapping.CimMappingConstants.CIM_MAPPING_SERVICE_V1_NS_URI; diff --git a/service/src/main/java/org/lfenergy/compas/cim/mapping/service/CompasCimMappingService.java b/service/src/main/java/org/lfenergy/compas/cim/mapping/service/CompasCimMappingService.java index ba38f389..0596dd7a 100644 --- a/service/src/main/java/org/lfenergy/compas/cim/mapping/service/CompasCimMappingService.java +++ b/service/src/main/java/org/lfenergy/compas/cim/mapping/service/CompasCimMappingService.java @@ -12,8 +12,8 @@ import org.lfenergy.compas.scl2007b4.model.THeader; import org.lfenergy.compas.scl2007b4.model.THitem; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; diff --git a/service/src/test/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidatorTest.java b/service/src/test/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidatorTest.java index 723cc4bc..23349522 100644 --- a/service/src/test/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidatorTest.java +++ b/service/src/test/java/org/lfenergy/compas/cim/mapping/constraint/impl/CimDataNamePatternValidatorTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; import org.lfenergy.compas.cim.mapping.constraint.CimDataNamePattern; -import javax.validation.Validation; -import javax.validation.Validator; +import jakarta.validation.Validation; +import jakarta.validation.Validator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue;