1 files changed, 215 insertions, 176 deletions
diff --git a/ccsdk-app-os/pom.xml b/ccsdk-app-os/pom.xml
index 7bd73e6..4e7df3e 100644
--- a/ccsdk-app-os/pom.xml
+++ b/ccsdk-app-os/pom.xml
@@ -1,176 +1,215 @@
-<?xml version="1.0"?>
-<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>
-
-	<groupId>org.onap.ccsdk.dashboard</groupId>
-	<artifactId>ccsdk-app-os</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>war</packaging>
-	<name>ONAP Operations Manager Dashboard app</name>
-	<description>CCSDK Dashboard Web Application for external release</description>
-
-	<properties>
-		<encoding>UTF-8</encoding>
-		<springframework.version>4.2.0.RELEASE</springframework.version>
-		<hibernate.version>4.3.11.Final</hibernate.version>
-		<epsdk.version>2.5.1</epsdk.version>
-		<ccsdk.version>1.1.0-SNAPSHOT</ccsdk.version>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
-		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
-		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<!-- supplied by Jenkins server -->
-		<build.version>${project.version}</build.version>
-		<!-- Tests usually require some setup that maven cannot do, so skip. -->
-		<skiptests>true</skiptests>
-	</properties>
-
-	<repositories>
-		<repository>
-			<!-- Releases repository has ECOMP release artifacts -->
-			<id>onap-releases</id>
-			<name>ONAP - Release Repository</name>
-			<url>${nexusproxy}/${releaseNexusPath}</url>
-		</repository>
-		<repository>
-			<!-- Snapshots repository has ECOMP snapshot artifacts -->
-			<id>onap-snapshots</id>
-			<name>ONAP - Snapshot Repository</name>
-			<url>${nexusproxy}/${snapshotNexusPath}</url>
-		</repository>
-		<repository>
-			<!-- Staging repository has ECOMP release staging artifacts -->
-			<id>onap-staging</id>
-			<name>ONAP - Staging Repository</name>
-			<url>${nexusproxy}${stagingNexusPath}</url>
-		</repository>
-	</repositories>
-
-	<build>
-
-		<!-- War files are labeled with build information, not POM version -->
-		<finalName>${project.artifactId}-${build.version}</finalName>
-
-		<plugins>
-			<!-- Compile to Java 1.8 class output format -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>3.0.0</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-						<manifestEntries>
-							<Build-Number>${build.version}</Build-Number>
-							<Build-Time>${maven.build.timestamp}</Build-Time>
-						</manifestEntries>
-					</archive>
-					<overlays>
-						<overlay>
-							<groupId>org.onap.ccsdk.dashboard</groupId>
-							<artifactId>ccsdk-app-overlay</artifactId>
-						</overlay>
-						<overlay>
-							<groupId>org.onap.portal.sdk</groupId>
-							<artifactId>epsdk-app-overlay</artifactId>
-							<excludes>
-								<exclude>app/fusionapp/**</exclude>
-								<exclude>app/fusion/ase/**</exclude>
-								<exclude>app/fusion/external/angular-1.5/**</exclude>
-								<exclude>app/fusion/external/gis/**</exclude>
-								<exclude>app/fusion/external/leaflet-0.7.3/**</exclude>
-								<exclude>app/fusion/external/lodash/**</exclude>
-								<exclude>app/fusion/external/samples/**</exclude>
-								<exclude>app/fusion/external/showdown/**</exclude>
-								<exclude>app/fusion/notebook-integration/**</exclude>
-								<exclude>static/fusion/sample/**</exclude>
-								<exclude>static/fusion/raptor/**</exclude>
-							</excludes>
-						</overlay>
-					</overlays>
-				</configuration>
-			</plugin>
-			<!-- no deployment needed -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<dependencies>
-		<!-- ECD webapp resources -->
-		<dependency>
-			<groupId>org.onap.ccsdk.dashboard</groupId>
-			<artifactId>ccsdk-app-overlay</artifactId>
-			<version>${ccsdk.version}</version>
-			<type>war</type>
-		</dependency>
-		<!-- ECD webapp controllers -->
-		<dependency>
-			<groupId>org.onap.ccsdk.dashboard</groupId>
-			<artifactId>ccsdk-app-common</artifactId>
-			<version>${ccsdk.version}</version>
-		</dependency>
-		<!-- SDK webapp resources -->
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-app-overlay</artifactId>
-			<version>${epsdk.version}</version>
-			<type>war</type>
-		</dependency>
-		<!-- SDK webapp controllers -->
-		<dependency>
-			<groupId>org.onap.portal.sdk</groupId>
-			<artifactId>epsdk-app-common</artifactId>
-			<version>${epsdk.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.onap.portal.sdk</groupId>
-					<artifactId>epsdk-analytics</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.onap.portal.sdk</groupId>
-					<artifactId>epsdk-workflow</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>mysql</groupId>
-					<artifactId>mysql-connector-java</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.elasticsearch</groupId>
-					<artifactId>elasticsearch</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.quartz-scheduler</groupId>
-					<artifactId>quartz</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.drools</groupId>
-					<artifactId>drools-compiler</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.searchbox</groupId>
-					<artifactId>jest</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-</project>
+<?xml version="1.0"?>
+<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>
+	<!--  
+	<parent>
+		<groupId>org.onap.ccsdk.dashboard</groupId>
+		<artifactId>ccsdk-app-parent</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+	-->
+	<groupId>org.onap.ccsdk.dashboard</groupId>
+	<artifactId>ccsdk-app-os</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<name>ONAP Operations Manager Dashboard app</name>
+	<description>CCSDK Dashboard Web Application for external release</description>
+
+	<properties>
+		<encoding>UTF-8</encoding>
+		<springframework.version>4.3.22.RELEASE</springframework.version>
+		<hibernate.version>4.3.11.Final</hibernate.version>
+		<epsdk.version>2.5.1-SNAPSHOT</epsdk.version>
+		<ccsdk.version>1.1.0-SNAPSHOT</ccsdk.version>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+		<!-- supplied by Jenkins server -->
+		<build.version>${project.version}</build.version>
+		<!-- Tests usually require some setup that maven cannot do, so skip. -->
+		<skiptests>true</skiptests>
+		<docker.image.name>onap/org.onap.ccsdk.dashboard</docker.image.name>
+	</properties>
+
+	<repositories>
+		<repository>
+			<!-- Releases repository has ECOMP release artifacts -->
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
+		</repository>
+		<repository>
+			<!-- Snapshots repository has ECOMP snapshot artifacts -->
+			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
+		</repository>
+		<repository>
+			<!-- Staging repository has ECOMP release staging artifacts -->
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>${nexusproxy}${stagingNexusPath}</url>
+		</repository>
+	</repositories>
+
+	<build>
+
+		<!-- War files are labeled with build information, not POM version -->
+		<finalName>${project.artifactId}-${build.version}</finalName>
+
+		<plugins>
+			<!-- Compile to Java 1.8 class output format -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>3.0.0</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<manifestEntries>
+							<Build-Number>${build.version}</Build-Number>
+							<Build-Time>${maven.build.timestamp}</Build-Time>
+						</manifestEntries>
+					</archive>
+					<overlays>
+						<overlay>
+							<groupId>org.onap.ccsdk.dashboard</groupId>
+							<artifactId>ccsdk-app-overlay</artifactId>
+						</overlay>
+						<overlay>
+							<groupId>org.onap.portal.sdk</groupId>
+							<artifactId>epsdk-app-overlay</artifactId>
+							<excludes>
+								<exclude>app/fusionapp/**</exclude>
+								<exclude>app/fusion/ase/**</exclude>
+								<exclude>app/fusion/external/angular-1.5/**</exclude>
+								<exclude>app/fusion/external/gis/**</exclude>
+								<exclude>app/fusion/external/leaflet-0.7.3/**</exclude>
+								<exclude>app/fusion/external/lodash/**</exclude>
+								<exclude>app/fusion/external/samples/**</exclude>
+								<exclude>app/fusion/external/showdown/**</exclude>
+								<exclude>app/fusion/external/b2b/**</exclude>
+								<exclude>app/fusion/notebook-integration/**</exclude>
+								<exclude>static/fusion/sample/**</exclude>
+								<exclude>static/fusion/raptor/**</exclude>
+								<exclude>static/fusion/css/**</exclude>
+								<exclude>static/fusion/d3/**</exclude>
+								<exclude>static/fusion/js/**</exclude>
+								<exclude>static/fusion/gis/**</exclude>
+								<exclude>app/fusion/styles/att_angular_gridster/**</exclude>
+								<exclude>app/fusion/styles/layout/**</exclude>
+								<exclude>app/fusion/styles/workflows/**</exclude>
+								<exclude>ngapp/**</exclude>
+							</excludes>
+						</overlay>
+					</overlays>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>dockerfile-maven-plugin</artifactId>
+				<version>1.4.10</version>
+				  <executions>
+				    <execution>
+				      <id>default</id>
+				      <goals>
+				        <goal>build</goal>
+				        <goal>push</goal>
+				      </goals>
+				    </execution>
+				  </executions>
+				  <configuration>
+				  	<repository>${onap.nexus.dockerregistry.daily}</repository>
+				  	<dockerfile>Dockerfile</dockerfile>
+				    <repository>${docker.image.name}</repository>
+				    <tag>latest</tag>
+				    <buildArgs>
+				      <WAR_FILE>${project.build.finalName}.war</WAR_FILE>
+				    </buildArgs>
+				  </configuration>
+			</plugin>
+			<!-- no deployment needed -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<!-- ECD webapp resources -->
+		<dependency>
+			<groupId>org.onap.ccsdk.dashboard</groupId>
+			<artifactId>ccsdk-app-overlay</artifactId>
+			<version>${ccsdk.version}</version>
+			<type>war</type>
+		</dependency>
+		<!-- ECD webapp controllers -->
+		<dependency>
+			<groupId>org.onap.ccsdk.dashboard</groupId>
+			<artifactId>ccsdk-app-common</artifactId>
+			<version>${ccsdk.version}</version>
+		</dependency>
+		<!-- SDK webapp resources -->
+		<dependency>
+			<groupId>org.onap.portal.sdk</groupId>
+			<artifactId>epsdk-app-overlay</artifactId>
+			<version>${epsdk.version}</version>
+			<type>war</type>
+		</dependency>
+		<!-- SDK webapp controllers -->
+		<dependency>
+			<groupId>org.onap.portal.sdk</groupId>
+			<artifactId>epsdk-app-common</artifactId>
+			<version>${epsdk.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.onap.portal.sdk</groupId>
+					<artifactId>epsdk-analytics</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.onap.portal.sdk</groupId>
+					<artifactId>epsdk-workflow</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>mysql</groupId>
+					<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch</groupId>
+					<artifactId>elasticsearch</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.quartz-scheduler</groupId>
+					<artifactId>quartz</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.drools</groupId>
+					<artifactId>drools-compiler</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>io.searchbox</groupId>
+					<artifactId>jest</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+</project>