From 912f98b9cdfe0f636239b8f94fccf7858bffac26 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 27 Feb 2018 14:10:22 -0500 Subject: [PATCH] Create nitrogen dockers Updated dockers to install Nitrogen artifacts. Change-Id: I9710346f064fa5fff0d92b5d6de32cc84d9e1b3d Issue-ID: CCSDK-179 Signed-off-by: Dan Timoney --- dgbuilder-docker/pom.xml | 27 +++--- dgbuilder/pom.xml | 33 ++++---- odlsli/pom.xml | 24 +++--- odlsli/src/main/scripts/installCcsdkFeatures.sh | 108 ++++++++++++++++++++++++ odlsli/src/main/scripts/installFeatures.sh | 85 +------------------ odlsli/src/main/scripts/installSdncDb.sh | 6 +- odlsli/src/main/scripts/installZips.sh | 49 +++++------ odlsli/src/main/scripts/startODL.sh | 14 +-- opendaylight/carbon/pom.xml | 24 +++--- opendaylight/nitrogen/pom.xml | 22 +++-- opendaylight/pom.xml | 13 ++- platform-logic/asdc-api/pom.xml | 19 ++--- platform-logic/installer/pom.xml | 72 +++++++--------- platform-logic/pom.xml | 35 ++++---- platform-logic/sliapi/pom.xml | 19 ++--- pom.xml | 29 +++---- ubuntu/pom.xml | 21 ++--- version.properties | 2 +- 18 files changed, 300 insertions(+), 302 deletions(-) create mode 100644 odlsli/src/main/scripts/installCcsdkFeatures.sh diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 73d84713..ef72f1d9 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,28 +1,29 @@ - + + 4.0.0 org.onap.ccsdk.distribution - distribution-root - 0.2.0-SNAPSHOT + distribution-root + 0.2.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.distribution distribution-dgbuilder-docker - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - dgbuilder-docker + ccsdk-distribution :: dgbuilder-docker Creates docker container for dgbuilder + + ONAP + onap/ccsdk-dgbuilder-image ${project.version} - @@ -85,8 +86,8 @@ - exec-maven-plugin org.codehaus.mojo + exec-maven-plugin 1.5.0 @@ -175,7 +176,8 @@ - + + docker @@ -226,7 +228,4 @@ - - ONAP - diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index a82829f4..f3e073ab 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -1,22 +1,23 @@ - + + 4.0.0 - - org.onap.ccsdk.distribution - distribution-root - 0.2.0-SNAPSHOT + + org.onap.ccsdk.distribution + distribution-root + 0.2.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.distribution distribution-dgbuilder + 0.2.1-SNAPSHOT + pom - 0.2.0-SNAPSHOT - - Distribution - dgbuilder + ccsdk-distribution :: dgbuilder Directed Graph Builder + + ONAP + dgbuilder @@ -34,9 +35,9 @@ ${sdnctl.sli.version} - org.mariadb.jdbc - mariadb-java-client - ${mariadb.connector.version} + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} org.antlr @@ -131,8 +132,4 @@ - - ONAP - - diff --git a/odlsli/pom.xml b/odlsli/pom.xml index ba9fc265..68865e9b 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -1,19 +1,22 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-root - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom + distribution-odlsli - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - odlsli + ccsdk-distribution :: odlsli Creates SDN Controller Docker container + + openECOMP + onap/ccsdk-odlsli-image @@ -21,7 +24,6 @@ ${https_proxy} - @@ -202,8 +204,8 @@ - exec-maven-plugin org.codehaus.mojo + exec-maven-plugin 1.5.0 @@ -254,7 +256,6 @@ - @@ -307,7 +308,4 @@ - - openECOMP - diff --git a/odlsli/src/main/scripts/installCcsdkFeatures.sh b/odlsli/src/main/scripts/installCcsdkFeatures.sh new file mode 100644 index 00000000..9aff1d8c --- /dev/null +++ b/odlsli/src/main/scripts/installCcsdkFeatures.sh @@ -0,0 +1,108 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} +CCSDK_FEATURE_DIR=${CCSDK_FEATURE_DIR:-${CCSDK_HOME}/features} + +CCSDK_CORE_FEATURES=" \ + slicore-utils \ + dblib \ + filters \ + sli \ + sliPluginUtils \ + sliapi" + +CCSDK_ADAPTORS_FEATURES=" \ + aai-service \ + mdsal-resource \ + resource-assignment \ + sql-resource" + +CCSDK_NORTHBOUND_FEATURES=" \ + asdcApi \ + dataChange" + +CCSDK_PLUGINS_FEATURES=" \ + properties-node \ + restapi-call-node" + + +CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.0.1-SNAPSHOT} +CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} +CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} +CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.0.1-SNAPSHOT} + +echo "Enabling core features" +${ODL_HOME}/bin/client feature:install odl-mdsal-all +${ODL_HOME}/bin/client feature:install odl-mdsal-apidocs +${ODL_HOME}/bin/client feature:install odl-restconf-all + + + + +echo "Installing CCSDK sli/core" +for feature in ${CCSDK_CORE_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + +echo "Installing CCSDK sli/adaptors" +for feature in ${CCSDK_ADAPTORS_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh + else + echo "No installer found for feature ccsdk-${feature}" + fi +done + +echo "Installing CCSDK sli/northbound" +for feature in ${CCSDK_NORTHBOUND_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done + + +echo "Installing CCSDK sli/plugins" +for feature in ${CCSDK_PLUGINS_FEATURES} +do + if [ -f ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] + then + ${CCSDK_FEATURE_DIR}/sdnc-${feature}/install-feature.sh + else + echo "No installer found for feature sdnc-${feature}" + fi +done diff --git a/odlsli/src/main/scripts/installFeatures.sh b/odlsli/src/main/scripts/installFeatures.sh index 37532e7d..e6b35bdd 100644 --- a/odlsli/src/main/scripts/installFeatures.sh +++ b/odlsli/src/main/scripts/installFeatures.sh @@ -21,87 +21,6 @@ # ============LICENSE_END========================================================= ### -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} -ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} -SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -SDNC_CORE_FEATURES=" \ - slicore-utils \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" - -SDNC_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" - -SDNC_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange" - -SDNC_PLUGINS_FEATURES=" \ - properties-node \ - restapi-call-node" - - -SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT} -SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} -SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT} - -echo "Enabling core features" -${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-all -${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-apidocs -${ODL_HOME}/bin/client -u karaf feature:install odl-restconf-all - - - - -echo "Installing SDN-C core" -for feature in ${SDNC_CORE_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done - -echo "Installing SDN-C adaptors" -for feature in ${SDNC_ADAPTORS_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done - -echo "Installing SDN-C northbound" -for feature in ${SDNC_NORTHBOUND_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done - -echo "Installing SDN-C plugins" -for feature in ${SDNC_PLUGINS_FEATURES} -do - if [ -f ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh ] - then - ${SDNC_FEATURE_DIR}/sdnc-${feature}/install-feature.sh - else - echo "No installer found for feature sdnc-${feature}" - fi -done +${CCSDK_HOME}/bin/installCcsdkFeatures.sh \ No newline at end of file diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh index eaac0221..efd7fe02 100644 --- a/odlsli/src/main/scripts/installSdncDb.sh +++ b/odlsli/src/main/scripts/installSdncDb.sh @@ -21,7 +21,7 @@ # ============LICENSE_END========================================================= ### -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} @@ -39,7 +39,7 @@ GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRAN commit; END -if [ -f ${SDNC_HOME}/data/odlsli.dump ] +if [ -f ${CCSDK_HOME}/data/odlsli.dump ] then -mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/odlsli.dump +mysql -h dbhost -u root -p${MYSQL_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump fi diff --git a/odlsli/src/main/scripts/installZips.sh b/odlsli/src/main/scripts/installZips.sh index 85e33800..f3d296a2 100644 --- a/odlsli/src/main/scripts/installZips.sh +++ b/odlsli/src/main/scripts/installZips.sh @@ -28,12 +28,12 @@ then GLOBAL_SETTINGS_FILE=${GLOBAL_SETTINGS_FILE:-${DEFAULT_MAVEN_SETTINGS}} fi -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -targetDir=${1:-${SDNC_HOME}} +targetDir=${1:-${CCSDK_HOME}} featureDir=${targetDir}/features -SDNC_CORE_FEATURES=" \ +CCSDK_CORE_FEATURES=" \ utils \ dblib \ filters \ @@ -41,24 +41,24 @@ SDNC_CORE_FEATURES=" \ sliPluginUtils \ sliapi" -SDNC_ADAPTORS_FEATURES=" \ +CCSDK_ADAPTORS_FEATURES=" \ aai-service \ mdsal-resource \ resource-assignment \ sql-resource" -SDNC_NORTHBOUND_FEATURES=" \ +CCSDK_NORTHBOUND_FEATURES=" \ asdcApi \ dataChange " -SDNC_PLUGINS_FEATURES=" \ +CCSDK_PLUGINS_FEATURES=" \ properties-node \ restapi-call-node" -SDNC_CORE_VERSION=${SDNC_CORE_VERSION:-0.1.2} -SDNC_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.1.1} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.1.1} -SDNC_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.1.1} +CCSDK_CORE_VERSION=${CCSDK_CORE_VERSION:-0.2.1-SNAPSHOT} +CCSDK_ADAPTORS_VERSION=${CCSDK_ADAPTORS_VERSION:-0.2.1-SNAPSHOT} +CCSDK_NORTHBOUND_VERSION=${CCSDK_NORTHBOUND_VERSION:-0.2.1-SNAPSHOT} +CCSDK_PLUGINS_VERSION=${CCSDK_PLUGINS_VERSION:-0.2.1-SNAPSHOT} if [ ! -d ${targetDir} ] then @@ -75,43 +75,44 @@ cwd=$(pwd) mavenOpts=${2:-"-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"} cd /tmp -echo "Installing SDN-C core version ${SDNC_CORE_VERSION}" -for feature in ${SDNC_CORE_FEATURES} +echo "Installing CCSDK sli/core version ${CCSDK_CORE_VERSION}" +for feature in ${CCSDK_CORE_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.core:${feature}-installer:${SDNC_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.core:${feature}-installer:${CCSDK_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C adaptors version ${SDNC_ADAPTORS_VERSION}" -for feature in ${SDNC_ADAPTORS_FEATURES} +echo "Installing CCSDK sli/adaptors version ${CCSDK_ADAPTORS_VERSION}" +for feature in ${CCSDK_ADAPTORS_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.adaptors:${feature}-installer:${SDNC_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.adaptors:${feature}-installer:${CCSDK_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C northbound version ${SDNC_NORTHBOUND_VERSION}" -for feature in ${SDNC_NORTHBOUND_FEATURES} +echo "Installing CCSDK sli/northbound version ${CCSDK_NORTHBOUND_VERSION}" +for feature in ${CCSDK_NORTHBOUND_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.northbound:${feature}-installer:${SDNC_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.northbound:${feature}-installer:${CCSDK_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing SDN-C plugins version ${SDNC_PLUGINS_VERSION}" -for feature in ${SDNC_PLUGINS_FEATURES} + +echo "Installing CCSDK sli/plugins version ${CCSDK_PLUGINS_VERSION}" +for feature in ${CCSDK_PLUGINS_FEATURES} do rm -f /tmp/${feature}-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.plugins:${feature}-installer:${SDNC_PLUGINS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.sli.plugins:${feature}-installer:${CCSDK_PLUGINS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${featureDir} /tmp/${feature}-installer*zip done -echo "Installing platform-logic" +echo "Installing CCSDK platform-logic" rm -f /tmp/platform-logic-installer*.zip -mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.distribution:platform-logic-installer:${SDNC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true +mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.ccsdk.distribution:platform-logic-installer:${CCSDK_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true unzip -d ${targetDir} /tmp/platform-logic-installer*.zip find ${targetDir} -name '*.sh' -exec chmod +x '{}' \; diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index cbc856d9..50e45ce0 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -26,7 +26,7 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} -SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} @@ -41,26 +41,26 @@ do done echo -e "\nmysql ready" -if [ ! -f ${SDNC_HOME}/.installed ] +if [ ! -f ${CCSDK_HOME}/.installed ] then echo "Installing SDN-C database" - ${SDNC_HOME}/bin/installSdncDb.sh + ${CCSDK_HOME}/bin/installSdncDb.sh echo "Starting OpenDaylight" ${ODL_HOME}/bin/start echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize" sleep ${SLEEP_TIME} echo "Installing SDN-C platform features" - ${SDNC_HOME}/bin/installFeatures.sh - if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] + ${CCSDK_HOME}/bin/installFeatures.sh + if [ -x ${CCSDK_HOME}/svclogic/bin/install.sh ] then echo "Installing directed graphs" - ${SDNC_HOME}/svclogic/bin/install.sh + ${CCSDK_HOME}/svclogic/bin/install.sh fi echo "Restarting OpenDaylight" ${ODL_HOME}/bin/stop - echo "Installed at `date`" > ${SDNC_HOME}/.installed + echo "Installed at `date`" > ${CCSDK_HOME}/.installed fi exec ${ODL_HOME}/bin/karaf diff --git a/opendaylight/carbon/pom.xml b/opendaylight/carbon/pom.xml index aab4f8e3..764598b5 100644 --- a/opendaylight/carbon/pom.xml +++ b/opendaylight/carbon/pom.xml @@ -1,23 +1,26 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-opendaylight - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom + org.onap.ccsdk.distribution distribution-odl-carbon - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - opendaylight + ccsdk-distribution :: opendaylight :: ${project.artifactId} Creates OpenDaylight container + + openECOMP + - onap/ccsdk-odl-image + onap/ccsdk-odl-carbon-image ${project.version} 0.6.1-Carbon 2.1.1 @@ -160,7 +163,6 @@ - @@ -215,8 +217,4 @@ - - openECOMP - - org.onap.ccsdk.distribution diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml index b14b1603..4eb2134c 100644 --- a/opendaylight/nitrogen/pom.xml +++ b/opendaylight/nitrogen/pom.xml @@ -1,23 +1,25 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-opendaylight - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom distribution-odl-nitrogen - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - opendaylight + ccsdk-distribution :: opendaylight :: ${project.artifactId} Creates OpenDaylight container + + ONAP + - onap/ccsdk-odl-nitrogen-image + onap/ccsdk-odl-image ${project.version} 0.7.1 2.1.1 @@ -161,7 +163,6 @@ - @@ -216,7 +217,4 @@ - - ONAP - diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 46d98bf5..d7cc1ed3 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -1,19 +1,18 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-root - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom distribution-opendaylight - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - opendaylight + ccsdk-distribution :: opendaylight Creates OpenDaylight container diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index c49549f9..b704bec9 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -1,22 +1,20 @@ - + + 4.0.0 - org.onap.ccsdk.distribution - distribution-platform-logic - 0.2.0-SNAPSHOT + org.onap.ccsdk.distribution + distribution-platform-logic + 0.2.1-SNAPSHOT - 4.0.0 - pom platform-logic-asdcapi - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Platform Logic : ASDC-API + ccsdk-distribution :: platform-logic :: ${project.artifactId} Contains platform-level service logic for the ASDC-API - @@ -53,5 +51,4 @@ - diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6cc968af..ca58f6da 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -1,22 +1,46 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-platform-logic - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom platform-logic-installer - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Platform Logic Installer + ccsdk-distribution :: platform-logic :: ${project.artifactId} Contains platform-level service logic installer - + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.onap.ccsdk.sli.core + sli-common + + + org.antlr + antlr4 + ${antlr.version} + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} + + @@ -91,37 +115,5 @@ - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - 1.7.5 - compile - - - org.onap.ccsdk.sli.core - sli-common - ${sdnctl.sli.version} - - - org.antlr - antlr4 - ${antlr.version} - jar - compile - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb.connector.version} - - - diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 9dfa384f..f7b665af 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -1,20 +1,28 @@ - + + 4.0.0 - org.onap.ccsdk.distribution - distribution-root - 0.2.0-SNAPSHOT + org.onap.ccsdk.distribution + distribution-root + 0.2.1-SNAPSHOT - 4.0.0 + distribution-platform-logic + 0.2.1-SNAPSHOT pom - distribution-platform-logic - 0.2.0-SNAPSHOT - Platform Logic + ccsdk-distribution :: platform-logic Contains platform-level service logic + + openECOMP + + + + asdc-api + sliapi + installer + platform-logic @@ -22,13 +30,4 @@ yyMMdd-HHmmss ${maven.build.timestamp} - - - asdc-api - sliapi - installer - - - openECOMP - diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 93fd4744..19bc3588 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -1,22 +1,20 @@ - + + 4.0.0 - org.onap.ccsdk.distribution - distribution-platform-logic - 0.2.0-SNAPSHOT + org.onap.ccsdk.distribution + distribution-platform-logic + 0.2.1-SNAPSHOT - 4.0.0 - pom platform-logic-sliapi - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Platform Logic : SLI-API + ccsdk-distribution :: platform-logic :: ${project.artifactId} Contains platform-level service logic for the SLI-API - @@ -53,5 +51,4 @@ - diff --git a/pom.xml b/pom.xml index 0362ad82..541a9c89 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,30 @@ - + + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.distribution distribution-root - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom ccsdk-distribution Creates distributuon bundles for CCSDK + + platform-logic + ubuntu + opendaylight + odlsli + dgbuilder + dgbuilder-docker + + distribution @@ -41,13 +49,4 @@ - - - platform-logic - ubuntu - opendaylight - odlsli - dgbuilder - dgbuilder-docker - diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index da4b4765..613766bd 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -1,27 +1,28 @@ - + + 4.0.0 org.onap.ccsdk.distribution distribution-root - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT - 4.0.0 - pom distribution-ubuntu - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT + pom - Distribution - ubuntu + ccsdk-distribution :: ubuntu Creates base ubuntu Docker container + + openECOMP + onap/ccsdk-ubuntu-image ${project.version} - @@ -83,7 +84,6 @@ - @@ -138,7 +138,4 @@ - - openECOMP - diff --git a/version.properties b/version.properties index bf303c1b..26f5c6e3 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=2 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6