Merge "Fix problem with post install job"
diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index e9b01f5..d1de3e1 100644
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@ -40,6 +40,9 @@
CLIENTPEM=${CLIENTPEM:-client.pem}
KEYPEM=${KEYPEM:-key.pem}
CERTPWD=${CERTPWD:-'2U[iOZzMHI:.#tdCwlBqc;}S'}
+AUTH_METHOD=${AUTH_METHOD:-basicAuth}
+BA_IDENTITY=${BA_IDENTITY:-dmaap-bc@dmaap-bc.onap.org}
+BA_PWD=${BA_PWD:-'demo123456!'}
@@ -55,7 +58,12 @@
cd $PEMDIR
pwd
ls -l
- if [ -f $CAPEM -a -f $CLIENTPEM -a -f $KEYPEM ]
+ echo "AUTH_METHOD=$AUTH_METHOD"
+ if [ "$AUTH_METHOD" = "basicAuth" ]
+ then
+ echo "-u ${BA_IDENTITY}:${BA_PWD}" > $PEMDIR/curl.cred
+ CURLCRED="-K $PEMDIR/curl.cred"
+ elif [ -f $CAPEM -a -f $CLIENTPEM -a -f $KEYPEM ]
then
printf "key \"$PEMDIR/$KEYPEM\"\ncacert \"$PEMDIR/$CAPEM\"\ncert \"$PEMDIR/${CLIENTPEM}:${CERTPWD}\"" > $PEMDIR/curl.cred
CURLCRED="-K $PEMDIR/curl.cred"
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 384d6a8..e13a2c1 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -270,7 +270,7 @@
<jettyVersion>9.4.12.RC2</jettyVersion>
<eelf.version>1.0.0</eelf.version>
<swagger.version>1.5.19</swagger.version>
- <artifact.version>1.0.7</artifact.version>
+ <artifact.version>1.0.8</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/dbc-client/version.properties b/dbc-client/version.properties
index 0607bbf..9a4bc7e 100644
--- a/dbc-client/version.properties
+++ b/dbc-client/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=7
+patch=8
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
diff --git a/pom.xml b/pom.xml
index c3e2587..d200867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.dmaap.buscontroller</groupId>
<artifactId>parent</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<name>dmaap-buscontroller</name>
<packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 67e2f3a..635e84d 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=1
-patch=1
+patch=3
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins