From bcc615679d65ddd42f322c5e1903b794ef236dfd Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 7 Jan 2020 10:06:08 -0500
Subject: [PATCH] Update mariadb installation

Update to install mariadb java client like all other dependencies instead
of as special case.

Change-Id: I31040362ad89c90ca47be238b438e7e7733cefb7
Issue-ID: CCSDK-2005
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 dependencies/pom.xml                               |  5 +++++
 opendaylight/neon/neon-alpine/pom.xml              | 23 ----------------------
 .../neon/neon-alpine/src/main/docker/Dockerfile    |  3 ---
 opendaylight/neon/pom.xml                          |  7 -------
 4 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index bd0f1c05..6534f3e6 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -105,6 +105,11 @@
             <groupId>org.glassfish.jersey.security</groupId>
             <artifactId>oauth1-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>org.onap.logging-analytics</groupId>
             <artifactId>logging-filter-base</artifactId>
diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml
index 08c131bb..823aebc6 100644
--- a/opendaylight/neon/neon-alpine/pom.xml
+++ b/opendaylight/neon/neon-alpine/pom.xml
@@ -72,29 +72,6 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 						</configuration>
 					</execution>
-
-					<execution>
-						<id>get-mariadb-connector-jar</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.mariadb.jdbc</groupId>
-									<artifactId>mariadb-java-client</artifactId>
-									<version>${ccsdk.mariadb-connector-java.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
-							<overWriteSnapshots>true</overWriteSnapshots>
-							<overWriteIfNewer>true</overWriteIfNewer>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 
diff --git a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
index 9d518af3..054a44f7 100644
--- a/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
+++ b/opendaylight/neon/neon-alpine/src/main/docker/Dockerfile
@@ -15,9 +15,6 @@ RUN mkdir -p /opt/odl \
     && ln -s  /opt/opendaylight /opt/opendaylight/${odl.karaf.artifactId}-${ccsdk.opendaylight.version} \
     && ln -s /opt/opendaylight /opt/opendaylight/current
 
-# workaround till we get proxy working
-RUN mkdir -p /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
-COPY mariadb-java-client-${ccsdk.mariadb-connector-java.version}.jar /opt/opendaylight/system/org/mariadb/jdbc/mariadb-java-client/${ccsdk.mariadb-connector-java.version}
 
 # ENTRYPOINT exec /opt/opendaylight/bin/karaf
 EXPOSE 8181
diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml
index ef13ead7..c0bd72d1 100644
--- a/opendaylight/neon/pom.xml
+++ b/opendaylight/neon/pom.xml
@@ -19,7 +19,6 @@
 		<ccsdk.project.version>${project.version}</ccsdk.project.version>
 		<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
 		<ccsdk.opendaylight.version>0.10.1</ccsdk.opendaylight.version>
-		<ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
 		<docker.push.phase>deploy</docker.push.phase>
     </properties>
     
@@ -31,12 +30,6 @@
 				<version>${ccsdk.opendaylight.version}</version>
 				<type>tar.gz</type>
 			</dependency>
-			<dependency>
-				<groupId>org.mariadb.jdbc</groupId>
-				<artifactId>mariadb-java-client</artifactId>
-				<version>${ccsdk.mariadb-connector-java.version}</version>
-				<type>jar</type>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
-- 
2.16.6