summaryrefslogtreecommitdiffstats
path: root/configbackuprestore
diff options
context:
space:
mode:
authorHesam Rahimi <hesam.rahimi@huawei.com>2021-06-07 20:02:32 +0000
committerKAPIL SINGAL <ks220y@att.com>2021-06-22 16:50:48 +0000
commit55378e7480442b8cee46d215a85e194c56b38f36 (patch)
tree991ff17070697c5cfef7306b3f195ed1b258a236 /configbackuprestore
parentb20349a92894af9b948c8bf2b5c67c5bd86f9da5 (diff)
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
Diffstat (limited to 'configbackuprestore')
-rw-r--r--configbackuprestore/getBackupVnfDetailService/pom.xml4
-rw-r--r--configbackuprestore/pom.xml2
-rw-r--r--configbackuprestore/vnfconfigbackupservice/pom.xml8
-rw-r--r--configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp6
-rw-r--r--configbackuprestore/vnfconfigreportsservice/pom.xml4
5 files changed, 12 insertions, 12 deletions
diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml
index c7d89180..7220a168 100644
--- a/configbackuprestore/getBackupVnfDetailService/pom.xml
+++ b/configbackuprestore/getBackupVnfDetailService/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
<url>http://maven.apache.org</url>
diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml
index fd778ad9..9294dd87 100644
--- a/configbackuprestore/pom.xml
+++ b/configbackuprestore/pom.xml
@@ -10,7 +10,7 @@
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: vnfbackup</name>
diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml
index 41d6345d..e4f4ac8c 100644
--- a/configbackuprestore/vnfconfigbackupservice/pom.xml
+++ b/configbackuprestore/vnfconfigbackupservice/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigbackupservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
<url>http://maven.apache.org</url>
@@ -20,13 +20,13 @@
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
index 95b64141..c9a00b08 100644
--- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
+++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
@@ -34,7 +34,7 @@
<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>
@@ -61,7 +61,7 @@
<div class="container">
<!-- header page -->
<div ng-include="'static/views/header.html'"></div>
- <div style="border-style:ridge;height:auto;">
+ <div style="border-style:ridge;height:auto;">
<div ng-include="'static/views/tabs.html'" ></div>
<!-- views will be injected here -->
<div ng-view></div>
@@ -70,4 +70,4 @@
<div ng-include="'static/views/footer.html'" ></div>
</div>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml
index d32cab99..a1865f6f 100644
--- a/configbackuprestore/vnfconfigreportsservice/pom.xml
+++ b/configbackuprestore/vnfconfigreportsservice/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
<url>http://maven.apache.org</url>