From: Timoney, Dan (dt5972) Date: Thu, 1 Mar 2018 15:59:28 +0000 (-0500) Subject: Nitrogen port : sdnc-oam X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2822ea7882e20879b1556bf98cf28695f5052348;hp=3e1e6367cde13246c60646645d405389df01a27a;p=sdnc%2Foam.git Nitrogen port : sdnc-oam Update sdnc-oam to create docker containers based on ODL Nitrogen release. Change-Id: If8df28c417a2dec69be6eee2fc4521541126085a Issue-ID: SDNC-269 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/admportal/pom.xml b/admportal/pom.xml index 8830ed70..bf876b55 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -1,22 +1,24 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.onap.sdnc.oam - sdnc-oam - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.sdnc.oam admportal + 1.3.1-SNAPSHOT + pom - 1.3.0-SNAPSHOT - - Admin Portal + sdnc-oam :: admportal Admin Portal + + ONAP + admportal @@ -31,7 +33,6 @@ org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} org.mariadb.jdbc @@ -42,7 +43,6 @@ org.antlr antlr4 ${antlr.version} - jar equinoxSDK381 @@ -101,9 +101,4 @@ - - - AT&T - - diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index a2b5e8c7..374e4120 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -1,22 +1,24 @@ - + + 4.0.0 - org.onap.sdnc.oam - sdnc-oam - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - 4.0.0 - pom org.onap.sdnc.oam dgbuilder + 1.3.1-SNAPSHOT + pom - 1.3.0-SNAPSHOT - - Directed Graph Builder + sdnc-oam :: dgbuilder Directed Graph Builder + + ONAP + dgbuilder @@ -31,7 +33,6 @@ org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} org.mariadb.jdbc @@ -40,26 +41,23 @@ org.antlr - antlr4 - ${antlr.version} - jar - compile + antlr4-runtime + ${antlr.version} org.slf4j slf4j-api - ${slf4j.version} + ${slf4j.version} org.slf4j slf4j-simple - 1.7.5 - compile + ${slf4j.version} org.apache.commons commons-lang3 - ${commons.lang3.version} + ${commons.lang3.version} @@ -131,9 +129,4 @@ - - - AT&T - - diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 6266049b..ca823723 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - admportal + sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index ceed5c32..fc19d352 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dgbuilder - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - dgbuilder + sdnc-oam :: installation :: ${project.artifactId} Creates docker container for dgbuilder diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index c894a249..1e4cafa6 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -3,23 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom installation-dmaap-listener - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - dmaap-listener + sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container onap/sdnc-dmaap-listener-image ${project.version} - 0.1.0 - 0.1.1 ${https_proxy} @@ -39,20 +37,29 @@ - println project.properties['sdnc.project.version']; + println + project.properties['sdnc.project.version']; def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); + if ( + project.properties['sdnc.project.version'] + != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + if + (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + 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"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } - println 'New Tag for docker:' + + println 'New Tag for + docker:' + project.properties['project.docker.latesttag.version']; @@ -140,12 +147,12 @@ initialize - - org.onap.ccsdk.sli.northbound - dmaap-listener - zip - ${ccsdk.sli.northbound.version} - + + org.onap.ccsdk.sli.northbound + dmaap-listener + zip + ${ccsdk.sli.northbound.version} + ${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener bin/**,**/*-javadoc.jar,**/*-sources.jar diff --git a/installation/pom.xml b/installation/pom.xml index 113a6088..ca4eb265 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - sdnc-oam - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation + sdnc-oam :: installation Installs SDN-C on local file system @@ -22,7 +22,7 @@ yyMMdd-HHmmss ${maven.build.timestamp} - v0.1.0 + 0.2.1-SNAPSHOT UTF-8 UTF-8 diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 0eaae82b..bafaed0e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -3,24 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - sdnc + sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container onap/sdnc-image ${project.version} - 1.2.2 + 1.3.1-SNAPSHOT ${https_proxy} diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 29a3a70e..66c09b2e 100644 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -24,90 +24,21 @@ 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} SDNC_FEATURE_DIR=${SDNC_FEATURE_DIR:-${SDNC_HOME}/features} -CCSDK_SLI_CORE_FEATURES=" \ - slicore-utils \ - dblib \ - filters \ - sli \ - sliPluginUtils \ - sliapi" -CCSDK_SLI_ADAPTORS_FEATURES=" \ - aai-service \ - mdsal-resource \ - resource-assignment \ - sql-resource" - -CCSDK_SLI_NORTHBOUND_FEATURES=" \ - asdcApi \ - dataChange" SDNC_NORTHBOUND_FEATURES=" \ generic-resource-api \ vnfapi \ vnftools" -CCSDK_SLI_PLUGINS_FEATURES=" \ - properties-node \ - restapi-call-node" - -CCSDK_SLI_CORE_VERSION=${SDNC_CORE_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_ADAPTORS_VERSION=${SDNC_ADAPTORS_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-0.0.1-SNAPSHOT} -CCSDK_SLI_PLUGINS_VERSION=${SDNC_PLUGINS_VERSION:-0.0.1-SNAPSHOT} -SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0-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 CCSDK SLI core" -for feature in ${CCSDK_SLI_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 CCSDK SLI adaptors" -for feature in ${CCSDK_SLI_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 CCSDK SLI northbound" -for feature in ${CCSDK_SLI_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 +SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT} -echo "Installing CCSDK SLI plugins" -for feature in ${CCSDK_SLI_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 +# Install CCSDK features +${CCSDK_HOME}/bin/installCcsdkFeatures.sh echo "Installing SDN-C northbound" diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index ec7fb791..6f35ad30 100644 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -28,8 +28,8 @@ function enable_odl_cluster(){ fi echo "Installing Opendaylight cluster features" - ${ODL_HOME}/bin/client -u karaf feature:install odl-mdsal-clustering - ${ODL_HOME}/bin/client -u karaf feature:install odl-jolokia + ${ODL_HOME}/bin/client feature:install odl-mdsal-clustering + ${ODL_HOME}/bin/client feature:install odl-jolokia echo "Update cluster information statically" hm=$(hostname) diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml deleted file mode 100644 index 4d8deb63..00000000 --- a/installation/ubuntu/pom.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT - - - 4.0.0 - pom - org.onap.sdnc.oam - installation-ubuntu - 1.3.0-SNAPSHOT - - Installation - ubuntu - Creates base ubuntu Docker container - - - onap/ubuntu-sdnc-image - ${project.version} - - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - - println project.properties['sdnc.project.version']; - def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = - project.properties['sdnc.project.version'].split('\\.'); - } - - if (project.properties['sdnc.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']; - - - - - - - io.fabric8 - docker-maven-plugin - 0.16.5 - false - - - - - ${image.name} - - try - ${basedir}/target/docker-stage - ${basedir}/target/docker-stage/Dockerfile - - ${project.version} - ${project.version}-STAGING-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - generate-images - generate-sources - - build - - - - - push-images - deploy - - build - push - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - - - - - - openECOMP - - diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile deleted file mode 100644 index 464d4c0a..00000000 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM ubuntu:16.04 -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) - -ARG HTTP_PROXY -ARG HTTPS_PROXY - -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi - -# Add tools needed for OpenDaylight -RUN apt-get update && apt-get install -y git \ - graphviz \ - openjdk-8-jdk \ - maven \ - mysql-client \ - nodejs \ - nodejs-legacy \ - npm \ - python-pip \ - unzip diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 4260154d..2c2c300e 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -3,23 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.sdnc.oam - installation - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT 4.0.0 pom installation-ueb-listener - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT - Installation - ueb-listener + sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container onap/sdnc-ueb-listener-image ${project.version} - 0.2.0-SNAPSHOT - ${https_proxy} + ${https_proxy} @@ -38,20 +37,29 @@ - println project.properties['sdnc.project.version']; + println + project.properties['sdnc.project.version']; def versionArray; - if ( project.properties['sdnc.project.version'] != null ) { - versionArray = project.properties['sdnc.project.version'].split('\\.'); + if ( + project.properties['sdnc.project.version'] + != null ) { + versionArray = project.properties['sdnc.project.version'].split('\\.'); } - if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) + if + (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) { - project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; + 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"; + project.properties['project.docker.latesttag.version']=versionArray[0] + + '.' + versionArray[1] + + "-STAGING-latest"; } - println 'New Tag for docker:' + + println 'New Tag for + docker:' + project.properties['project.docker.latesttag.version']; @@ -139,12 +147,12 @@ initialize - - org.onap.ccsdk.sli.northbound - ueb-listener - zip - ${ccsdk.sli.northbound.version} - + + org.onap.ccsdk.sli.northbound + ueb-listener + zip + ${ccsdk.sli.northbound.version} + ${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener bin/**,**/*-javadoc.jar,**/*-sources.jar diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index c6ee9d5f..862f83e6 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -1,54 +1,57 @@ - - 4.0.0 + + 4.0.0 - - org.onap.sdnc.oam - platform-logic - 1.3.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + - platform-logic-generic-resource-api - 1.3.0-SNAPSHOT - pom + org.onap.sdnc.oam + platform-logic-generic-resource-api + 1.3.1-SNAPSHOT + pom - Platform Logic : Generic Resource API - Contains platform-level service logic for the Generic Resource API + sdnc-oam :: platform-logic :: ${project.artifactId} + Contains platform-level service logic for the Generic Resource API - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/svclogic/graphs/generic-resource-api - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/svclogic/graphs/generic-resource-api + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index ce50689d..d5208944 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -1,24 +1,21 @@ - + + 4.0.0 - org.onap.sdnc.oam - platform-logic - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT - 4.0.0 - pom org.onap.sdnc.oam platform-logic-installer - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT + pom - Platform Logic Installer + sdnc-oam :: platform-logic :: ${project.artifactId} Contains platform-level service logic installer - - @@ -46,6 +43,4 @@ - - diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 111744b1..d70db97c 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -1,28 +1,24 @@ - + + 4.0.0 - org.onap.sdnc.oam - sdnc-oam - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - 4.0.0 - pom org.onap.sdnc.oam platform-logic 1.3.0-SNAPSHOT + pom - Platform Logic + sdnc-oam :: platform-logic Contains platform-level service logic - - - platform-logic - - yyMMdd-HHmmss - ${maven.build.timestamp} - + + ONAP + setup @@ -31,7 +27,11 @@ restapi-templates installer - - ONAP - + + + platform-logic + + yyMMdd-HHmmss + ${maven.build.timestamp} + diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 7f0d7b40..0ada96fe 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -1,54 +1,57 @@ - - 4.0.0 + + 4.0.0 - - org.onap.sdnc.oam - platform-logic - 1.3.0-SNAPSHOT - + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + - platform-logic-restapi-templates - 1.3.0-SNAPSHOT - pom + org.onap.sdnc.oam + platform-logic-restapi-templates + 1.3.0-SNAPSHOT + pom - Platform Logic : REST API templates - Contains platform-level platform logic for REST API templates + sdnc-oam :: platform-logic :: ${project.artifactId} + Contains platform-level platform logic for REST API templates - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/restapi/templates - - - src/main/json - - *.json - - true - - - src/main/xml - - *.xml - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/restapi/templates + + + src/main/json + + *.json + + true + + + src/main/xml + + *.xml + + true + + + + + + + + diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index c035fe6c..33fde7db 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -2,22 +2,23 @@ 4.0.0 - - org.onap.sdnc.oam - platform-logic - 1.3.0-SNAPSHOT + + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + + org.onap.sdnc.oam platform-logic-setup - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom - Platform Logic : Setup + sdnc-oam :: platform-logic :: ${project.artifactId} Copies base ONAP platform-logic - - 0.2.0-SNAPSHOT + 0.2.1-SNAPSHOT @@ -59,6 +60,5 @@ - diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 7b70190f..c094f094 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -1,23 +1,22 @@ - + + 4.0.0 - org.onap.sdnc.oam - platform-logic - 1.3.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 1.0.1-SNAPSHOT + - 4.0.0 - pom org.onap.sdnc.oam platform-logic-vnfapi - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT + pom - Platform Logic : VNF-API + sdnc-oam :: platform-logic :: ${project.artifactId} Contains platform-level service logic for the VNF-API - @@ -54,5 +53,4 @@ - diff --git a/pom.xml b/pom.xml index f7d028f6..df369040 100755 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ - + + 4.0.0 org.onap.ccsdk.parent @@ -8,39 +8,69 @@ 0.1.0 - 4.0.0 - pom org.onap.sdnc.oam sdnc-oam + 1.3.0-SNAPSHOT + pom sdnc-oam - https://wiki.onap.org The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform. + https://wiki.onap.org + + AT&T + + + admportal + dgbuilder + platform-logic + - - JIRA - https://jira.onap.org/ - - - + scm:git:ssh://git@${onap.git.host}/sdnc-oam.git scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse HEAD - + + JIRA + https://jira.onap.org/ + Jenkins https://jenkins.onap.org/ - - + sdnc-javadoc dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://${onap.nexus.host} + ${onap.nexus.staging.profile-id} + ${onap.nexus.staging.server-id} + + + + + blackduck @@ -84,41 +114,4 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - ${onap.nexus.staging.profile-id} - ${onap.nexus.staging.server-id} - - - - - - - admportal - dgbuilder - platform-logic - - - - AT&T - - 1.3.0-SNAPSHOT - -