From: Timoney, Daniel (dt5972) Date: Tue, 21 Feb 2017 08:48:05 +0000 (-0500) Subject: [VERSION] Use official root pom X-Git-Tag: v1.2.1~195 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5771678a73418d4e424ec184e20db74bbb4297a6;hp=6d831ce81a722362460abf2d998766288388ab3f;p=sdnc%2Foam.git [VERSION] Use official root pom Use version 1.0.0 of root pom Change-Id: Icc821432b9eb68be9dfb3755f505b6bdd8b97035 Signed-off-by: Timoney, Daniel (dt5972) Former-commit-id: f8e0d3b080ae4c8069de5b7cefa6ca60dda2fe5d --- diff --git a/admportal/pom.xml b/admportal/pom.xml index 2fa4a338..2ce7ac02 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.openecomp.sdnc.oam sdnc-oam - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 @@ -13,7 +13,7 @@ org.openecomp.sdnc.oam admportal - 1.0.0-SNAPSHOT + 1.0.0 Admin Portal Admin Portal diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 5f5d221d..495a7fdb 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam installation - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam installation-admportal - 1.0.0-SNAPSHOT + 1.0.0 Installation - admportal Creates admportal Docker container diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index 6df37691..4eaf158c 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam installation - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam installation-dgbuilder - 1.0.0-SNAPSHOT + 1.0.0 Installation - dgbuilder Creates docker container for dgbuilder diff --git a/installation/pom.xml b/installation/pom.xml index 20c1dba9..c1336951 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam sdnc-oam - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam installation - 1.0.0-SNAPSHOT + 1.0.0 Installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 50b8cbea..6db2fd5d 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam installation - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam installation-sdnc - 1.0.0-SNAPSHOT + 1.0.0 Installation - sdnc Creates SDN Controller Docker container diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml new file mode 100644 index 00000000..ac84b717 --- /dev/null +++ b/installation/src/main/yaml/docker-compose.yml @@ -0,0 +1,92 @@ +version: '2' + +services: + db: + image: mysql/mysql-server:5.6 + container_name: sdnc_db_container + ports: + - "3306" + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - MYSQL_ROOT_HOST=% + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + + sdnc: + image: ${ECOMP_DOCKER_HOST}:${ECOMP_DOCKER_PORT}/ecomp/sdnc-image:latest + depends_on : + - db + container_name: sdnc_controller_container + entrypoint: ["/opt/openecomp/sdnc/bin/startODL.sh"] + ports: + - "8282:8181" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + + web: + image: ${ECOMP_DOCKER_HOST}:${ECOMP_DOCKER_PORT}/ecomp/admportal-sdnc-image:latest + depends_on: + - db + container_name: sdnc_portal_container + entrypoint: + - "/bin/bash" + - "-c" + - "cd /opt/openecomp/sdnc/admportal/shell && ./start_portal.sh" + ports: + - "8843:8843" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + - sdnc:sdnhost + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + + dgbuilder: + image: ${ECOMP_DOCKER_HOST}:${ECOMP_DOCKER_PORT}/ecomp/dgbuilder-sdnc-image:latest + depends_on: + - db + container_name: sdnc_dgbuilder_container + entrypoint: + - "/bin/bash" + - "-c" + - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start sdnc1.0 && wait" + ports: + - "3000:3100" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + - sdnc:sdnhost + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + + diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index e8233782..603ba267 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam installation - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam installation-ubuntu - 1.0.0-SNAPSHOT + 1.0.0 Installation - ubuntu Creates base ubuntu Docker container diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 0db8032c..bfc340be 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam platform-logic - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam platform-logic-asdcapi - 1.0.0-SNAPSHOT + 1.0.0 Platform Logic : ASDC-API Contains platform-level service logic for the ASDC-API diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 6278dc56..4fb723ae 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam platform-logic - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam platform-logic-installer - 1.0.0-SNAPSHOT + 1.0.0 Platform Logic Installer Contains platform-level service logic installer diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 00d88b03..c8479bbf 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam sdnc-oam - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam platform-logic - 1.0.0-SNAPSHOT + 1.0.0 Platform Logic Contains platform-level service logic diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 18338ffc..cd015977 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam platform-logic - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam platform-logic-sliapi - 1.0.0-SNAPSHOT + 1.0.0 Platform Logic : SLI-API Contains platform-level service logic for the SLI-API diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 47589e6a..11a0b263 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,14 +5,14 @@ org.openecomp.sdnc.oam platform-logic - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 pom org.openecomp.sdnc.oam platform-logic-vnfapi - 1.0.0-SNAPSHOT + 1.0.0 Platform Logic : VNF-API Contains platform-level service logic for the VNF-API diff --git a/pom.xml b/pom.xml index 2e3c264e..f0e3120c 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.openecomp.sdnc.core root - 1.0.0-SNAPSHOT + 1.0.0 4.0.0 @@ -65,6 +65,17 @@ --> + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.openecomp.org + 176c31dfe190a + ecomp-staging + + org.apache.maven.plugins maven-surefire-plugin @@ -92,7 +103,7 @@ AT&T - 1.0.0-SNAPSHOT + 1.0.0