summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2019-04-23 23:54:01 +0000
committerdglFromAtt <dgl@research.att.com>2019-04-23 23:54:06 +0000
commit0494603a4624d391af8b5a3918555ea7e47ffa10 (patch)
tree2dcc9502c7e9d9bb7591c701fa087a4db540959c
parentab20eca85c90b63deaaae00d5c9e32b9a965f69a (diff)
Workaround for deployment problem
Change-Id: I7fa045a5a61e30012c5cfc057ad5d8742807d5d4 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-1177
-rw-r--r--dbc-client/misc/dbc-client10
-rw-r--r--dbc-client/pom.xml2
-rw-r--r--dbc-client/version.properties2
-rw-r--r--pom.xml2
-rw-r--r--version.properties2
5 files changed, 13 insertions, 5 deletions
diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index c29ec86..1e079bf 100644
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@ -40,6 +40,9 @@ CAPEM=${CAPEM:-ca.pem}
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 @@ config() {
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
echo "--key $PEMDIR/$KEYPEM --cacert $PEMDIR/$CAPEM --cert $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 9627eb6..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.2-SNAPSHOT</version>
+ <version>1.1.3-SNAPSHOT</version>
<name>dmaap-buscontroller</name>
<packaging>pom</packaging>
diff --git a/version.properties b/version.properties
index 85e1bd1..635e84d 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=1
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins