fixed sdnc-web pom

fixed parent and also some other props sync to sdnc-image

Issue-ID: SDNC-1064
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I7807e6298da407d0e87db24e6b95b32d4655c5f7
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

Former-commit-id: b5cd53a8da9d5a4707875e97d6975097217e9545

2 files changed, 27 insertions, 77 deletions

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index bf91b5c6..1ae66ab6 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -6,7 +6,6 @@
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
 		<version>1.5.1</version>
-		<relativePath />
 	</parent>
 
 	<groupId>org.onap.sdnc.oam</groupId>
@@ -15,20 +14,19 @@
 	<packaging>pom</packaging>
 
 	<name>sdnc-oam :: installation :: ${project.artifactId}</name>
-	<description>Creates SDN Controller Docker container</description>
+	<description>Creates SDN Controller WebUI Docker container</description>
 
 	<properties>
 		<base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo>
-		<image.name>oof-pci/ccsdk-odlwt-webserver</image.name>
-		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+		<image.name>onap/sdnc-web-image</image.name>
+		<sdnc.project.version>${project.version}</sdnc.project.version>
+		<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
 		<ccsdk.groupId>org.onap.ccsdk.features.sdnr.wt</ccsdk.groupId>
 		<ccsdk.features.version>0.7.1-SNAPSHOT</ccsdk.features.version>
-		<platform-logic-installer.version>${project.version}</platform-logic-installer.version>
 		<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<docker.push.phase>deploy</docker.push.phase>
 		<docker.verbose>true</docker.verbose>
-		<ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
 	</properties>
 
 	<dependencies>
@@ -41,16 +39,16 @@
 			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
 			<artifactId>sdnr-wt-odlux-apps-installer</artifactId>
 			<version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
+			<type>zip</type>
+			<classifier>repo</classifier>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+			<artifactId>sdnr-wt-helpserver-installer</artifactId>
+			<version>${ccsdk.features.version}</version>
+			<type>zip</type>
+			<classifier>repo</classifier>
 		</dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-helpserver-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
-            <type>zip</type>
-        </dependency>
 	</dependencies>
 
 	<build>
@@ -66,7 +64,7 @@
 							<goal>execute</goal>
 						</goals>
 						<configuration>
-							<source>${basedir}/src/main/scripts/TagVersion.groovy</source>
+							<source>${basedir}/../TagVersion.groovy</source>
 						</configuration>
 					</execution>
 				</executions>
@@ -79,7 +77,7 @@
 						<id>copy-dockerfile</id>
 						<goals>
 							<goal>copy-resources</goal>
-						</goals>            <!-- here the phase you need -->
+						</goals>						<!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
 							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -98,7 +96,7 @@
 						<id>copy-siteconf</id>
 						<goals>
 							<goal>copy-resources</goal>
-						</goals>            <!-- here the phase you need -->
+						</goals>						<!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
 							<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -118,7 +116,7 @@
 						<id>copy-scripts</id>
 						<goals>
 							<goal>copy-resources</goal>
-						</goals>            <!-- here the phase you need -->
+						</goals>						<!-- here the phase you need -->
 						<phase>validate</phase>
 						<configuration>
 							<outputDirectory>${basedir}/target/docker-stage/bin</outputDirectory>
@@ -267,16 +265,16 @@
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
 									<includes>odlux/*</includes>
 								</artifactItem>
-                                <!-- helpserver resources -->
-                                <artifactItem>
-                                    <groupId>${ccsdk.groupId}</groupId>
-                                    <artifactId>sdnr-wt-helpserver-provider</artifactId>
-                                    <version>${ccsdk.features.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-                                    <includes>help/*</includes>
-                                </artifactItem>
+								<!-- helpserver resources -->
+								<artifactItem>
+									<groupId>${ccsdk.groupId}</groupId>
+									<artifactId>sdnr-wt-helpserver-provider</artifactId>
+									<version>${ccsdk.features.version}</version>
+									<type>jar</type>
+									<overWrite>false</overWrite>
+									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
+									<includes>help/*</includes>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
@@ -323,12 +321,5 @@
 				</executions>
 			</plugin>
 		</plugins>
-		<extensions>
-			<extension><!-- this extension is required by wagon in order to pass the proxy -->
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-http-lightweight</artifactId>
-				<version>2.2</version>
-			</extension>
-		</extensions>
 	</build>
 </project>
diff --git a/installation/sdnc-web/src/main/scripts/TagVersion.groovy b/installation/sdnc-web/src/main/scripts/TagVersion.groovy
deleted file mode 100644
index 16880561..00000000
--- a/installation/sdnc-web/src/main/scripts/TagVersion.groovy
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CCSDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.ccsdk.distribution
-
-
-def versionArray;
-if ( project.properties['ccsdk.features.version'] != null ) {
-	versionArray = project.properties['ccsdk.features.version'].split('\\.');
-}
-
-if ( project.properties['ccsdk.features.version'].endsWith("-SNAPSHOT") ) {
-	patchArray = versionArray[2].split('-');
-	project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
-	project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest";
-	project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp'];
-} else {
-	project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
-	project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest";
-	project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp'];
-}