X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fpom.xml;h=3cebf5e458dca91db1fd08bd45fb371607454f63;hb=2ad82140a88efa51cb7e9751d0b45cb0616f6b80;hp=b0697da25961e19234ef3a7f1436abe166d56ad8;hpb=95dcced8b6aa92825a2d3142bd02a48517dc5319;p=appc%2Fdeployment.git

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index b0697da..3cebf5e 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -3,14 +3,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.openecomp.appc.deployment</groupId>
+		<groupId>org.onap.appc.deployment</groupId>
 		<artifactId>installation</artifactId>
 		<version>1.3.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
-	<groupId>org.openecomp.appc.deployment</groupId>
+	<groupId>org.onap.appc.deployment</groupId>
 	<artifactId>installation-appc</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
 
@@ -18,8 +18,9 @@
 	<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
 
 	<properties>
-		<image.name>openecomp/appc-image</image.name>
-		<appc.version>${project.version}</appc.version>
+		<image.name>onap/appc-image</image.name>
+		<appc.release.version>1.3.0</appc.release.version>
+		<appc.snapshot.version>1.3.0-SNAPSHOT</appc.snapshot.version>
                 <!--This version will be over-ridden by jenkins 
                     injecting the version.properties variable file during docker build-->
 		<appc.docker.staging.version>1.0.0</appc.docker.staging.version>
@@ -62,7 +63,7 @@
 						</goals><!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/scripts</directory>
@@ -82,7 +83,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
 							<resources>
 								<resource>
 									<directory>src/main/resources</directory>
@@ -103,7 +104,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/stores</directory>
@@ -124,7 +125,7 @@
 						</goals>
 						<phase>validate</phase>
 						<configuration>
-							<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+							<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
 							<resources>
 								<resource>
 									<directory>../src/main/properties</directory>
@@ -158,7 +159,7 @@
 							</environmentVariables>
 							<arguments>
 								<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -172,7 +173,7 @@
 						<configuration>
 							<executable>find</executable>
 							<arguments>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 								<argument>-name</argument>
 								<argument>*.sh</argument>
 								<argument>-exec</argument>
@@ -216,9 +217,11 @@
 										if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
 										project.properties['dockertag1']=project.properties['ver'] + "-latest";
 										project.properties['dockertag2']="latest";
+										project.properties['appc.version']=project.properties['appc.snapshot.version'];
 										} else {
 										project.properties['dockertag1']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 										project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+										project.properties['appc.version']=project.properties['appc.release.version'];
 										}
 										println 'docker tag 1: ' + project.properties['dockertag1'];
 										println 'docker tag 2: ' + project.properties['dockertag2'];
@@ -301,7 +304,7 @@
 								</goals><!-- here the phase you need -->
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/bin</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/bin</outputDirectory>
 									<resources>
 										<resource>
 											<directory>src/main/scripts</directory>
@@ -321,7 +324,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data</outputDirectory>
 									<resources>
 										<resource>
 											<directory>src/main/resources</directory>
@@ -342,7 +345,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/stores</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/stores</outputDirectory>
 									<resources>
 										<resource>
 											<directory>../src/main/stores</directory>
@@ -363,7 +366,7 @@
 								</goals>
 								<phase>validate</phase>
 								<configuration>
-									<outputDirectory>${basedir}/target/docker-stage/opt/openecomp/appc/data/properties</outputDirectory>
+									<outputDirectory>${basedir}/target/docker-stage/opt/onap/appc/data/properties</outputDirectory>
 									<resources>
 										<resource>
 											<directory>../src/main/properties</directory>
@@ -397,7 +400,7 @@
 									</environmentVariables>
 									<arguments>
 										<argument>${basedir}/src/main/scripts/installZips.sh</argument>
-										<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+										<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 									</arguments>
 								</configuration>
 							</execution>
@@ -411,7 +414,7 @@
 								<configuration>
 									<executable>find</executable>
 									<arguments>
-										<argument>${basedir}/target/docker-stage/opt/openecomp/appc</argument>
+										<argument>${basedir}/target/docker-stage/opt/onap/appc</argument>
 										<argument>-name</argument>
 										<argument>*.sh</argument>
 										<argument>-exec</argument>
@@ -431,7 +434,7 @@
 	</profiles>
 	
 	<organization>
-		<name>openECOMP</name>
+		<name>ONAP</name>
 	</organization>
 	
 </project>