Merge branch 'feat/123-ubi-upgrade-ztp-quarkus-to-v-3' into 'develop'

Resolve "(UBI) Upgrade ZTP Quarkus to v.3"

Closes #123

See merge request !209

src/ztp/.mvn/wrapper/maven-wrapper.properties

-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

src/ztp/pom.xml

@@ -57,8 +57,9 @@
     <spotless-plugin.version>2.10.3</spotless-plugin.version>
     <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
     <quarkus-maven-plugin.version>${quarkus.platform.version}</quarkus-maven-plugin.version>
+    <quarkus-bootstrap-maven-version>2.16.12.Final</quarkus-bootstrap-maven-version>
     <!-- Third-party Dependencies -->
-    <quarkus.platform.version>2.2.2.Final</quarkus.platform.version>
+    <quarkus.platform.version>3.1.3.Final</quarkus.platform.version>
   </properties>
 
   <distributionManagement>
@@ -272,7 +273,7 @@
         <plugin>
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
-          <version>${quarkus-maven-plugin.version}</version>
+          <version>${quarkus-bootstrap-maven-version}</version>
         </plugin>
 
         <plugin>

src/ztp/src/main/java/org/etsi/tfs/ztp/ContextSubscriber.java

@@ -17,10 +17,10 @@
 package org.etsi.tfs.ztp;
 
 import io.quarkus.runtime.StartupEvent;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 import java.time.Duration;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
 import org.etsi.tfs.ztp.context.ContextService;
 import org.etsi.tfs.ztp.context.model.Event;
 import org.etsi.tfs.ztp.context.model.EventTypeEnum;

src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java

@@ -25,8 +25,8 @@ import context.ContextOuterClass.DeviceId;
 import context.ContextOuterClass.DeviceOperationalStatusEnum;
 import context.ContextOuterClass.Location.LocationCase;
 import context.ContextOuterClass.Uuid;
+import jakarta.inject.Singleton;
 import java.util.stream.Collectors;
-import javax.inject.Singleton;
 import kpi_sample_types.KpiSampleTypes;
 import org.etsi.tfs.ztp.acl.AclAction;
 import org.etsi.tfs.ztp.acl.AclEntry;

src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleLivenessCheck.java

@@ -16,7 +16,7 @@
 
 package org.etsi.tfs.ztp;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Liveness;

src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleReadinessCheck.java

@@ -16,7 +16,7 @@
 
 package org.etsi.tfs.ztp;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 import org.eclipse.microprofile.health.HealthCheck;
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.Readiness;

src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGatewayImpl.java

@@ -19,7 +19,7 @@ package org.etsi.tfs.ztp;
 import context.ContextOuterClass;
 import io.quarkus.grpc.GrpcService;
 import io.smallrye.mutiny.Uni;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.eclipse.microprofile.metrics.MetricUnits;
 import org.eclipse.microprofile.metrics.annotation.Counted;
 import org.eclipse.microprofile.metrics.annotation.Timed;

src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpServiceImpl.java

@@ -17,8 +17,8 @@
 package org.etsi.tfs.ztp;
 
 import io.smallrye.mutiny.Uni;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.etsi.tfs.ztp.context.ContextService;
 import org.etsi.tfs.ztp.context.model.Device;
 import org.etsi.tfs.ztp.context.model.DeviceConfig;

src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGatewayImpl.java

@@ -21,8 +21,8 @@ import context.MutinyContextServiceGrpc.MutinyContextServiceStub;
 import io.quarkus.grpc.GrpcClient;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.etsi.tfs.ztp.Serializer;
 import org.etsi.tfs.ztp.context.model.Device;
 import org.etsi.tfs.ztp.context.model.DeviceEvent;

src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextServiceImpl.java

@@ -18,8 +18,8 @@ package org.etsi.tfs.ztp.context;
 
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.etsi.tfs.ztp.context.model.Device;
 import org.etsi.tfs.ztp.context.model.DeviceEvent;
 

src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGatewayImpl.java

@@ -19,8 +19,8 @@ package org.etsi.tfs.ztp.device;
 import device.DeviceService;
 import io.quarkus.grpc.GrpcClient;
 import io.smallrye.mutiny.Uni;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.etsi.tfs.ztp.Serializer;
 import org.etsi.tfs.ztp.context.model.Device;
 import org.etsi.tfs.ztp.context.model.DeviceConfig;

src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceServiceImpl.java

@@ -17,8 +17,8 @@
 package org.etsi.tfs.ztp.device;
 
 import io.smallrye.mutiny.Uni;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.etsi.tfs.ztp.context.model.Device;
 import org.etsi.tfs.ztp.context.model.DeviceConfig;
 import org.etsi.tfs.ztp.context.model.Empty;

src/ztp/src/test/java/org/etsi/tfs/ztp/ContextSubscriberTest.java

@@ -24,8 +24,8 @@ import io.quarkus.runtime.StartupEvent;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
 import io.smallrye.mutiny.Multi;
+import jakarta.inject.Inject;
 import java.util.UUID;
-import javax.inject.Inject;
 import org.etsi.tfs.ztp.context.ContextGateway;
 import org.etsi.tfs.ztp.context.model.DeviceEvent;
 import org.etsi.tfs.ztp.context.model.Event;

src/ztp/src/test/java/org/etsi/tfs/ztp/MockZtpConfiguration.java

@@ -17,9 +17,9 @@
 package org.etsi.tfs.ztp;
 
 import io.smallrye.config.SmallRyeConfig;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Produces;
 import org.eclipse.microprofile.config.Config;
 
 public class MockZtpConfiguration {

src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java

@@ -25,10 +25,10 @@ import context.ContextOuterClass.DeviceId;
 import context.ContextOuterClass.DeviceOperationalStatusEnum;
 import context.ContextOuterClass.Uuid;
 import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
 import kpi_sample_types.KpiSampleTypes;
 import org.etsi.tfs.ztp.acl.AclAction;
 import org.etsi.tfs.ztp.acl.AclEntry;

src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpFunctionalServiceTest.java

@@ -22,10 +22,10 @@ import context.ContextOuterClass;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
 import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.inject.Inject;
 import org.assertj.core.api.Assertions;
 import org.etsi.tfs.ztp.context.ContextGateway;
 import org.etsi.tfs.ztp.context.model.ConfigActionEnum;

src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpServiceTest.java

@@ -23,12 +23,12 @@ import io.quarkus.grpc.GrpcClient;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
 import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
 import org.etsi.tfs.ztp.context.ContextGateway;
 import org.etsi.tfs.ztp.context.model.ConfigActionEnum;
 import org.etsi.tfs.ztp.context.model.ConfigRule;

src/ztp/target/generated-sources/grpc/context/ContextService.java

 package context;
 
-import io.quarkus.grpc.runtime.MutinyService;
+import io.quarkus.grpc.MutinyService;
 
-@javax.annotation.Generated(
-value = "by Mutiny Grpc generator",
-comments = "Source: context.proto")
+@jakarta.annotation.Generated(value = "by Mutiny Grpc generator", comments = "Source: context.proto")
 public interface ContextService extends MutinyService {
 
-    
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ContextIdList> listContextIds(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ContextList> listContexts(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Context> getContext(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ContextId> setContext(context.ContextOuterClass.Context request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeContext(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyIdList> listTopologyIds(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyList> listTopologies(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Topology> getTopology(context.ContextOuterClass.TopologyId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyDetails> getTopologyDetails(context.ContextOuterClass.TopologyId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.TopologyId> setTopology(context.ContextOuterClass.Topology request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeTopology(context.ContextOuterClass.TopologyId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.DeviceIdList> listDeviceIds(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.DeviceList> listDevices(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Device> getDevice(context.ContextOuterClass.DeviceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.DeviceId> setDevice(context.ContextOuterClass.Device request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeDevice(context.ContextOuterClass.DeviceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.DeviceList> selectDevice(context.ContextOuterClass.DeviceFilter request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.EndPointNameList> listEndPointNames(context.ContextOuterClass.EndPointIdList request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkIdList> listLinkIds(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkList> listLinks(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Link> getLink(context.ContextOuterClass.LinkId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.LinkId> setLink(context.ContextOuterClass.Link request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeLink(context.ContextOuterClass.LinkId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ServiceIdList> listServiceIds(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ServiceList> listServices(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Service> getService(context.ContextOuterClass.ServiceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ServiceId> setService(context.ContextOuterClass.Service request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ServiceId> unsetService(context.ContextOuterClass.Service request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeService(context.ContextOuterClass.ServiceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ServiceList> selectService(context.ContextOuterClass.ServiceFilter request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.SliceIdList> listSliceIds(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.SliceList> listSlices(context.ContextOuterClass.ContextId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Slice> getSlice(context.ContextOuterClass.SliceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.SliceId> setSlice(context.ContextOuterClass.Slice request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.SliceId> unsetSlice(context.ContextOuterClass.Slice request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeSlice(context.ContextOuterClass.SliceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.SliceList> selectSlice(context.ContextOuterClass.SliceFilter request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ConnectionIdList> listConnectionIds(context.ContextOuterClass.ServiceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ConnectionList> listConnections(context.ContextOuterClass.ServiceId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Connection> getConnection(context.ContextOuterClass.ConnectionId request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.ConnectionId> setConnection(context.ContextOuterClass.Connection request);
-    
+
     io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> removeConnection(context.ContextOuterClass.ConnectionId request);
-    
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.ContextEvent> getContextEvents(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.TopologyEvent> getTopologyEvents(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.DeviceEvent> getDeviceEvents(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.LinkEvent> getLinkEvents(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.ServiceEvent> getServiceEvents(context.ContextOuterClass.Empty request);
-    
+
     io.smallrye.mutiny.Multi<context.ContextOuterClass.SliceEvent> getSliceEvents(context.ContextOuterClass.Empty request);
-    
-    io.smallrye.mutiny.Multi<context.ContextOuterClass.ConnectionEvent> getConnectionEvents(context.ContextOuterClass.Empty request);
-    
-    
 
-}
\ No newline at end of file
+    io.smallrye.mutiny.Multi<context.ContextOuterClass.ConnectionEvent> getConnectionEvents(context.ContextOuterClass.Empty request);
+}