Upgraded the latest ONAP SDK

Upgraded latest ONAP SDK Code.

Change-Id: I669d6cfcefe068b1e4c078889d7d6c77ce788e2e
Issue-ID: POLICY-432
Signed-off-by: rb7147 <rb7147@att.com>

1 files changed, 72 insertions, 28 deletions

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 32cac6e92..e1497ccac 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -17,7 +17,6 @@
   limitations under the License.
   ============LICENSE_END=========================================================
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -31,14 +30,17 @@
 
 	<properties>
 		<encoding>UTF-8</encoding>
-		<epsdk.version>1.3.1</epsdk.version>
+		<epsdk.version>2.1.0-SNAPSHOT</epsdk.version>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
 		<skipassembly>true</skipassembly>
 		<!-- Tests usually require some setup that maven cannot do, so skip. -->
 		<jackson.version>2.6.0</jackson.version>
- 	    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
+		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
+		<!-- Version number gets stored only here -->
+		<tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
+		<tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
 	</properties>
 	<profiles>
 		<!-- disable doclint, a new feature in Java 8, when generating javadoc -->
@@ -96,7 +98,7 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.1</version>
 				<configuration>
-	        		<attachClasses>true</attachClasses>
+					<attachClasses>true</attachClasses>
 					<archive>
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -111,8 +113,8 @@
 							<groupId>org.onap.portal.sdk</groupId>
 							<artifactId>epsdk-app-overlay</artifactId>
 							<excludes>
-               					<exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
-           			 		</excludes>
+								<exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
+							</excludes>
 						</overlay>
 						<overlay>
 							<groupId>org.onap.policy.engine</groupId>
@@ -122,29 +124,71 @@
 				</configuration>
 			</plugin>
 			<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.0.0</version>
-					<configuration>
-						<skipAssembly>${skipassembly}</skipAssembly>
-						<descriptors>
-							<descriptor>${basedir}/distribution.xml</descriptor>
-						</descriptors>
-					</configuration>
-					<executions>
-						<execution>
-							<id>make-assembly</id>
-							<phase>package</phase>
-							<goals>
-								<goal>single</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<skipAssembly>${skipassembly}</skipAssembly>
+					<descriptors>
+						<descriptor>${basedir}/distribution.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<!-- parent specifies the<version>2.8</version> -->
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.22.0</version>
+				<configuration>
+					<verbose>true</verbose>
+					<images>
+						<image>
+							<name>onap/portal-sdk:${project.version}</name>
+							<build>
+								<from>frolvlad/alpine-oraclejdk8:slim</from>
+								<assembly>
+									<descriptorRef>artifact</descriptorRef>
+								</assembly>
+								<runCmds>
+									<!-- must be all on one line; use CDATA to turn off the Eclipse 
+										formatter -->
+									<run><![CDATA[wget -q ${tomcat.download.path}/${tomcat.download.name}.tar.gz]]></run>
+									<run>tar -xzf ${tomcat.download.name}.tar.gz</run>
+									<run>rm -f ${tomcat.download.name}.tar.gz</run>
+									<run>rm -fr ${tomcat.download.name}/webapps/[a-z]*</run>
+									<run>mkdir -p /opt</run>
+									<run>mv ${tomcat.download.name} /opt</run>
+									<run><![CDATA[mv /maven/*.war /opt/${tomcat.download.name}/webapps/ONAPPORTALSDK.war]]></run>
+								</runCmds>
+								<cmd>
+									<shell>/opt/${tomcat.download.name}/bin/catalina.sh run</shell>
+								</cmd>
+							</build>
+						</image>
+					</images>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 	<dependencies>
-	<!-- Policy overlay war -->
+		<!-- Policy overlay war -->
 		<dependency>
 			<groupId>org.onap.policy.engine</groupId>
 			<artifactId>POLICY-SDK-APP</artifactId>
@@ -202,7 +246,7 @@
 			<exclusions>
 				<exclusion>
 					<groupId>mysql</groupId>
-    				<artifactId>mysql-connector-java</artifactId>
+					<artifactId>mysql-connector-java</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -227,7 +271,7 @@
 			<artifactId>eelf-core</artifactId>
 			<version>0.0.1</version>
 		</dependency>
-	<!-- bridge to implement commons-logging using slf4j -->
+		<!-- bridge to implement commons-logging using slf4j -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>