From e232baec10e9c5dbae446398f6a702befcbf0c0d Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 2 Mar 2018 15:52:11 -0500 Subject: Use dependencies plugin Update odlsli to use maven dependencies plugin within pom.xml to install features, as opposed to using separate installZips.sh script. That script was needed to work around a problem in early set up using self-signed SSL certs that no longer exists. Change-Id: Ia1b79d2f1c4593b8c6ff617882c4f9e9434ab0e0 Issue-ID: CCSDK-179 Signed-off-by: Timoney, Dan (dt5972) --- odlsli/pom.xml | 142 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 124 insertions(+), 18 deletions(-) diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 68865e9b..a16ae840 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 - org.onap.ccsdk.distribution - distribution-root - 0.2.1-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + distribution-odlsli @@ -24,6 +26,94 @@ ${https_proxy} + + + + org.onap.ccsdk.sli.core + dblib-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.core + filters-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.core + sli-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.core + sliapi-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.core + sliPluginUtils-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.core + utils-installer + ${ccsdk.sli.core.version} + zip + + + org.onap.ccsdk.sli.adaptors + aai-service-installer + ${ccsdk.sli.adaptors.version} + zip + + + org.onap.ccsdk.sli.adaptors + mdsal-resource-installer + ${ccsdk.sli.adaptors.version} + zip + + + org.onap.ccsdk.sli.adaptors + resource-assignment-installer + ${ccsdk.sli.adaptors.version} + zip + + + org.onap.ccsdk.sli.adaptors + sql-resource-installer + ${ccsdk.sli.adaptors.version} + zip + + + org.onap.ccsdk.sli.northbound + asdcApi-installer + ${ccsdk.sli.northbound.version} + zip + + + org.onap.ccsdk.sli.northbound + dataChange-installer + ${ccsdk.sli.northbound.version} + zip + + + org.onap.ccsdk.sli.plugins + properties-node-installer + ${ccsdk.sli.plugins.version} + zip + + + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + ${ccsdk.sli.plugins.version} + zip + + + @@ -41,19 +131,17 @@ println project.properties['ccsdk.project.version']; def versionArray; - if ( project.properties['ccsdk.project.version'] != null ) { + if (project.properties['ccsdk.project.version'] != null ) { versionArray = project.properties['ccsdk.project.version'].split('\\.'); } - if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) - { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) { + project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } else { project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; } - println 'New Tag for docker:' + - project.properties['project.docker.latesttag.version']; + println 'New Tag for docker:' + project.properties['project.docker.latesttag.version']; @@ -93,7 +181,7 @@ validate - ${basedir}/target/docker-stage/opt/onap/sdnc/bin + ${basedir}/target/docker-stage/opt/onap/ccsdk/bin src/main/scripts @@ -151,7 +239,7 @@ validate - ${basedir}/target/docker-stage/opt/onap/sdnc/data + ${basedir}/target/docker-stage/opt/onap/ccsdk/data src/main/resources @@ -170,7 +258,7 @@ validate - ${basedir}/target/docker-stage/opt/onap/sdnc/data/properties + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties src/main/properties @@ -189,7 +277,7 @@ validate - ${basedir}/target/docker-stage/opt/onap/sdnc/data/stores + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores src/main/stores @@ -203,13 +291,31 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + + unpack features + generate-sources + + unpack-dependencies + + + ${basedir}/target/docker-stage/opt/onap/ccsdk/features + true + + + + org.codehaus.mojo exec-maven-plugin 1.5.0 - + change shell permissions @@ -240,7 +346,7 @@ /usr/bin/find - ${basedir}/target/docker-stage/opt/onap/sdnc + ${basedir}/target/docker-stage/opt/onap/ccsdk -name *.sh -exec -- cgit 1.2.3-korg