commit c7d0075d223eab9f89fd28853c4b138792059be9
author Patrick Brady <pb071s@att.com> Thu Jun 01 10:45:37 2017 -0700
committer Patrick Brady <pb071s@att.com> Fri Jun 02 13:05:15 2017 -0700
tree 40aa3e41e598ea7a59bcf6899a2004c1abab11c2
parent 8aac2df744820304ee29354333661699e9695939

Merge of new rebased code

Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>

appc-dg/appc-dg-shared/appc-dg-aai/pom.xml

diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
index 8143867..db5dcf3 100644
--- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml
@@ -30,6 +30,11 @@
             <groupId>org.openecomp.sdnc.adaptors</groupId>
             <artifactId>aai-service-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.openecomp.appc</groupId>
+            <artifactId>appc-dg-dependency-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
@@ -56,6 +61,11 @@
             <version>1.6.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openecomp.appc</groupId>
+            <artifactId>appc-dg-domain-model-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
 
@@ -69,12 +79,12 @@
                     <instructions>
                         <Bundle-SymbolicName>appc-dg-aai</Bundle-SymbolicName>
                         <Export-Package>org.openecomp.appc.dg.aai</Export-Package>
-                        <Private-Package>org.openecomp.appc.dg.aai.impl.*</Private-Package>
+                        <Private-Package>org.openecomp.appc.dg.aai.exception,org.openecomp.appc.dg.aai.objects,org.openecomp.appc.dg.aai.impl.*</Private-Package>
                         <Import-Package>
-                            !org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,*;resolution:=optional
+                            *;resolution:=optional
                         </Import-Package>
                         <Embed-Dependency>
-                            appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false
+                            appc-dg-domain-model-lib;scope=compile|runtime;inline=false
                         </Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                     </instructions>