From 9f9ad5548aa7c735910b5b8d013d48a281fc4ed0 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Sat, 19 Jun 2021 21:18:24 -0400
Subject: Updating parent version to 2.1.7

Issue-ID: CCSDK-3345
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I8595cde511f33aba85f1936c4675e6a6c5fffdfd
---
 a1-adapter/a1-adapter-api/feature/pom.xml         |  2 +-
 a1-adapter/a1-adapter-api/installer/pom.xml       |  2 +-
 a1-adapter/a1-adapter-api/model/pom.xml           |  2 +-
 a1-adapter/a1-adapter-api/pom.xml                 |  2 +-
 a1-adapter/a1-adapter-api/provider/pom.xml        |  2 +-
 a1-adapter/features/a1-adapter-northbound/pom.xml |  2 +-
 a1-adapter/features/installer/pom.xml             |  2 +-
 a1-adapter/features/pom.xml                       |  2 +-
 a1-adapter/pom.xml                                |  2 +-
 a1-policy-management/pom.xml                      | 72 +++++++++--------------
 pom.xml                                           |  4 +-
 11 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/a1-adapter/a1-adapter-api/feature/pom.xml b/a1-adapter/a1-adapter-api/feature/pom.xml
index 58276f7f..a5cec377 100644
--- a/a1-adapter/a1-adapter-api/feature/pom.xml
+++ b/a1-adapter/a1-adapter-api/feature/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/a1-adapter-api/installer/pom.xml b/a1-adapter/a1-adapter-api/installer/pom.xml
index 3614d785..e9024ee6 100644
--- a/a1-adapter/a1-adapter-api/installer/pom.xml
+++ b/a1-adapter/a1-adapter-api/installer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/a1-adapter-api/model/pom.xml b/a1-adapter/a1-adapter-api/model/pom.xml
index 2a2e233e..7bea1955 100644
--- a/a1-adapter/a1-adapter-api/model/pom.xml
+++ b/a1-adapter/a1-adapter-api/model/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/a1-adapter-api/pom.xml b/a1-adapter/a1-adapter-api/pom.xml
index 23e825f0..6702fd75 100644
--- a/a1-adapter/a1-adapter-api/pom.xml
+++ b/a1-adapter/a1-adapter-api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/a1-adapter-api/provider/pom.xml b/a1-adapter/a1-adapter-api/provider/pom.xml
index 017cafeb..c4d8c19e 100644
--- a/a1-adapter/a1-adapter-api/provider/pom.xml
+++ b/a1-adapter/a1-adapter-api/provider/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/features/a1-adapter-northbound/pom.xml b/a1-adapter/features/a1-adapter-northbound/pom.xml
index d4d274bc..1202197c 100644
--- a/a1-adapter/features/a1-adapter-northbound/pom.xml
+++ b/a1-adapter/features/a1-adapter-northbound/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/features/installer/pom.xml b/a1-adapter/features/installer/pom.xml
index 09a38477..047097e2 100644
--- a/a1-adapter/features/installer/pom.xml
+++ b/a1-adapter/features/installer/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/features/pom.xml b/a1-adapter/features/pom.xml
index bebe8784..35fce5a6 100644
--- a/a1-adapter/features/pom.xml
+++ b/a1-adapter/features/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-adapter/pom.xml b/a1-adapter/pom.xml
index 5436b602..7b65c223 100644
--- a/a1-adapter/pom.xml
+++ b/a1-adapter/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
diff --git a/a1-policy-management/pom.xml b/a1-policy-management/pom.xml
index 6a3c51e8..09d37320 100644
--- a/a1-policy-management/pom.xml
+++ b/a1-policy-management/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
     <groupId>org.onap.ccsdk.oran</groupId>
@@ -42,7 +42,6 @@
         <formatter-maven-plugin.version>2.13.0</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>2.5.0</spotless-maven-plugin.version>
         <commons-io.version>2.5</commons-io.version>
-        <docker-maven-plugin>0.30.0</docker-maven-plugin>
         <surefire-maven-plugin.version>3.0.0-M5</surefire-maven-plugin.version>
         <!-- Version must be higher than version 2.19.1 that is defined in the parent pom for JUnit 5 tests to be run. Do not remove! -->
         <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
@@ -366,48 +365,26 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>${docker-maven-plugin}</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>generate-policy-management-service-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.34.0</version>
+                        <inherited>false</inherited>
                         <configuration>
                             <images>
                                 <image>
                                     <name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <contextDir>${basedir}</contextDir>
-                                        <dockerFile>Dockerfile</dockerFile>
-                                        <args>
-                                            <JAR>${project.build.finalName}.jar</JAR>
-                                        </args>
-                                        <tags>
-                                            <tag>${project.version}</tag>
-                                        </tags>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>push-policy-management-service-image</id>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>onap/ccsdk-oran-a1policymanagementservice:${project.version}</name>
-                                    <build>
+                                        <noCache>true</noCache>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <args>
@@ -422,9 +399,18 @@
                                 </image>
                             </images>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+                        <executions>
+                            <execution>
+                                <id>build-push-image</id>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index c283961b..564fc247 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.7</version>
         <relativePath/>
     </parent>
 
@@ -51,7 +51,7 @@
                 <groupId>org.sonarsource.scanner.maven</groupId>
                 <artifactId>sonar-maven-plugin</artifactId>
                 <version>${sonar-maven-plugin.version}</version>
-            </plugin>           
+            </plugin>
         </plugins>
     </build>
 </project>
-- 
cgit 1.2.3-korg