From c7d0075d223eab9f89fd28853c4b138792059be9 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 1 Jun 2017 10:45:37 -0700
Subject: Merge of new rebased code

Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>
---
 appc-common/pom.xml | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'appc-common/pom.xml')

diff --git a/appc-common/pom.xml b/appc-common/pom.xml
index c39efe653..90cec79a7 100644
--- a/appc-common/pom.xml
+++ b/appc-common/pom.xml
@@ -4,10 +4,11 @@
     <groupId>org.openecomp.appc</groupId>
     <artifactId>appc</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>appc-common</artifactId>
-	<name>APP-C Common</name>
-	<description>Common library shared across all modules</description>
+  </parent>
+  <artifactId>appc-common</artifactId>
+  <name>APP-C Common</name>
+  <packaging>bundle</packaging>
+  <description>Common library shared across all modules</description>
 
 <!-- <packaging>bundle</packaging> -->
 
@@ -82,6 +83,20 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.openecomp.sdnc.core</groupId>
+      <artifactId>dblib-provider</artifactId>
+      </dependency>
+  <dependency>
+    <groupId>org.mockito</groupId>
+    <artifactId>mockito-core</artifactId>
+    <scope>test</scope>
+  </dependency>
+  <dependency>
+    <groupId>org.mockito</groupId>
+    <artifactId>mockito-all</artifactId>
+    <scope>test</scope>
+  </dependency>
 
   </dependencies>
 
@@ -107,9 +122,11 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>appc-common</Bundle-SymbolicName>
-            <!-- <Export-Package>org.openecomp.appc.provider</Export-Package> -->
-            <Import-Package>!com.att,!javax.crypto.*, *</Import-Package>
-            <Embed-Dependency>eelf-core, jasypt</Embed-Dependency>
+            <Export-Package>
+              org.openecomp.appc.*, com.att.eelf.*, ch.qos.logback.*, org.jasypt.*
+            </Export-Package>
+            <Import-Package>*;resolution:=optional</Import-Package>
+            <Embed-Dependency>eelf-core, logback-core, logback-classic, jasypt</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
           </instructions>
         </configuration>
-- 
cgit 1.2.3-korg