X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc-web%2Fpom.xml;h=1b9e37de1b04b1730e5f4bb678e0da2a01a0c5b8;hb=e7844f3fc813e4e5eb3b4070830d17561e044b6e;hp=bf91b5c60de54a4102d2b9850b35cb80f4d4a7a7;hpb=6e68f5541aaf92e584d656958ec6e1bf3898581d;p=sdnc%2Foam.git

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index bf91b5c6..1b9e37de 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -5,30 +5,28 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.5.1</version>
-		<relativePath />
+		<version>1.5.2</version>
 	</parent>
 
 	<groupId>org.onap.sdnc.oam</groupId>
 	<artifactId>installation-sdnc-web</artifactId>
-	<version>1.8.0-SNAPSHOT</version>
+	<version>1.8.1-SNAPSHOT</version>
 	<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>
+		<ccsdk.features.version>0.7.3-SNAPSHOT</ccsdk.features.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>
@@ -155,7 +153,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- connectApp -->
 								<artifactItem>
@@ -165,7 +163,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- eventLogApp -->
 								<artifactItem>
@@ -175,7 +173,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- helpApp -->
 								<artifactItem>
@@ -185,7 +183,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- maintenanceApp -->
 								<artifactItem>
@@ -195,7 +193,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- minimumApp -->
 								<artifactItem>
@@ -205,7 +203,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- configurationApp -->
 								<artifactItem>
@@ -215,7 +213,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- demoApp -->
 								<artifactItem>
@@ -225,7 +223,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- faultApp -->
 								<artifactItem>
@@ -245,7 +243,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- mediatorApp -->
 								<artifactItem>
@@ -255,7 +253,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- performanceHistoryApp -->
 								<artifactItem>
@@ -265,18 +263,18 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<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>