X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fadmportal%2Fpom.xml;h=909b271a08faf04cbff9e899618b26d9a411533a;hb=598c74334c8403f14bbe2a25c18e3a286dbd9e35;hp=1f5c420177004d41517ca5796b63019b30fe9573;hpb=8f77351687ce1bb10420c97ce40dd9fb73e6bd06;p=sdnc%2Foam.git

diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 1f5c4201..909b271a 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -3,22 +3,22 @@
 	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.1.0-SNAPSHOT</version>
+		<version>1.2.1-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-admportal</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.1-SNAPSHOT</version>
 
 	<name>Installation - admportal</name>
 	<description>Creates admportal Docker container</description>
 
 	<properties>
-		<image.name>openecomp/admportal-sdnc-image</image.name>
+		<image.name>onap/admportal-sdnc-image</image.name>
 		<sdnc.project.version>${project.version}</sdnc.project.version>
 	</properties>
 
@@ -40,19 +40,14 @@
 								println project.properties['sdnc.project.version'];
 								def versionArray;
 								if ( project.properties['sdnc.project.version'] != null ) {
-								versionArray =
-								project.properties['sdnc.project.version'].split('\\.');
+									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] + "-SNAPSHOT-latest";
+								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";
+									project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
 								}
 
 								println 'New Tag for docker:' +
@@ -77,6 +72,7 @@
 								<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
 								<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
 								<tags>
+									<tag>${project.version}</tag>
 									<tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
 									<tag>${project.docker.latesttag.version}</tag>
 								</tags>
@@ -134,7 +130,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>
@@ -164,7 +160,7 @@
 							<executable>/usr/bin/unzip</executable>
 							<arguments>
 								<argument>-d</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
 								<argument>../../admportal/target/*.zip</argument>
 							</arguments>
 						</configuration>
@@ -180,7 +176,7 @@
 							<executable>/bin/cp</executable>
 							<arguments>
 								<argument>../../admportal/config/admportal.json</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -195,7 +191,7 @@
 							<executable>/bin/cp</executable>
 							<arguments>
 								<argument>../../admportal/config/admportal.log4js.json</argument>
-								<argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+								<argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
 							</arguments>
 						</configuration>
 					</execution>
@@ -210,7 +206,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>