From 43a582e191786fac59b16e5651e387a0558e484f Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 21 Mar 2019 16:32:05 -0400 Subject: Create Fluorine SR2 based containers Create docker containers based on OpenDaylight Fluorine SR2 Change-Id: I0d0d7eeec54da77105fe8626987c8aa3049d4495 Issue-ID: CCSDK-1056 Signed-off-by: Timoney, Dan (dt5972) --- alpine/pom.xml | 4 ++-- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 4 ++-- dgbuilder-docker/pom.xml | 4 ++-- dgbuilder/pom.xml | 4 ++-- odlsli/odlsli-alpine/pom.xml | 4 ++-- odlsli/odlsli-ubuntu/pom.xml | 4 ++-- odlsli/pom.xml | 4 ++-- opendaylight/fluorine/fluorine-alpine/pom.xml | 28 ++--------------------- opendaylight/fluorine/fluorine-ubuntu/pom.xml | 27 ++-------------------- opendaylight/fluorine/pom.xml | 32 +++++++++++++++++++++++++-- opendaylight/pom.xml | 4 ++-- platform-logic/asdc-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/sliapi/pom.xml | 4 ++-- pom.xml | 4 ++-- saltstack-server/pom.xml | 4 ++-- ubuntu/pom.xml | 4 ++-- version.properties | 2 +- 20 files changed, 67 insertions(+), 86 deletions(-) diff --git a/alpine/pom.xml b/alpine/pom.xml index 3aebe954..61d3b08e 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-alpine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: alpine diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 6fa0cb7c..4d49aeaf 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.1 + 1.2.2-SNAPSHOT 4.0.0 pom org.onap.ccsdk.distribution ansible-server - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT ccsdk :: distribution :: ${project.artifactId} Creates ansible-server Docker container diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 33ac0d21..023fc20e 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.1 + 1.2.2-SNAPSHOT org.onap.ccsdk.distribution dependencies - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution:: dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 2bb04847..124551ee 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder-docker - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: dgbuilder-docker diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 31ee9ba4..b6b460e5 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: dgbuilder diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 803441f8..14af773e 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.1 + 1.2.2-SNAPSHOT org.onap.ccsdk.distribution distribution-odlsli-alpine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: odlsli-alpine diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index 0c019619..3dd9ed90 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.1 + 1.2.2-SNAPSHOT org.onap.ccsdk.distribution distribution-odlsli-ubuntu - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: odlsli-ubuntu diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 89d3fc28..bce69564 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-odlsli - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: odlsli diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml index 56c3c747..ef33e374 100644 --- a/opendaylight/fluorine/fluorine-alpine/pom.xml +++ b/opendaylight/fluorine/fluorine-alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-odl-fluorine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-odl-fluorine-alpine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: opendaylight :: ${project.artifactId} @@ -20,31 +20,7 @@ onap/ccsdk-odl-fluorine-alpine-image - ${project.version} - ${maven.build.timestamp} - 0.9.1 - 2.1.1 - ${https_proxy} - deploy - - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - - - - diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml index b1a9191b..13e01743 100644 --- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml +++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-odl-fluorine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-odl-fluorine-ubuntu - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: opendaylight :: ${project.artifactId} @@ -20,31 +20,8 @@ onap/ccsdk-odl-fluorine-ubuntu-image - ${project.version} - ${maven.build.timestamp} - 0.9.1 - 2.1.1 - ${https_proxy} - deploy - - - - org.opendaylight.integration - karaf - ${ccsdk.opendaylight.version} - tar.gz - - - org.mariadb.jdbc - mariadb-java-client - ${ccsdk.mariadb-connector-java.version} - jar - - - - diff --git a/opendaylight/fluorine/pom.xml b/opendaylight/fluorine/pom.xml index 8d4fa4bf..29f88f57 100644 --- a/opendaylight/fluorine/pom.xml +++ b/opendaylight/fluorine/pom.xml @@ -5,15 +5,43 @@ org.onap.ccsdk.distribution distribution-opendaylight - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-odl-fluorine - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: opendaylight Creates OpenDaylight container + + + ${project.version} + ${maven.build.timestamp} + 0.9.2 + 2.1.1 + ${https_proxy} + deploy + + + + + + org.opendaylight.integration + karaf + ${ccsdk.opendaylight.version} + tar.gz + + + org.mariadb.jdbc + mariadb-java-client + ${ccsdk.mariadb-connector-java.version} + jar + + + + + fluorine-ubuntu diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 93efd670..901a7549 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-opendaylight - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index e4cacf76..3f723eba 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT platform-logic-asdcapi - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 351c40aa..f56d8545 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT platform-logic-installer - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index e307430e..f7517fe7 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-platform-logic - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: platform-logic diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index c8a7a128..6b501b6a 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT platform-logic-sliapi - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index f386139f..6e51c5a2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.1 + 1.2.2-SNAPSHOT org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index b6d27010..036d6162 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT saltstack-server - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index c4f53b2f..2c18f251 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT distribution-ubuntu - 0.4.1-SNAPSHOT + 0.4.2-SNAPSHOT pom ccsdk-distribution :: ubuntu diff --git a/version.properties b/version.properties index b1967d0a..1c98ae9b 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=4 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg