From 36bcd566167f2f91c0e8e7a304fce5f6bc150776 Mon Sep 17 00:00:00 2001
From: Anand <ac204h@att.com>
Date: Thu, 4 Jan 2018 19:35:51 -0500
Subject: Include impacted changes for APPC-346,APPC-348

Issue-ID: APPC-347
Change-Id: I399bc2a1e0dfd481e103032a373bb80fce5baf41
Signed-off-by: Anand <ac204h@att.com>
---
 .../appc-data-access-lib/pom.xml                   | 146 ++++++++++++++-------
 1 file changed, 97 insertions(+), 49 deletions(-)

(limited to 'appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml')

diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
index 749764bc7..60f244b9e 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml
@@ -1,62 +1,110 @@
-<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>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============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>
     <parent>
         <groupId>org.onap.appc</groupId>
         <artifactId>appc-dispatcher-common</artifactId>
         <version>1.3.0-SNAPSHOT</version>
     </parent>
-  <artifactId>appc-data-access-lib</artifactId>
-  <packaging>bundle</packaging>
 
-  <name>appc-data-access-lib</name>
-  <url>http://maven.apache.org</url>
+    <artifactId>appc-data-access-lib</artifactId>
+    <packaging>bundle</packaging>
+    <name>APPC Dispatcher Common - Data Access lib</name>
+    <url>http://maven.apache.org</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <licenseDir>${project.parent.parent.parent.basedir}</licenseDir>
+        <apache.common.dbcp2.version>2.0.1</apache.common.dbcp2.version>
+    </properties>
 
-  <dependencies>
-    <dependency>
+    <dependencies>
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
-      <dependency>
-          <groupId>org.onap.ccsdk.sli.core</groupId>
-          <artifactId>sli-common</artifactId>
-          <scope>compile</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.onap.ccsdk.sli.core</groupId>
-          <artifactId>sli-provider</artifactId>
-          <scope>compile</scope>
-      </dependency>
-      <dependency>
-          <groupId>org.onap.appc</groupId>
-          <artifactId>appc-common</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.mariadb.jdbc</groupId>
-          <artifactId>mariadb-java-client</artifactId>
-      </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <extensions>true</extensions>
-            <configuration>
-                <instructions>
-                    <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                    <Export-Package>org.onap.appc.dao.util</Export-Package>
-                    <Import-Package>org.onap.appc.configuration,*;resolution:=optional</Import-Package>
-                    <Embed-Dependency>mariadb-java-client</Embed-Dependency>
-                    <Embed-Transitive>true</Embed-Transitive>
-                </instructions>
-            </configuration>
-        </plugin>
-    </plugins>
-  </build>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-dbcp2</artifactId>
+            <version>${apache.common.dbcp2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+	<dependency>
+		<groupId>org.mariadb.jdbc</groupId>
+		<artifactId>mariadb-java-client</artifactId>
+	</dependency>
+        <dependency>
+            <groupId>org.onap.appc</groupId>
+            <artifactId>appc-test-dependencies</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>
+                            org.onap.appc.dao.util,
+                            org.onap.appc.dao.util.api,
+                            org.onap.appc.dao.util.exception,
+                            org.onap.appc.dao.util.helper
+                        </Export-Package>
+                        <Import-Package>org.onap.appc.configuration,*;resolution:=optional</Import-Package>
+                        <Embed-Dependency>mariadb-java-client,*;scope=compile|runtime</Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-- 
cgit 1.2.3-korg