From 2b51249582274652201fa52fd3934a396ee8708d Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
Date: Fri, 17 Feb 2023 19:17:27 +0000
Subject: Clean up dependencies for London Release

Issue-ID: POLICY-4482
Change-Id: Iaa23f99508a0f17e62fb0a8d7028c4a58254338f
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 controlloop/common/controller-usecases/pom.xml            | 2 +-
 controlloop/common/feature-controlloop-management/pom.xml | 3 +--
 controlloop/common/feature-controlloop-trans/pom.xml      | 3 +--
 controlloop/common/rules-test/pom.xml                     | 4 ----
 controlloop/packages/docker-controlloop/pom.xml           | 3 +--
 pom.xml                                                   | 5 ++---
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/controlloop/common/controller-usecases/pom.xml b/controlloop/common/controller-usecases/pom.xml
index 29334f6da..fc00a5088 100644
--- a/controlloop/common/controller-usecases/pom.xml
+++ b/controlloop/common/controller-usecases/pom.xml
@@ -4,6 +4,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2020-2022 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.
@@ -212,7 +213,6 @@
                         <plugin>
                             <groupId>org.eclipse.m2e</groupId>
                             <artifactId>lifecycle-mapping</artifactId>
-                            <version>1.0.0</version>
                             <configuration>
                                 <lifecycleMappingMetadata>
                                     <pluginExecutions>
diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index 9d7d22e3f..e06f21231 100644
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -3,7 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2019 Nordix Foundation.
+  Modifications Copyright (C) 2019,2023 Nordix Foundation.
   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -95,7 +95,6 @@
             <plugin>
                 <groupId>io.swagger.codegen.v3</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>3.0.36</version>
                 <executions>
                     <execution>
                         <id>code-gen</id>
diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml
index 6346ec197..b52f1f90f 100644
--- a/controlloop/common/feature-controlloop-trans/pom.xml
+++ b/controlloop/common/feature-controlloop-trans/pom.xml
@@ -3,7 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
-  Modifications Copyright (C) 2019 Nordix Foundation.
+  Modifications Copyright (C) 2019,2023 Nordix Foundation.
   Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,7 +84,6 @@
             <plugin>
                 <groupId>io.swagger.codegen.v3</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>3.0.36</version>
                 <executions>
                     <execution>
                         <id>code-gen</id>
diff --git a/controlloop/common/rules-test/pom.xml b/controlloop/common/rules-test/pom.xml
index fbf7f93d8..5252993e9 100644
--- a/controlloop/common/rules-test/pom.xml
+++ b/controlloop/common/rules-test/pom.xml
@@ -33,10 +33,6 @@
     <description>Common Utilities to facilitate testing via JUnit</description>
     <packaging>jar</packaging>
 
-    <properties>
-        <powermock.version>2.0.4</powermock.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml
index 304ccbcc6..acd2b9251 100644
--- a/controlloop/packages/docker-controlloop/pom.xml
+++ b/controlloop/packages/docker-controlloop/pom.xml
@@ -4,7 +4,7 @@
   ================================================================================
   Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019-2020 Bell Canada.
-  Modifications Copyright (C) 2022 Nordix Foundation.
+  Modifications 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.
@@ -52,7 +52,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
diff --git a/pom.xml b/pom.xml
index b674d5ac7..f4f281101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,12 +137,11 @@
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>
+
         <!-- Swagger v3 annotations -->
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-        <artifactId>swagger-annotations</artifactId>
-        <version>2.2.7</version>
+            <artifactId>swagger-annotations</artifactId>
         </dependency>
     </dependencies>
-
 </project>
-- 
cgit 1.2.3-korg