summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotagiri, Ramprasad (rp5662) <rp5662@att.com>2021-07-12 12:50:21 -0400
committerKotagiri, Ramprasad (rp5662) <rp5662@att.com>2021-07-12 15:09:47 -0400
commit355cf4099273cbd1049b6b111cca2b6638bc57f6 (patch)
tree209caf74d86632a300a6b886930382db98c7b7d8
parent03b52339bcdaa67d6e89d81c6c0526ae6b196215 (diff)
[DCAE/CCSDK] container run script changes1.4.4
update container startup script to update postgres password in app config Issue-ID: DCAEGEN2-2800 Change-Id: Ib8910edbc1a7a2d9d4fcf0115be1fea7a459a2c4 Signed-off-by: Kotagiri, Ramprasad (rp5662) <rp5662@att.com>
-rw-r--r--ccsdk-app-common/pom.xml4
-rw-r--r--ccsdk-app-os/docker-dashboard-installation.sh4
-rw-r--r--ccsdk-app-os/pom.xml4
-rw-r--r--ccsdk-app-overlay/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
6 files changed, 10 insertions, 10 deletions
diff --git a/ccsdk-app-common/pom.xml b/ccsdk-app-common/pom.xml
index a231d2e..50a9f1e 100644
--- a/ccsdk-app-common/pom.xml
+++ b/ccsdk-app-common/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-parent</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-common</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>DCAE Dashboard common</name>
<description>CCSDK Dashboard common Java code</description>
diff --git a/ccsdk-app-os/docker-dashboard-installation.sh b/ccsdk-app-os/docker-dashboard-installation.sh
index 81a8a75..1ebc373 100644
--- a/ccsdk-app-os/docker-dashboard-installation.sh
+++ b/ccsdk-app-os/docker-dashboard-installation.sh
@@ -3,7 +3,7 @@
# =============LICENSE_START=====================================================
#
# ===============================================================================
- # Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+ # Copyright (c) 2020-2021 AT&T Intellectual Property. All rights reserved.
# ===============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ cat /tmp/ccsdk-app/WEB-INF/conf/system.properties | \
sed "s/^db.encrypt_flag.*$/db.encrypt_flag=false/g" | \
sed "s/postgresql:\/\/.*$/postgresql:\/\/${postgres_ip}:${postgres_port}\/${postgres_db_name}/g" | \
sed "s/^db.userName.*$/db.userName=${postgres_user_dashboard}/g" | \
-sed "s/^db.password.*$/db.password=${postgres_password_dashboard}/g" > /tmp/sys.prop
+sed "s~^db.password.*$~db.password=${postgres_password_dashboard}~g" > /tmp/sys.prop
mv /tmp/sys.prop /tmp/ccsdk-app/WEB-INF/conf/system.properties
# Repackage the war file
diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 07edcfb..6d17658 100644
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-parent</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-os</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>DCAE Dashboard</name>
<description>CCSDK Dashboard Web Application for external release</description>
diff --git a/ccsdk-app-overlay/pom.xml b/ccsdk-app-overlay/pom.xml
index 5b34f0e..4dbf8e6 100644
--- a/ccsdk-app-overlay/pom.xml
+++ b/ccsdk-app-overlay/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-parent</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
</parent>
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-overlay</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>DCAE Dashboard overlay</name>
<description>CCSDK Dashboard web resources</description>
diff --git a/pom.xml b/pom.xml
index 021c7b0..afd6991 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<!-- Maven parent project for convenience of building and cleaning -->
<groupId>org.onap.ccsdk.dashboard</groupId>
<artifactId>ccsdk-app-parent</artifactId>
- <version>1.4.3-SNAPSHOT</version>
+ <version>1.4.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-dashboard</name>
diff --git a/version.properties b/version.properties
index 44e6ad0..28c09b9 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
major=1
minor=4
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}