diff options
| -rw-r--r-- | admportal/pom.xml | 27 | ||||
| -rw-r--r-- | dgbuilder/pom.xml | 41 | ||||
| -rw-r--r-- | installation/admportal/pom.xml | 10 | ||||
| -rw-r--r-- | installation/dgbuilder/pom.xml | 10 | ||||
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 47 | ||||
| -rw-r--r-- | installation/pom.xml | 12 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 12 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/installFeatures.sh | 77 | ||||
| -rw-r--r-- | installation/sdnc/src/main/scripts/startODL.sh | 4 | ||||
| -rw-r--r-- | installation/ubuntu/pom.xml | 134 | ||||
| -rw-r--r-- | installation/ubuntu/src/main/docker/Dockerfile | 24 | ||||
| -rw-r--r-- | installation/ueb-listener/pom.xml | 48 | ||||
| -rw-r--r-- | platform-logic/generic-resource-api/pom.xml | 99 | ||||
| -rw-r--r-- | platform-logic/installer/pom.xml | 21 | ||||
| -rw-r--r-- | platform-logic/pom.xml | 36 | ||||
| -rw-r--r-- | platform-logic/restapi-templates/pom.xml | 99 | ||||
| -rw-r--r-- | platform-logic/setup/pom.xml | 18 | ||||
| -rw-r--r-- | platform-logic/vnfapi/pom.xml | 20 | ||||
| -rwxr-xr-x | pom.xml | 95 |
19 files changed, 301 insertions, 533 deletions
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 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>sdnc-oam</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>admportal</artifactId> + <version>1.3.1-SNAPSHOT</version> + <packaging>pom</packaging> - <version>1.3.0-SNAPSHOT</version> - - <name>Admin Portal</name> + <name>sdnc-oam :: admportal</name> <description>Admin Portal</description> + <organization> + <name>ONAP</name> + </organization> <properties> <application.name>admportal</application.name> @@ -31,7 +33,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${sdnctl.sli.version}</version> </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> @@ -42,7 +43,6 @@ <groupId>org.antlr</groupId> <artifactId>antlr4</artifactId> <version>${antlr.version}</version> - <type>jar</type> </dependency> <dependency> <groupId>equinoxSDK381</groupId> @@ -101,9 +101,4 @@ </plugin> </plugins> </build> - - <organization> - <name>AT&T</name> - </organization> </project> - 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>sdnc-oam</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>dgbuilder</artifactId> + <version>1.3.1-SNAPSHOT</version> + <packaging>pom</packaging> - <version>1.3.0-SNAPSHOT</version> - - <name>Directed Graph Builder</name> + <name>sdnc-oam :: dgbuilder</name> <description>Directed Graph Builder</description> + <organization> + <name>ONAP</name> + </organization> <properties> <application.name>dgbuilder</application.name> @@ -31,7 +33,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${sdnctl.sli.version}</version> </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> @@ -40,26 +41,23 @@ </dependency> <dependency> <groupId>org.antlr</groupId> - <artifactId>antlr4</artifactId> - <version>${antlr.version}</version> - <type>jar</type> - <scope>compile</scope> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.7.5</version> - <scope>compile</scope> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>${commons.lang3.version}</version> + <version>${commons.lang3.version}</version> </dependency> </dependencies> @@ -131,9 +129,4 @@ </plugin> </plugins> </build> - - <organization> - <name>AT&T</name> - </organization> </project> - 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-admportal</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation - admportal</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates admportal Docker container</description> <properties> 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-dgbuilder</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation - dgbuilder</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates docker container for dgbuilder</description> <properties> 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <artifactId>installation-dmaap-listener</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation - dmaap-listener</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates dmaap-listener Docker container</description> <properties> <image.name>onap/sdnc-dmaap-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <ccsdk.project.version>0.1.0</ccsdk.project.version> - <ccsdk.sli.northbound.version>0.1.1</ccsdk.sli.northbound.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> </properties> @@ -39,20 +37,29 @@ </goals> <configuration> <source> - 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']; </source> </configuration> @@ -140,12 +147,12 @@ <phase>initialize</phase> <configuration> <artifactItems> - <artifactItem> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>dmaap-listener</artifactId> - <type>zip</type> - <version>${ccsdk.sli.northbound.version}</version> - </artifactItem> + <artifactItem> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>dmaap-listener</artifactId> + <type>zip</type> + <version>${ccsdk.sli.northbound.version}</version> + </artifactItem> </artifactItems> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/dmaap-listener</outputDirectory> <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes> 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>sdnc-oam</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation</name> + <name>sdnc-oam :: installation</name> <description>Installs SDN-C on local file system</description> <properties> @@ -22,7 +22,7 @@ <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> - <ccsdk.distribution.version>v0.1.0</ccsdk.distribution.version> + <ccsdk.distribution.version>0.2.1-SNAPSHOT</ccsdk.distribution.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation - sdnc</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates SDN Controller Docker container</description> <properties> <image.name>onap/sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.northbound.version>1.2.2</sdnc.northbound.version> + <sdnc.northbound.version>1.3.1-SNAPSHOT</sdnc.northbound.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> </properties> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation-ubuntu</artifactId> - <version>1.3.0-SNAPSHOT</version> - - <name>Installation - ubuntu</name> - <description>Creates base ubuntu Docker container</description> - - <properties> - <image.name>onap/ubuntu-sdnc-image</image.name> - <sdnc.project.version>${project.version}</sdnc.project.version> - </properties> - - - <build> - <plugins> - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - 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']; - </source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <organization> - <name>openECOMP</name> - </organization> -</project> 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"> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> <artifactId>installation-ueb-listener</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> - <name>Installation - ueb-listener</name> + <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates ueb-listener Docker container</description> <properties> <image.name>onap/sdnc-ueb-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <ccsdk.sli.northbound.version>0.2.0-SNAPSHOT</ccsdk.sli.northbound.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> + <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> </properties> @@ -38,20 +37,29 @@ </goals> <configuration> <source> - 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']; </source> </configuration> @@ -139,12 +147,12 @@ <phase>initialize</phase> <configuration> <artifactItems> - <artifactItem> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>ueb-listener</artifactId> - <type>zip</type> - <version>${ccsdk.sli.northbound.version}</version> - </artifactItem> + <artifactItem> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>ueb-listener</artifactId> + <type>zip</type> + <version>${ccsdk.sli.northbound.version}</version> + </artifactItem> </artifactItems> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/ueb-listener</outputDirectory> <excludes>bin/**,**/*-javadoc.jar,**/*-sources.jar</excludes> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> + </parent> - <artifactId>platform-logic-generic-resource-api</artifactId> - <version>1.3.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-generic-resource-api</artifactId> + <version>1.3.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic : Generic Resource API</name> - <description>Contains platform-level service logic for the Generic Resource API</description> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> + <description>Contains platform-level service logic for the Generic Resource API</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/svclogic/graphs/generic-resource-api</outputDirectory> - <resources> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>graph.versions</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/svclogic/graphs/generic-resource-api</outputDirectory> + <resources> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>graph.versions</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-installer</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic Installer</name> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> <description>Contains platform-level service logic installer</description> - - <build> <plugins> @@ -46,6 +43,4 @@ </plugins> </build> - - </project> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>sdnc-oam</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> <version>1.3.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic </name> + <name>sdnc-oam :: platform-logic</name> <description>Contains platform-level service logic</description> - - <properties> - <application.name>platform-logic</application.name> - - <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> - <build.number>${maven.build.timestamp}</build.number> - </properties> + <organization> + <name>ONAP</name> + </organization> <modules> <module>setup</module> @@ -31,7 +27,11 @@ <module>restapi-templates</module> <module>installer</module> </modules> - <organization> - <name>ONAP</name> - </organization> + + <properties> + <application.name>platform-logic</application.name> + + <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format> + <build.number>${maven.build.timestamp}</build.number> + </properties> </project> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> + </parent> - <artifactId>platform-logic-restapi-templates</artifactId> - <version>1.3.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.oam</groupId> + <artifactId>platform-logic-restapi-templates</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic : REST API templates</name> - <description>Contains platform-level platform logic for REST API templates</description> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> + <description>Contains platform-level platform logic for REST API templates</description> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>../target/restapi/templates</outputDirectory> - <resources> - <resource> - <directory>src/main/json</directory> - <includes> - <include>*.json</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/xml</directory> - <includes> - <include>*.xml</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>../target/restapi/templates</outputDirectory> + <resources> + <resource> + <directory>src/main/json</directory> + <includes> + <include>*.json</include> + </includes> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/xml</directory> + <includes> + <include>*.xml</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> 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 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> </parent> + <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-setup</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>Platform Logic : Setup</name> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> <description>Copies base ONAP platform-logic</description> - <properties> - <ccsdk.distribution.version>0.2.0-SNAPSHOT</ccsdk.distribution.version> + <ccsdk.distribution.version>0.2.1-SNAPSHOT</ccsdk.distribution.version> </properties> <build> @@ -59,6 +60,5 @@ </plugins> - </build> </project> 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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>platform-logic</artifactId> - <version>1.3.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath /> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-vnfapi</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.3.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>Platform Logic : VNF-API</name> + <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> <description>Contains platform-level service logic for the VNF-API</description> - <build> <plugins> <plugin> @@ -54,5 +53,4 @@ </plugin> </plugins> </build> - </project> @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.parent</groupId> @@ -8,39 +8,69 @@ <version>0.1.0</version> </parent> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>sdnc-oam</name> - <url>https://wiki.onap.org</url> <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description> + <url>https://wiki.onap.org</url> + <organization> + <name>AT&T</name> + </organization> + <modules> + <module>admportal</module> + <module>dgbuilder</module> + <module>platform-logic</module> + </modules> - <issueManagement> - <system>JIRA</system> - <url>https://jira.onap.org/</url> - </issueManagement> - - <scm> + <scm> <connection>scm:git:ssh://git@${onap.git.host}/sdnc-oam.git</connection> <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git</developerConnection> <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-oam/browse</url> <tag>HEAD</tag> </scm> - + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> <ciManagement> <system>Jenkins</system> <url>https://jenkins.onap.org/</url> </ciManagement> - - <distributionManagement> + <distributionManagement> <site> <id>sdnc-javadoc</id> <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> </site> </distributionManagement> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>https://${onap.nexus.host}</nexusUrl> + <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId> + <serverId>${onap.nexus.staging.server-id}</serverId> + </configuration> + </plugin> + </plugins> + </build> + <profiles> <profile> <id>blackduck</id> @@ -84,41 +114,4 @@ </profile> </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>https://${onap.nexus.host}</nexusUrl> - <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId> - <serverId>${onap.nexus.staging.server-id}</serverId> - </configuration> - </plugin> - </plugins> - - </build> - <modules> - <module>admportal</module> - <module>dgbuilder</module> - <module>platform-logic</module> - </modules> - - <organization> - <name>AT&T</name> - </organization> - <version>1.3.0-SNAPSHOT</version> - - </project> |