Change-Id: I7fa045a5a61e30012c5cfc057ad5d8742807d5d4
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1177
CLIENTPEM=${CLIENTPEM:-client.pem}
KEYPEM=${KEYPEM:-key.pem}
CERTPWD=${CERTPWD:-'2U[iOZzMHI:.#tdCwlBqc;}S'}
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!'}
- 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"
then
echo "--key $PEMDIR/$KEYPEM --cacert $PEMDIR/$CAPEM --cert $PEMDIR/${CLIENTPEM}:${CERTPWD}" > $PEMDIR/curl.cred
CURLCRED="-K $PEMDIR/curl.cred"
<jettyVersion>9.4.12.RC2</jettyVersion>
<eelf.version>1.0.0</eelf.version>
<swagger.version>1.5.19</swagger.version>
<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>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.dmaap.buscontroller</groupId>
<artifactId>parent</artifactId>
<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>
<name>dmaap-buscontroller</name>
<packaging>pom</packaging>
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins