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) <dtimoney@att.com>

diff --git a/alpine/pom.xml b/alpine/pom.xml
index 3aebe95..61d3b08 100644 (file)
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-alpine</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: alpine</name>

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 6fa0cb7..4d49aea 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -4,14 +4,14 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1</version>
+               <version>1.2.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>ansible-server</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
 
        <name>ccsdk :: distribution :: ${project.artifactId}</name>
        <description>Creates ansible-server Docker container</description>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 33ac0d2..023fc20 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>dependencies</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution:: dependencies</name>

diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml
index 2bb0484..124551e 100644 (file)
--- a/dgbuilder-docker/pom.xml
+++ b/dgbuilder-docker/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder-docker</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder-docker</name>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 31ee9ba..b6b460e 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -5,12 +5,12 @@
        <parent>
             <groupId>org.onap.ccsdk.distribution</groupId>
             <artifactId>distribution-root</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
+            <version>0.4.2-SNAPSHOT</version>
         </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-dgbuilder</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: dgbuilder</name>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 803441f..14af773 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1</version>
+               <version>1.2.2-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-odlsli-alpine</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: odlsli-alpine</name>

diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index 0c01961..3dd9ed9 100644 (file)
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.2.1</version>
+               <version>1.2.2-SNAPSHOT</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.distribution</groupId>
        <artifactId>distribution-odlsli-ubuntu</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: odlsli-ubuntu</name>

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 89d3fc2..bce6956 100644 (file)
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli</name>

diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml
index 56c3c74..ef33e37 100644 (file)
--- a/opendaylight/fluorine/fluorine-alpine/pom.xml
+++ b/opendaylight/fluorine/fluorine-alpine/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-odl-fluorine</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-odl-fluorine-alpine</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
@@ -20,31 +20,7 @@
 
        <properties>
                <image.name>onap/ccsdk-odl-fluorine-alpine-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.opendaylight.version>0.9.1</ccsdk.opendaylight.version>
-               <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <docker.push.phase>deploy</docker.push.phase>
        </properties>
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.opendaylight.integration</groupId>
-                               <artifactId>karaf</artifactId>
-                               <version>${ccsdk.opendaylight.version}</version>
-                               <type>tar.gz</type>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.mariadb.jdbc</groupId>
-                               <artifactId>mariadb-java-client</artifactId>
-                               <version>${ccsdk.mariadb-connector-java.version}</version>
-                               <type>jar</type>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <build>
                <plugins>
 

diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
index b1a9191..13e0174 100644 (file)
--- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml
+++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-odl-fluorine</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-odl-fluorine-ubuntu</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
@@ -20,31 +20,8 @@
 
        <properties>
                <image.name>onap/ccsdk-odl-fluorine-ubuntu-image</image.name>
-               <ccsdk.project.version>${project.version}</ccsdk.project.version>
-               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-               <ccsdk.opendaylight.version>0.9.1</ccsdk.opendaylight.version>
-               <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
-               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
-               <docker.push.phase>deploy</docker.push.phase>
        </properties>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.opendaylight.integration</groupId>
-                               <artifactId>karaf</artifactId>
-                               <version>${ccsdk.opendaylight.version}</version>
-                               <type>tar.gz</type>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.mariadb.jdbc</groupId>
-                               <artifactId>mariadb-java-client</artifactId>
-                               <version>${ccsdk.mariadb-connector-java.version}</version>
-                               <type>jar</type>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
        <build>
                <plugins>
 

diff --git a/opendaylight/fluorine/pom.xml b/opendaylight/fluorine/pom.xml
index 8d4fa4b..29f88f5 100644 (file)
--- a/opendaylight/fluorine/pom.xml
+++ b/opendaylight/fluorine/pom.xml
@@ -5,15 +5,43 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-odl-fluorine</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>
     <description>Creates OpenDaylight container</description>
+    
+    <properties>
+               <ccsdk.project.version>${project.version}</ccsdk.project.version>
+               <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+               <ccsdk.opendaylight.version>0.9.2</ccsdk.opendaylight.version>
+               <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
+               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+               <docker.push.phase>deploy</docker.push.phase>
+    </properties>
+    
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.opendaylight.integration</groupId>
+                               <artifactId>karaf</artifactId>
+                               <version>${ccsdk.opendaylight.version}</version>
+                               <type>tar.gz</type>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.mariadb.jdbc</groupId>
+                               <artifactId>mariadb-java-client</artifactId>
+                               <version>${ccsdk.mariadb-connector-java.version}</version>
+                               <type>jar</type>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+
+
 
     <modules>
            <module>fluorine-ubuntu</module>

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 93efd67..901a754 100644 (file)
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-opendaylight</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: opendaylight</name>

diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml
index e4cacf7..3f723eb 100644 (file)
--- a/platform-logic/asdc-api/pom.xml
+++ b/platform-logic/asdc-api/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-asdcapi</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index 351c40a..f56d854 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-platform-logic</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>platform-logic-installer</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index e307430..f7517fe 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-root</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>distribution-platform-logic</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic</name>

diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml
index c8a7a12..6b501b6 100644 (file)
--- a/platform-logic/sliapi/pom.xml
+++ b/platform-logic/sliapi/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.onap.ccsdk.distribution</groupId>
                <artifactId>distribution-platform-logic</artifactId>
-               <version>0.4.1-SNAPSHOT</version>
+               <version>0.4.2-SNAPSHOT</version>
        </parent>
 
        <artifactId>platform-logic-sliapi</artifactId>
-       <version>0.4.1-SNAPSHOT</version>
+       <version>0.4.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-distribution :: platform-logic :: ${project.artifactId}</name>

diff --git a/pom.xml b/pom.xml
index f386139..6e51c5a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-root</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution</name>

diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index b6d2701..036d616 100644 (file)
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>saltstack-server</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: saltstack-server</name>

diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml
index c4f53b2..2c18f25 100644 (file)
--- a/ubuntu/pom.xml
+++ b/ubuntu/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+        <version>0.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>distribution-ubuntu</artifactId>
-    <version>0.4.1-SNAPSHOT</version>
+    <version>0.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: ubuntu</name>

diff --git a/version.properties b/version.properties
index b1967d0..1c98ae9 100644 (file)
--- 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}