Commit aac9ba94 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/122-ubi-upgrade-policy-quarkus-to-v-3
parents 91b1dd8f 8a8d4e30

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

+1 −1
Original line number Diff line number Diff line 
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

+3 −2
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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;