From 55378e7480442b8cee46d215a85e194c56b38f36 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 7 Jun 2021 20:02:32 +0000
Subject: 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
---
 SdncReports/SdncReportsApi/pom.xml                           |  4 +---
 .../SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp   | 12 ++++++------
 SdncReports/SdncReportsDao/pom.xml                           |  4 +---
 SdncReports/pom.xml                                          |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'SdncReports')

diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml
index d7922b22..b4641af8 100644
--- a/SdncReports/SdncReportsApi/pom.xml
+++ b/SdncReports/SdncReportsApi/pom.xml
@@ -5,12 +5,10 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>SdncReports</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>SdncReportsApi</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
diff --git a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
index 3c7be352..1bc683d9 100644
--- a/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
+++ b/SdncReports/SdncReportsApi/src/main/webapp/WEB-INF/views/index.jsp
@@ -26,15 +26,15 @@
       <!-- CSS -->
       <script src="./node_modules/jquery.min.js"></script>
       <script src="./node_modules/tether.min.js" ></script>
-      <link rel="stylesheet" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css">  
-      <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>      
+      <link rel="stylesheet" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css">
+      <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
       <link rel="stylesheet" href="/style/sdnc-style.css">
       <!-- JS -->
       <!-- load angular,date-time picker,pagination,growl and ui-router -->
       <script src = "./node_modules/angular.min.js"></script>
       <script src = "./node_modules/angular-route.min.js"></script>
       <script src="./node_modules/angular-utils-pagination/dirPagination.js"></script>
-      <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>     
+      <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
       <script src="./node_modules/angular-sanitize.min.js"></script>
       <link rel="stylesheet" href="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.css" />
       <script src="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.js"></script>
@@ -55,13 +55,13 @@
    <div class="container">
       <!-- header page -->
    <div ng-include="" src="'header.html'"></div>
-      <div style="border-style:ridge;">         
+      <div style="border-style:ridge;">
          <div ng-include="" src="'tabs.html'"></div>
          <!-- views will be injected here -->
          <div ng-view></div>
       </div>  </div>
       <!-- footer page -->
        <div width="100%" align="center" ng-include="" src="'footer.html'"></div>
-     
+
    </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml
index d7d6f535..453907d2 100644
--- a/SdncReports/SdncReportsDao/pom.xml
+++ b/SdncReports/SdncReportsDao/pom.xml
@@ -5,12 +5,10 @@
     <parent>
         <groupId>org.onap.sdnc.oam</groupId>
         <artifactId>SdncReports</artifactId>
-        <version>2.0.1-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>SdncReportsDao</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml
index 91c7f7f7..1fdc408a 100644
--- a/SdncReports/pom.xml
+++ b/SdncReports/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>SdncReports</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-oam :: SdncReports</name>
-- 
cgit 1.2.3-korg