diff options
author | 2023-08-10 16:58:48 +0100 | |
---|---|---|
committer | 2023-08-14 10:01:07 +0100 | |
commit | c1794ff92134dab997a11b608d2fc5073a7c8b94 (patch) | |
tree | 4e2526d55b41c9b991011392bab807d8bd890f4b /services/services-engine | |
parent | 48a6922f4ce17846ee9f6cd74253ed6be740a29b (diff) |
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 <saul.gill@est.tech>
Diffstat (limited to 'services/services-engine')
3 files changed, 7 insertions, 5 deletions
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml index ca9d6a2fd..d2649883d 100644 --- a/services/services-engine/pom.xml +++ b/services/services-engine/pom.xml @@ -1,7 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2018 Ericsson. All rights reserved. - Copyright (C) 2019-2020,2022 Nordix Foundation. + Copyright (C) 2019-2020,2022-2023 Nordix Foundation. Modifications Copyright (C) 2021 Bell Canada Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -45,6 +45,7 @@ <dependency> <groupId>io.prometheus</groupId> <artifactId>simpleclient</artifactId> + <version>${version.prometheus.client}</version> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> 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; |