From 43a582e191786fac59b16e5651e387a0558e484f Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
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) <dtimoney@att.com>
---
 opendaylight/fluorine/fluorine-alpine/pom.xml | 28 ++---------------------
 opendaylight/fluorine/fluorine-ubuntu/pom.xml | 27 ++--------------------
 opendaylight/fluorine/pom.xml                 | 32 +++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 53 deletions(-)

(limited to 'opendaylight/fluorine')

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 @@
 	<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 b1a9191b..13e01743 100644
--- 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 8d4fa4bf..29f88f57 100644
--- 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>
-- 
cgit 1.2.3-korg