From: da490c <dave.adams@amdocs.com>
Date: Thu, 29 Mar 2018 16:53:30 +0000 (-0400)
Subject: Add war and scripts to docker gen
X-Git-Tag: v1.2.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F40223%2F1;p=aai%2Fsparky-be.git

Add war and scripts to docker gen

Issue-ID: AAI-961
Change-Id: I795098b96f3ebc49f040425fedf174daa0a634d0
Signed-off-by: da490c <dave.adams@amdocs.com>
---

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index aa25dfb..646b8e3 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -389,12 +389,14 @@
 					</folders>
 				</configuration>
 			</plugin>
+			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
 				<executions>
 					<execution>
-						<id>copy-docker-file</id>
+						<id>copy-docker-file-to-target</id>
 						<phase>package</phase>
 						<goals>
 							<goal>copy-resources</goal>
@@ -410,8 +412,33 @@
 										<include>**/*</include>
 									</includes>
 								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>copy-scripts-to-target</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/scripts</outputDirectory>
+							<overwrite>true</overwrite>
+							<resources>
 								<resource>
-									<directory>${basedir}/src/main/bin/</directory>
+									<directory>${basedir}/src/main/scripts</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>**/*</include>
+									</includes>
 								</resource>
 							</resources>
 						</configuration>
@@ -419,15 +446,16 @@
 				</executions>
 			</plugin>
 
-			<plugin>
+ 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.0.0</version>
 				<executions>
 					<execution>
-						<id>copy-installed</id>
+						<id>copy-war-to-target</id>
 						<phase>install</phase>
 						<goals>
-							<goal>copy</goal>
+							<goal>unpack</goal>
 						</goals>
 						<configuration>
 							<artifactItems>
@@ -436,15 +464,14 @@
 									<artifactId>${frontEndArtifactId}</artifactId>
 									<version>${frontEndVersion}</version>
 									<type>war</type>
-									<outputDirectory>${basedir}/target/</outputDirectory>
-									<destFileName>aai.war</destFileName>
+									<outputDirectory>${basedir}/target/static/</outputDirectory>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
-
+			</plugin>			
+			
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>