From 64df1992abb2d2df93dc8044c739befe7d0982d2 Mon Sep 17 00:00:00 2001
From: Prudence Au <prudence.au@amdocs.com>
Date: Sun, 12 Aug 2018 09:52:28 -0400
Subject: trying to fix a runtime issue

Change-Id: Icb0e6dda81a3d8d12211d197183a8fbfafd642f8
Issue-ID: LOG-519
Signed-off-by: Prudence Au <prudence.au@amdocs.com>
---
 pom.xml | 271 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 140 insertions(+), 131 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 4c6a712..dff8988 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,9 @@
 		<java.version>1.8</java.version>
 		<dmaap.client.version>1.1.5</dmaap.client.version>
 		<aai.rest.client.version>1.2.1</aai.rest.client.version>
-		<!--docker-->
-        <docker.tag>${project.version}-${timestamp}</docker.tag>
-        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
-        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+		<!--docker -->
+		<docker.tag>${project.version}-${timestamp}</docker.tag>
+		<docker.latest.tag>${project.version}-latest</docker.latest.tag>
 	</properties>
 
 	<dependencyManagement>
@@ -183,133 +181,144 @@
 		<profile>
 			<id>docker</id>
 			<build>
-			<plugins>
-				<plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>0.19.1</version>
-            <configuration>
-                <verbose>true</verbose>
-                <apiVersion>1.23</apiVersion>
-                <images>
-                    <image>
-                        <name>onap/${project.artifactId}</name>
-                        <alias>${project.artifactId}</alias>
-                        <build>
-                            <cleanup>try</cleanup>
-                            <dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir>
-                            <tags>
-                                <tag>${docker.snapshot.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                        </build>
-                    </image>
-                </images>
-            </configuration>
-            <executions>
-			<execution>
-				<id>generate-images</id>
-                <phase>generate-sources</phase>
-                <goals>
-              		<goal>build</goal>
-                </goals>
-            </execution>
-            <execution>
-				<id>push-images</id>
-              	<phase>deploy</phase>
-              	<goals>
-               		<goal>build</goal>
-                    <goal>push</goal>
- 				</goals>
-			</execution>
-		</executions>
-	</plugin>
-  	<plugin>
-		<artifactId>maven-resources-plugin</artifactId>
-		<version>2.6</version>
-		<executions>
-			<execution>
-				<id>copy-dockerfile</id>
-					<goals>
-						<goal>copy-resources</goal>
-					</goals><!-- here the phase you need -->
-					<phase>package</phase>
+				<plugins>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>0.19.1</version>
 						<configuration>
-							<outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docker</directory>
-									<includes>
-										<include>Dockerfile</include>
-									</includes>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-properties</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>validate</phase>
-						<configuration>
-							<outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory>
-							<resources>
-								<resource>
-									<directory>config</directory>
-									<includes>
-										<include>*.properties</include>
-										<include>builders/*.properties</include>
-										<include>*.xml</include>
-									</includes>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
+							<verbose>true</verbose>
+							<apiVersion>1.23</apiVersion>
+							<images>
+								<image>
+									<name>onap/${project.artifactId}</name>
+									<alias>${project.artifactId}</alias>
+									<build>
+										<cleanup>try</cleanup>
+										<dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir>
+										<tags>
+											<tag>${docker.snapshot.tag}</tag>
+											<tag>${docker.latest.tag}</tag>
+										</tags>
+									</build>
+								</image>
+							</images>
 						</configuration>
-					</execution>
-					<execution>
-						<id>copy-script</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/docker</directory>
-									<includes>
-										<include>*.sh</include>
-									</includes>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-jar</id>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
-							<resources>
-								<resource>
-									<directory>target</directory>
-									<includes>
-										<include>*.jar</include>
-									</includes>
-									<filtering>false</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-        </plugins>
-        </build>
-        </profile>
+						<executions>
+							<execution>
+								<id>generate-images</id>
+								<phase>generate-sources</phase>
+								<goals>
+									<goal>build</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>push-images</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>build</goal>
+									<goal>push</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.springframework.boot</groupId>
+						<artifactId>spring-boot-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<goals>
+									<goal>repackage</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-resources-plugin</artifactId>
+						<version>2.6</version>
+						<executions>
+							<execution>
+								<id>copy-dockerfile</id>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals><!-- here the phase you need -->
+								<phase>package</phase>
+								<configuration>
+									<outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>
+									<resources>
+										<resource>
+											<directory>src/main/docker</directory>
+											<includes>
+												<include>Dockerfile</include>
+											</includes>
+											<filtering>true</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-properties</id>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<phase>validate</phase>
+								<configuration>
+									<outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory>
+									<resources>
+										<resource>
+											<directory>config</directory>
+											<includes>
+												<include>*.properties</include>
+												<include>builders/*.properties</include>
+												<include>*.xml</include>
+											</includes>
+											<filtering>false</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-script</id>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<phase>package</phase>
+								<configuration>
+									<outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
+									<resources>
+										<resource>
+											<directory>src/main/docker</directory>
+											<includes>
+												<include>*.sh</include>
+											</includes>
+											<filtering>false</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-jar</id>
+								<goals>
+									<goal>copy-resources</goal>
+								</goals>
+								<phase>package</phase>
+								<configuration>
+									<outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
+									<resources>
+										<resource>
+											<directory>target</directory>
+											<includes>
+												<include>*.jar</include>
+											</includes>
+											<filtering>false</filtering>
+										</resource>
+									</resources>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file
-- 
cgit 1.2.3-korg