Effort to reduce image layer and size

Removing few ENV version variable and those should be read
from pom properties (maven-resource-plugin filtering true)

Combined Dockerfile and Standalone.Dockerfile

Adding Docker build arg AAF which will decide whether to add
aaa-app-config.xml in docker image or not for standalone

Updated docker-maven-plugin to 0.34.0 to have noCache true

Removing start-it-container execution as it's being tested by CSIT

Replacing maven-exec-plugin with maven-antrun-plugin

Updating latest base docker images versions

Updating parent version to 2.1.7

Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602

Former-commit-id: 866ddebbcac80c38c79c46bb37373123a0c678f0

10 files changed, 2 insertions, 22 deletions

diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index 93d28603..3544e6c5 100644
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-datachange</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index b8097159..73cd9508 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-generic-resource-api</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 0e5cba45..c2dafbc4 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-installer</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index 5ab6d291..74f9c522 100644
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-lcm</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml
index 54dd2870..d87f9f34 100644
--- a/platform-logic/optical-service/pom.xml
+++ b/platform-logic/optical-service/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-optical-service</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 91db7f65..1cfdef97 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic</name>
@@ -23,8 +21,8 @@
         <module>setup</module>
         <module>generic-resource-api</module>
         <module>vnfapi</module>
-    <module>lcm</module>
-    <module>optical-service</module>
+        <module>lcm</module>
+        <module>optical-service</module>
         <module>restapi-templates</module>
         <module>restconfapi-yang</module>
         <module>datachange</module>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 79139f9d..e04dbf8b 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restapi-templates</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index e1775cb7..7045c8f4 100644
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-restconfapi-yang</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index 58416b7c..b68c5257 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-setup</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index aad90bc9..ebbd905e 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -8,9 +8,7 @@
         <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>platform-logic-vnfapi</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>