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

Issue-ID: POLICY-4482
Change-Id: Ib61e0f3349d2741d990311fe661957500f8b7343
Signed-off-by: liamfallon <liam.fallon@est.tech>
---
 main/pom.xml                       | 14 ++++++--------
 packages/policy-api-docker/pom.xml |  6 +-----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index aed73eaa..fe7c6c59 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -4,7 +4,7 @@
    Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
    Copyright (C) 2019,2021 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020-2022 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.
@@ -21,20 +21,20 @@
   SPDX-License-Identifier: Apache-2.0
   ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project
+        xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                            http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.api</groupId>
         <artifactId>policy-api</artifactId>
         <version>2.8.1-SNAPSHOT</version>
     </parent>
-
     <artifactId>api-main</artifactId>
-
     <name>${project.artifactId}</name>
     <description>The main module of Policy Api that handles startup, lifecycle management, and parameters.</description>
-
     <dependencies>
         <dependency>
             <groupId>org.onap.policy.models</groupId>
@@ -109,7 +109,6 @@
             <scope>runtime</scope>
         </dependency>
     </dependencies>
-
     <build>
         <resources>
             <!-- Output the version of the api service -->
@@ -132,7 +131,6 @@
             <plugin>
                 <groupId>io.swagger.codegen.v3</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>${version.swagger.codegen.v3}</version>
                 <executions>
                     <execution>
                         <id>code-gen</id>
diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index 4a9db746..169cc419 100644
--- a/packages/policy-api-docker/pom.xml
+++ b/packages/policy-api-docker/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2019,2021 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020-2022 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.
@@ -53,7 +53,6 @@
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -145,9 +144,6 @@
                             <goal>build</goal>
                             <goal>push</goal>
                         </goals>
-                        <configuration>
-                            <image>onap/policy-api</image>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-- 
cgit 1.2.3-korg