From d7d10b2de8e70793708b7e82f8d52a279b473d5f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Sat, 22 Jul 2017 10:39:43 -0400
Subject: Repair missing-driver deployment problem

Add mysql connector to app POM; drop mariaDB from common POM.
Patch around epsdk-app-common POM problem of using version
1.1.0-SNAPSHOT of epsdk-* libraries.

Change-Id: I2ef021e51610e5db2235c3ef64a02bfce01a4a3b
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 dcae_dmaapbc_webapp/dbca-common/pom.xml |  6 ------
 dcae_dmaapbc_webapp/dbca-os/pom.xml     | 28 +++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/dcae_dmaapbc_webapp/dbca-common/pom.xml b/dcae_dmaapbc_webapp/dbca-common/pom.xml
index 18d45c0..b036b2a 100644
--- a/dcae_dmaapbc_webapp/dbca-common/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-common/pom.xml
@@ -136,12 +136,6 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.3.5</version>
 		</dependency>
-		<!-- Use Mariadb connector/j for failover -->
-		<dependency>
-			<groupId>org.mariadb.jdbc</groupId>
-			<artifactId>mariadb-java-client</artifactId>
-			<version>1.5.8</version>
-		</dependency>
 		<!-- Mapper -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml
index a13d293..5921b60 100644
--- a/dcae_dmaapbc_webapp/dbca-os/pom.xml
+++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml
@@ -57,9 +57,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.0.0</version>
+				<version>3.1.0</version>
 				<configuration>
 					<archive>
+						<addMavenDescriptor>true</addMavenDescriptor>
 						<manifest>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
@@ -72,6 +73,9 @@
 						<overlay>
 							<groupId>org.openecomp.ui.dmaapbc</groupId>
 							<artifactId>dmaap-bc-app-overlay</artifactId>
+							<excludes>
+								<exclude>META-INF/MANIFEST.MF</exclude>
+							</excludes>
 						</overlay>
 						<overlay>
 							<groupId>org.openecomp.ecompsdkos</groupId>
@@ -88,8 +92,9 @@
 								<exclude>app/fusion/notebook-integration/**</exclude>
 								<exclude>static/fusion/**</exclude>
 								<exclude>static/js/**</exclude>
-								<exclude>WEB-INF/fusion/jsp/**</exclude>
+								<exclude>META-INF/MANIFEST.MF</exclude>
 								<exclude>WEB-INF/fusion/raptor/**</exclude>
+								<!-- do NOT exclude WEB-INF/fusion/jsp -->
 							</excludes>
 						</overlay>
 					</overlays>
@@ -139,15 +144,26 @@
 			<version>${epsdk.version}</version>
 			<type>war</type>
 		</dependency>
+		<!-- epsdk-app-core has dependency on analytics -->
+		<dependency>
+			<groupId>org.openecomp.ecompsdkos</groupId>
+			<artifactId>epsdk-analytics</artifactId>
+			<version>${epsdk.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.openecomp.ecompsdkos</groupId>
 			<artifactId>epsdk-app-common</artifactId>
 			<version>${epsdk.version}</version>
 			<type>jar</type>
 			<exclusions>
+				<!-- common includes these at incorrect version -->
 				<exclusion>
-					<groupId>org.openecomp.ecompsdkos</groupId>
 					<artifactId>epsdk-analytics</artifactId>
+					<groupId>org.openecomp.ecompsdkos</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.openecomp.ecompsdkos</groupId>
+					<artifactId>epsdk-core</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.openecomp.ecompsdkos</groupId>
@@ -175,6 +191,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- Use Mysql in ONAP -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.22</version>
+		</dependency>
 	</dependencies>
 	
 	<distributionManagement>
-- 
cgit 1.2.3-korg