From a3a032d5b902c3e125dccd2bc2b41f22861decc1 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 10 Aug 2023 16:58:48 +0100 Subject: Java 17 Upgrade Updated dependencies to latest versions Made Java 17 changes Moved apex dependencies versions to main apex pom Issue-ID: POLICY-4675 Change-Id: Ia5cd5670a1f024f5402cbd7371162ce3313930ef Signed-off-by: adheli.tavares --- examples/examples-aadm/pom.xml | 2 +- examples/examples-acm/pom.xml | 191 +++++++------ .../examples/acm/AcmTestRestDmaapEndpoint.java | 14 +- .../apex/examples/acm/TestApexAcmExample.java | 4 +- examples/examples-adaptive/pom.xml | 2 +- examples/examples-decisionmaker/pom.xml | 2 +- examples/examples-grpc/pom.xml | 317 +++++++++++---------- .../examples/grpc/GrpcTestRestSimEndpoint.java | 12 +- .../apex/examples/grpc/TestApexGrpcExample.java | 8 +- examples/examples-myfirstpolicy/pom.xml | 2 +- examples/examples-onap-bbs/pom.xml | 23 +- .../policy/apex/examples/bbs/WebClientTest.java | 3 +- examples/examples-onap-vcpe/pom.xml | 2 +- .../domains/onap/vcpe/OnapVCpeSimEndpoint.java | 14 +- examples/examples-periodic/pom.xml | 2 +- examples/examples-servlet/pom.xml | 8 +- .../apex/examples/servlet/ApexServletListener.java | 7 +- examples/pom.xml | 2 +- 18 files changed, 323 insertions(+), 292 deletions(-) (limited to 'examples') diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml index 1911f229f..37986764c 100644 --- a/examples/examples-aadm/pom.xml +++ b/examples/examples-aadm/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-aadm diff --git a/examples/examples-acm/pom.xml b/examples/examples-acm/pom.xml index 00f674dbe..35680ea16 100644 --- a/examples/examples-acm/pom.xml +++ b/examples/examples-acm/pom.xml @@ -19,97 +19,102 @@ ============LICENSE_END========================================================= --> - 4.0.0 - - org.onap.policy.apex-pdp.examples - examples - 3.0.0-SNAPSHOT - - examples-acm - examples-acm - Specific code for the APEX acm Example - - APEXacElementPolicy - APEXacElementToscaPolicy - - org.onap.nodetypes.policy.MetadataSet - - - - org.onap.policy.apex-pdp.auth - cli-editor - ${project.version} - - - org.onap.policy.apex-pdp.services - services-engine - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema - plugins-context-schema-json - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-javascript - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-restclient - ${project.version} - - - org.onap.policy.models.policy-models-interactions.model-impl - events - ${version.policy.models} - - - org.onap.policy.common - policy-endpoints - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xss1m - - - - org.codehaus.mojo - exec-maven-plugin - - - - generate-tosca-policy - compile - - java - - - org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain - compile - - --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex - --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json - --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log - --apex-config-file=${project.basedir}/src/main/resources/examples/config/apexACM/ApexConfig.json - --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.policy.apex-pdp.examples + examples + 3.0.1-SNAPSHOT + + examples-acm + examples-acm + Specific code for the APEX acm Example + + APEXacElementPolicy + APEXacElementToscaPolicy + + org.onap.nodetypes.policy.MetadataSet + + + + org.onap.policy.apex-pdp.auth + cli-editor + ${project.version} + + + org.onap.policy.apex-pdp.services + services-engine + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-json + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-executor + plugins-executor-javascript + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier + plugins-event-carrier-restclient + ${project.version} + + + org.onap.policy.models.policy-models-interactions.model-impl + events + ${version.policy.models} + + + org.onap.policy.common + policy-endpoints + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xss1m + + + + org.codehaus.mojo + exec-maven-plugin + + + + generate-tosca-policy + compile + + java + + + org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain + compile + + + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + + + --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json + + + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + + + --apex-config-file=${project.basedir}/src/main/resources/examples/config/apexACM/ApexConfig.json + + + --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json + + + + + + + + diff --git a/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java b/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java index a3af9406c..8aed72080 100644 --- a/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java +++ b/examples/examples-acm/src/main/java/org/onap/policy/apex/examples/acm/AcmTestRestDmaapEndpoint.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2022 Nordix Foundation. + * Copyright (C) 2022-2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,14 @@ package org.onap.policy.apex.examples.acm; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; diff --git a/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java b/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java index 5b8cbdfe7..9df25e678 100644 --- a/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java +++ b/examples/examples-acm/src/test/java/org/onap/policy/apex/examples/acm/TestApexAcmExample.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2022 Nordix Foundation. + * Copyright (C) 2022-2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ package org.onap.policy.apex.examples.acm; import static org.awaitility.Awaitility.await; +import jakarta.ws.rs.client.ClientBuilder; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.ClientBuilder; import org.junit.Test; import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain; import org.onap.policy.apex.service.engine.main.ApexMain; diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml index 244d717f4..d22110a66 100644 --- a/examples/examples-adaptive/pom.xml +++ b/examples/examples-adaptive/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-adaptive diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml index d9818b31c..7392a9279 100644 --- a/examples/examples-decisionmaker/pom.xml +++ b/examples/examples-decisionmaker/pom.xml @@ -23,7 +23,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-decisionmaker diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml index 06a91bc67..9a0858c87 100644 --- a/examples/examples-grpc/pom.xml +++ b/examples/examples-grpc/pom.xml @@ -21,151 +21,174 @@ ============LICENSE_END========================================================= --> - 4.0.0 - - org.onap.policy.apex-pdp.examples - examples - 3.0.0-SNAPSHOT - - examples-grpc - examples-grpc - Specific code for the APEX gRPC Example - - APEXgRPCPolicy - APEXgRPCToscaPolicy - - org.onap.nodetypes.policy.MetadataSet - - - - org.onap.policy.apex-pdp.auth - cli-editor - ${project.version} - - - org.onap.policy.apex-pdp.services - services-engine - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema - plugins-context-schema-avro - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema - plugins-context-schema-json - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-executor - plugins-executor-javascript - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-grpc - ${project.version} - - - org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier - plugins-event-carrier-restclient - ${project.version} - - - org.onap.policy.models.policy-models-interactions.model-impl - events - ${version.policy.models} - - - org.onap.policy.models.policy-models-interactions - simulators - ${version.policy.models} - - - org.onap.policy.common - policy-endpoints - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xss1m - - - - org.codehaus.mojo - exec-maven-plugin - - - - generate-policy - compile - - java - - - org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain - compile - - --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex - --output-model-file=${project.build.directory}/classes/${policymodel.name}.json - --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log - --working-dir=${project.basedir} - - - - - - generate-tosca-policy - compile - - java - - - org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain - compile - - --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex - --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json - --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log - --apex-config-file=${project.basedir}/src/main/resources/examples/config/APEXgRPC/ApexConfig.json - --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json - - - - - - generate-tosca-policy-metadataSet - compile - - java - - - org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain - compile - - --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex - --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.metadataSet.json - --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log - --apex-config-file=${project.basedir}/src/main/resources/examples/config/APEXgRPC/ApexConfig.json - --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json - --node-type=${nodeType.name} - --output-node-template-file=${project.build.directory}/classes/${toscapolicy.name}.nodeTemplate.json - - - - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.onap.policy.apex-pdp.examples + examples + 3.0.1-SNAPSHOT + + examples-grpc + examples-grpc + Specific code for the APEX gRPC Example + + APEXgRPCPolicy + APEXgRPCToscaPolicy + + org.onap.nodetypes.policy.MetadataSet + + + + org.onap.policy.apex-pdp.auth + cli-editor + ${project.version} + + + org.onap.policy.apex-pdp.services + services-engine + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-avro + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema + plugins-context-schema-json + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-executor + plugins-executor-javascript + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier + plugins-event-carrier-grpc + ${project.version} + + + org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier + plugins-event-carrier-restclient + ${project.version} + + + org.onap.policy.models.policy-models-interactions.model-impl + events + ${version.policy.models} + + + org.onap.policy.models.policy-models-interactions + simulators + ${version.policy.models} + + + org.onap.policy.common + policy-endpoints + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xss1m + + + + org.codehaus.mojo + exec-maven-plugin + + + + generate-policy + compile + + java + + + org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain + compile + + + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + + + --output-model-file=${project.build.directory}/classes/${policymodel.name}.json + + + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + + --working-dir=${project.basedir} + + + + + + generate-tosca-policy + compile + + java + + + org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain + compile + + + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + + + --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.json + + + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + + + --apex-config-file=${project.basedir}/src/main/resources/examples/config/APEXgRPC/ApexConfig.json + + + --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json + + + + + + + generate-tosca-policy-metadataSet + compile + + java + + + org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain + compile + + + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + + + --output-tosca-file=${project.build.directory}/classes/${toscapolicy.name}.metadataSet.json + + + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + + + --apex-config-file=${project.basedir}/src/main/resources/examples/config/APEXgRPC/ApexConfig.json + + + --tosca-template-file=${project.basedir}/src/main/resources/tosca/ToscaTemplate.json + + --node-type=${nodeType.name} + + --output-node-template-file=${project.build.directory}/classes/${toscapolicy.name}.nodeTemplate.json + + + + + + + + diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java index 17b99c986..3d46e6a80 100644 --- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java +++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/GrpcTestRestSimEndpoint.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2020-2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,14 +20,14 @@ package org.onap.policy.apex.examples.grpc; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; import org.slf4j.ext.XLogger; import org.slf4j.ext.XLoggerFactory; diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java index f5a51a7fe..d3c0c87b3 100644 --- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java +++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. + * Copyright (C) 2020-2023 Nordix Foundation. * Modifications Copyright (C) 2020-2022 Bell Canada. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,12 +24,12 @@ package org.onap.policy.apex.examples.grpc; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.core.Response; import java.nio.file.Files; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; import org.junit.Test; import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain; import org.onap.policy.apex.service.engine.main.ApexMain; diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml index dd7443500..b1cfe9ec6 100644 --- a/examples/examples-myfirstpolicy/pom.xml +++ b/examples/examples-myfirstpolicy/pom.xml @@ -26,7 +26,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-myfirstpolicy diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml index 058833c02..e0ebfe430 100644 --- a/examples/examples-onap-bbs/pom.xml +++ b/examples/examples-onap-bbs/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. Copyright (C) 2019 Huawei. - Modifications Copyright (C) 2019 Nordix Foundation. + Modifications Copyright (C) 2019, 2023 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,12 +20,12 @@ ============LICENSE_END========================================================= --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-onap-bbs @@ -84,11 +84,6 @@ events ${version.policy.models} - - org.mockito - mockito-all - test - @@ -108,9 +103,15 @@ org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain compile - --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex - --output-model-file=${project.build.directory}/classes/${policymodel.name}.json - --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + + --command-file=${project.basedir}/src/main/resources/policy/${policymodel.name}.apex + + + --output-model-file=${project.build.directory}/classes/${policymodel.name}.json + + + --log-file=${project.build.directory}/${policymodel.name}_policygeneration.log + --working-dir=${project.basedir} diff --git a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java index 5fb74a307..1f52e1115 100644 --- a/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java +++ b/examples/examples-onap-bbs/src/test/java/org/onap/policy/apex/examples/bbs/WebClientTest.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 huawei. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2020, 2023 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +// TODO javax libraries used here too. Ok, to keep? Liam's review ignored these. public class WebClientTest { HttpsURLConnection mockedHttpsUrlConnection; diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml index a2633cb41..8b660c0a3 100644 --- a/examples/examples-onap-vcpe/pom.xml +++ b/examples/examples-onap-vcpe/pom.xml @@ -24,7 +24,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-onap-vcpe diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java index a6c85fb0e..3e7962823 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020,2022 Nordix Foundation. + * Modifications Copyright (C) 2019-2020,2022-2023 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +29,12 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; import com.google.gson.JsonParser; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.time.Instant; import java.util.Map; @@ -37,12 +43,6 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; import org.onap.policy.common.gson.InstantAsMillisTypeAdapter; import org.onap.policy.common.utils.resources.TextFileUtils; diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml index 2103cf797..6b11e78ac 100644 --- a/examples/examples-periodic/pom.xml +++ b/examples/examples-periodic/pom.xml @@ -22,7 +22,7 @@ org.onap.policy.apex-pdp.examples examples - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT examples-periodic diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml index 37377da7b..be92f6eb1 100644 --- a/examples/examples-servlet/pom.xml +++ b/examples/examples-servlet/pom.xml @@ -1,7 +1,7 @@