From c1794ff92134dab997a11b608d2fc5073a7c8b94 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Thu, 10 Aug 2023 16:58:48 +0100 Subject: Java 17 Upgrade Updated dependencies to latest versions Made Java 17 changes Moved all version numbers to main apex pom Issue-ID: POLICY-4675 Change-Id: Ia0c17f17ef1e536bbfddd5f488ed9510a557842f Signed-off-by: saul.gill --- .../carriertechnology/RestPluginCarrierTechnologyParameters.java | 6 +++--- .../service/parameters/engineservice/EngineServiceParameters.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'services/services-engine/src/main') diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java index 66f253b56..35ae20def 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/carriertechnology/RestPluginCarrierTechnologyParameters.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2021 Nordix Foundation. + * Modifications Copyright (C) 2019-2021, 2023 Nordix Foundation. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,6 +22,8 @@ package org.onap.policy.apex.service.parameters.carriertechnology; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -29,8 +31,6 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java index d33ae1697..64cc7ba00 100644 --- a/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java +++ b/services/services-engine/src/main/java/org/onap/policy/apex/service/parameters/engineservice/EngineServiceParameters.java @@ -3,6 +3,7 @@ * Copyright (C) 2016-2018 Ericsson. All rights reserved. * Modifications Copyright (C) 2020 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 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,7 +23,7 @@ package org.onap.policy.apex.service.parameters.engineservice; -import javax.validation.Valid; +import jakarta.validation.Valid; import lombok.Getter; import lombok.Setter; import org.onap.policy.apex.core.engine.EngineParameters; -- cgit 1.2.3-korg