Commit 1b43b52f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/122-ubi-upgrade-policy-quarkus-to-v-3' into 'develop' 

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

Closes #122

See merge request !208
parents 8a8d4e30 aac9ba94

src/policy/.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/policy/pom.xml

+11 −3
Original line number Diff line number Diff line
@@ -56,9 +56,10 @@ 
        <sonarsource-scanner-plugin.version>3.8.0.2131</sonarsource-scanner-plugin.version>

        <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-maven-plugin.version>3.1.3.Final</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>
@@ -151,6 +152,13 @@ 
            <artifactId>quarkus-config-yaml</artifactId>

        </dependency>



        <dependency>

            <groupId>org.projectlombok</groupId>

            <artifactId>lombok</artifactId>

            <version>1.18.30</version>

            <scope>provided</scope>

        </dependency>



        <!-- Testing -->

        <dependency>

            <groupId>org.assertj</groupId>
@@ -277,7 +285,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/policy/src/main/java/org/etsi/tfs/policy/Serializer.java

+16 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import context.ContextOuterClass.DeviceId; 
import context.ContextOuterClass.DeviceOperationalStatusEnum;

import context.ContextOuterClass.Location.LocationCase;

import context.ContextOuterClass.Uuid;

import jakarta.inject.Singleton;

import java.util.ArrayList;

import java.util.List;

import java.util.stream.Collectors;

import javax.inject.Singleton;

import kpi_sample_types.KpiSampleTypes;

import monitoring.Monitoring;

import monitoring.Monitoring.AlarmID;
@@ -85,7 +85,6 @@ import org.etsi.tfs.policy.context.model.ServiceTypeEnum; 
import org.etsi.tfs.policy.context.model.SliceId;

import org.etsi.tfs.policy.context.model.TopologyId;

import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType;

import org.etsi.tfs.policy.model.*;

import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor;

import org.etsi.tfs.policy.monitoring.model.AlarmResponse;

import org.etsi.tfs.policy.monitoring.model.AlarmSubscription;
@@ -101,6 +100,21 @@ import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; 
import org.etsi.tfs.policy.monitoring.model.StringKpiValue;

import org.etsi.tfs.policy.monitoring.model.SubsDescriptor;

import org.etsi.tfs.policy.monitoring.model.SubsResponse;

import org.etsi.tfs.policy.policy.model.*;

import org.etsi.tfs.policy.policy.model.BooleanOperator;

import org.etsi.tfs.policy.policy.model.NumericalOperator;

import org.etsi.tfs.policy.policy.model.PolicyRule;

import org.etsi.tfs.policy.policy.model.PolicyRuleAction;

import org.etsi.tfs.policy.policy.model.PolicyRuleActionConfig;

import org.etsi.tfs.policy.policy.model.PolicyRuleActionEnum;

import org.etsi.tfs.policy.policy.model.PolicyRuleBasic;

import org.etsi.tfs.policy.policy.model.PolicyRuleCondition;

import org.etsi.tfs.policy.policy.model.PolicyRuleDevice;

import org.etsi.tfs.policy.policy.model.PolicyRuleService;

import org.etsi.tfs.policy.policy.model.PolicyRuleState;

import org.etsi.tfs.policy.policy.model.PolicyRuleStateEnum;

import org.etsi.tfs.policy.policy.model.PolicyRuleTypeDevice;

import org.etsi.tfs.policy.policy.model.PolicyRuleTypeService;

import policy.Policy;

import policy.Policy.PolicyRuleId;

import policy.PolicyAction;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package org.etsi.tfs.policy;



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/policy/src/main/java/org/etsi/tfs/policy/SimpleReadinessCheck.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package org.etsi.tfs.policy;



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;