X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=0eaae82b210db5a704b1c43b622a0b82da025da4;hb=05c024c1bdb89f2eeb812b69ec528666bb7cb743;hp=50b8cbea88eeaa973aa57a98a5c770059a0ea615;hpb=9b29076458cc42128c2bb324b43176b122ce8a0f;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 50b8cbea..0eaae82b 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -3,26 +3,25 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.sdnc.oam</groupId>
+		<groupId>org.onap.sdnc.oam</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.sdnc.oam</groupId>
+	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.3.0-SNAPSHOT</version>
 
 	<name>Installation - sdnc</name>
 	<description>Creates SDN Controller Docker container</description>
 
 	<properties>
-		<image.name>ecomp/sdnc-image</image.name>
-		<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>
+		<image.name>onap/sdnc-image</image.name>
+		<sdnc.project.version>${project.version}</sdnc.project.version>
+        <sdnc.northbound.version>1.2.2</sdnc.northbound.version>
+		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 	</properties>
 
 
@@ -30,13 +29,44 @@
 		<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 +76,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 +86,7 @@
 				<executions>
 					<execution>
 						<id>generate-images</id>
-						<phase>generate-sources</phase>
+						<phase>package</phase>
 						<goals>
 							<goal>build</goal>
 						</goals>
@@ -72,6 +103,8 @@
 				</executions>
 			</plugin>
 
+
+
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<version>2.6</version>
@@ -103,7 +136,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/bin</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/scripts</directory>
@@ -115,6 +148,7 @@
 							</resources>
 						</configuration>
 					</execution>
+
 					<execution>
 						<id>copy-tarballs</id>
 						<goals>
@@ -127,8 +161,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>
@@ -143,7 +175,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/resources</directory>
@@ -162,7 +194,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/properties</directory>
@@ -181,7 +213,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/stores</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/stores</directory>
@@ -198,6 +230,7 @@
 			<plugin>
 				<artifactId>exec-maven-plugin</artifactId>
 				<groupId>org.codehaus.mojo</groupId>
+				<version>1.5.0</version>
 				<executions>
 
 					<execution>
@@ -209,15 +242,12 @@
 						<configuration>
 							<executable>/bin/bash</executable>
 							<environmentVariables>
-								<SDNC_CORE_VERSION>${sdnc.core.version}</SDNC_CORE_VERSION>
-								<SDNC_ADAPTORS_VERSION>${sdnc.adaptors.version}</SDNC_ADAPTORS_VERSION>
 								<SDNC_NORTHBOUND_VERSION>${sdnc.northbound.version}</SDNC_NORTHBOUND_VERSION>
-								<SDNC_PLUGINS_VERSION>${sdnc.plugins.version}</SDNC_PLUGINS_VERSION>
 								<SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
 							</environmentVariables>
 							<arguments>
 								<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -231,7 +261,7 @@
 						<configuration>
 							<executable>/usr/bin/find</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 								<argument>-name</argument>
 								<argument>*.sh</argument>
 								<argument>-exec</argument>