From 1efd16dce0ecedb81039b26b81d1490cadeb3395 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 20 Dec 2018 13:44:40 -0500
Subject: Code changes to sli/core for ODL Fluorine

Code changes needed to support port to ODL Fluorine.

Change-Id: I539aeaabeab1056cd109b6bee12046d91d61cab1
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 dblib/features/ccsdk-dblib/pom.xml | 112 ++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 58 deletions(-)

(limited to 'dblib/features/ccsdk-dblib')

diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml
index e4de0b43..4fd1bc78 100644
--- a/dblib/features/ccsdk-dblib/pom.xml
+++ b/dblib/features/ccsdk-dblib/pom.xml
@@ -1,70 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
+	<parent>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>single-feature-parent</artifactId>
+		<version>1.2.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
 
-    <groupId>org.onap.ccsdk.sli.core</groupId>
-    <artifactId>ccsdk-dblib</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
+	<groupId>org.onap.ccsdk.sli.core</groupId>
+	<artifactId>ccsdk-dblib</artifactId>
+	<version>0.4.1-SNAPSHOT</version>
+	<packaging>feature</packaging>
 
-    <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
+	<name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>
 
-    
-    <properties>
-    	<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
-    </properties>
 
-    <dependencies>
+	<dependencies>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>dblib-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>dblib-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>${mariadb.connector.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jdbc</artifactId>
-            <version>${tomcat-jdbc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.sli.core</groupId>
-            <artifactId>utils-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>${mariadb.connector.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat</groupId>
+			<artifactId>tomcat-jdbc</artifactId>
+			<version>${tomcat-jdbc.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
+			<artifactId>utils-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-    </dependencies>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+		</dependency>
+	</dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <excludedArtifactIds>
-                        <excludedArtifactId>slf4j-api</excludedArtifactId>
-                        <excludedArtifactId>tomcat-jdbc</excludedArtifactId>
-                        <excludedArtifactId>tomcat-juli</excludedArtifactId>
-                    </excludedArtifactIds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.karaf.tooling</groupId>
+				<artifactId>karaf-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<excludedArtifactIds>
+						<excludedArtifactId>slf4j-api</excludedArtifactId>
+						<excludedArtifactId>tomcat-jdbc</excludedArtifactId>
+						<excludedArtifactId>tomcat-juli</excludedArtifactId>
+					</excludedArtifactIds>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
-- 
cgit 1.2.3-korg