Optionally set properties from configmap
Change-Id: Id0746bc49637321f17a4225795bc652f1827e100
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-829
diff --git a/misc/dmaapbc b/misc/dmaapbc
index cef472e..0dff4d6 100644
--- a/misc/dmaapbc
+++ b/misc/dmaapbc
@@ -74,8 +74,17 @@
$APP_ROOT/misc/cert-client-init.sh
. misc/havecert.tmpl > etc/havecert
chmod +x etc/havecert
- . misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
- . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
+
+ # These files might be better provided in kubernetes configmaps
+ # so if they are already there, don't overwrite.
+ if [ ! -f etc/dmaapbc.properties ]
+ then
+ . misc/dmaapbc.properties.tmpl > etc/dmaapbc.properties
+ fi
+ if [ ! -f config/PolicyEngineApi.properties ]
+ then
+ . misc/PolicyEngineApi.properties.tmpl > config/PolicyEngineApi.properties
+ fi
set +x
}
diff --git a/pom.xml b/pom.xml
index ccf82e2..2a0474f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.3.8.RC0</jettyVersion>
<eelf.version>0.0.1</eelf.version>
- <artifact.version>1.0.21</artifact.version>
+ <artifact.version>1.0.22</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/version.properties b/version.properties
index acfc935..7408ce8 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=21
+patch=22
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins