From fbeb51879131ef62b27ecfc9d5aef55c22e0ea5c Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 19 Apr 2018 12:44:21 -0700 Subject: [PATCH] Update aaf shiro download version Change-Id: Ic361fbd372ce9f8f6f07ce1f2c1466aacda81dd0 Signed-off-by: Patrick Brady Issue-ID: AAF-250 --- installation/appc/src/main/scripts/installZips.sh | 6 +++--- installation/appc/src/main/scripts/startODL.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh index 8911d1f..359473b 100644 --- a/installation/appc/src/main/scripts/installZips.sh +++ b/installation/appc/src/main/scripts/installZips.sh @@ -76,7 +76,7 @@ FEATURES_PER_DIRECTORY=$(($(echo $APPC_FEATURES|wc -w)/$FEATURE_DIRECTORY_COUNT) APPC_VERSION=${APPC_VERSION:-0.0.1} APPC_OAM_VERSION=${APPC_OAM_VERSION:-0.1.1} -AAF_CADI_SHIRO_VERSION=${AAF_CADI_SHIRO_VERSION:-1.5.0-SNAPSHOT} +AAF_SHIRO_VERSION=${AAF_SHIRO_VERSION:-2.1.0} if [ ! -d ${targetDir} ] then @@ -120,8 +120,8 @@ mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -D mv ${targetDir}/data/dg-loader-provider-*-jar-with-dependencies.jar ${targetDir}/data/dg-loader-provider-jar-with-dependencies.jar echo "Downloading aaf-cadi-shiro from nexus" -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.authz.cadi:aaf-cadi-shiro:${AAF_CADI_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data -mv ${targetDir}/data/aaf-cadi-shiro-*.jar ${targetDir}/data/aaf-cadi-shiro.jar +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.aaf.authz.cadi:aaf-shiro-aafrealm-osgi-bundle:${AAF_SHIRO_VERSION} -DoutputDirectory=${targetDir}/data +mv ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle-*.jar ${targetDir}/data/aaf-shiro-aafrealm-osgi-bundle.jar find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh index e38b317..8faddb9 100644 --- a/installation/appc/src/main/scripts/startODL.sh +++ b/installation/appc/src/main/scripts/startODL.sh @@ -76,7 +76,7 @@ then echo "Copying a working version of the logging configuration into the opendaylight etc folder" cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder" - cp ${APPC_HOME}/data/aaf-cadi-shiro.jar ${ODL_HOME}/deploy/aaf-cadi-shiro.jar + cp ${APPC_HOME}/data/aaf-shiro-aafrealm-osgi-bundle.jar ${ODL_HOME}/deploy/aaf-shiro-aafrealm-osgi-bundle.jar echo "Installing SDNC platform features" ${SDNC_HOME}/bin/installFeatures.sh if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] -- 2.16.6