X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=960d43187c67672d70a96a5c777422db07fe19e3;hb=47020692951a42b1dae10283a0eb9110dbce4916;hp=6db2fd5dd054522aa81be8bace5aeda41adfbdfd;hpb=5771678a73418d4e424ec184e20db74bbb4297a6;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 6db2fd5d..960d4318 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -5,38 +5,89 @@
 	<parent>
 		<groupId>org.openecomp.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.0.0</version>
+		<version>1.1.1-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.0.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 
 	<name>Installation - sdnc</name>
 	<description>Creates SDN Controller Docker container</description>
 
 	<properties>
-		<image.name>ecomp/sdnc-image</image.name>
+		<image.name>openecomp/sdnc-image</image.name>
+		<sdnc.project.version>${project.version}</sdnc.project.version>
 		<sdnc.core.version>${project.version}</sdnc.core.version>
 		<sdnc.adaptors.version>${project.version}</sdnc.adaptors.version>
 		<sdnc.northbound.version>${project.version}</sdnc.northbound.version>
 		<sdnc.plugins.version>${project.version}</sdnc.plugins.version>
+		<sdnc.opendaylight.version>0.5.1-Boron-SR1</sdnc.opendaylight.version>
+		<sdnc.mysql-connector-java.version>5.1.39</sdnc.mysql-connector-java.version>
+		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.opendaylight.integration</groupId>
+				<artifactId>distribution-karaf</artifactId>
+				<version>${sdnc.opendaylight.version}</version>
+				<type>tar.gz</type>
+			</dependency>
+			<dependency>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+				<version>${sdnc.mysql-connector-java.version}</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
 	<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>
@@ -46,7 +97,8 @@
 								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 								<tags>
 									<tag>${project.version}</tag>
-									<tag>latest</tag>
+									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
 							</build>
 						</image>
@@ -55,7 +107,7 @@
 				<executions>
 					<execution>
 						<id>generate-images</id>
-						<phase>generate-sources</phase>
+						<phase>package</phase>
 						<goals>
 							<goal>build</goal>
 						</goals>
@@ -72,6 +124,69 @@
 				</executions>
 			</plugin>
 
+
+			<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-dependency-plugin</artifactId>
+			<version>3.0.0</version>
+			<executions>
+				<execution>
+					<id>get-odl-distribution</id>
+					<phase>validate</phase>
+					<goals>
+						<goal>copy</goal>
+					</goals>
+					<configuration>
+						<artifactItems>
+							<artifactItem>
+								<groupId>org.opendaylight.integration</groupId>
+								<artifactId>distribution-karaf</artifactId>
+								<version>${sdnc.opendaylight.version}</version>
+								<type>tar.gz</type>
+
+								<overWrite>true</overWrite>
+								<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+							</artifactItem>
+						</artifactItems>
+						<overWriteReleases>false</overWriteReleases>
+						<overWriteSnapshots>true</overWriteSnapshots>
+						<overWriteIfNewer>true</overWriteIfNewer>
+					</configuration>
+				</execution>
+			</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.0</version>
+				<executions>
+					<execution>
+						<id>get-mysql-connector-jar</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>mysql</groupId>
+									<artifactId>mysql-connector-java</artifactId>
+									<version>${sdnc.mysql-connector-java.version}</version>
+									<type>jar</type>
+
+									<overWrite>true</overWrite>
+									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
+							<overWriteIfNewer>true</overWriteIfNewer>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.6</version>
@@ -115,6 +230,7 @@
 							</resources>
 						</configuration>
 					</execution>
+
 					<execution>
 						<id>copy-tarballs</id>
 						<goals>
@@ -127,8 +243,6 @@
 								<resource>
 									<directory>src/main/resources</directory>
 									<includes>
-										<include>*.tgz</include>
-										<include>*.tar.gz</include>
 										<include>idmlight.db.mv.db</include>
 									</includes>
 									<filtering>false</filtering>
@@ -198,6 +312,7 @@
 			<plugin>
 				<artifactId>exec-maven-plugin</artifactId>
 				<groupId>org.codehaus.mojo</groupId>
+				<version>1.5.0</version>
 				<executions>
 
 					<execution>