From: Dan Timoney <dtimoney@att.com>
Date: Tue, 3 Mar 2020 13:24:56 +0000 (+0000)
Subject: Merge "fixed missing resource files"
X-Git-Tag: 1.8.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0b8a99ca87c6cb18d769ee0d338f09b6f2ab3ebf;hp=bea938e72991786e13566d9df66b24a102442495;p=sdnc%2Foam.git

Merge "fixed missing resource files"

Former-commit-id: f2d34bebd098f4c051f5d56979f01b8518ec5f03
---

diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml
index 1ae66ab6..45aa9dba 100644
--- a/installation/sdnc-web/pom.xml
+++ b/installation/sdnc-web/pom.xml
@@ -153,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>
@@ -163,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>
@@ -173,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>
@@ -183,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>
@@ -193,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>
@@ -203,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>
@@ -213,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>
@@ -223,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>
@@ -243,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>
@@ -253,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>
@@ -263,7 +263,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>odlux/*</includes>
+									<includes>odlux/**</includes>
 								</artifactItem>
 								<!-- helpserver resources -->
 								<artifactItem>
@@ -273,7 +273,7 @@
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/docker-stage/html</outputDirectory>
-									<includes>help/*</includes>
+									<includes>help/**</includes>
 								</artifactItem>
 							</artifactItems>
 						</configuration>