Adding more resolution optional to import-package

Trying to correct artifact errors coming from bundle not containing
artifacts that are used for test cases.

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

diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
index 6133ac6..ec6ad68 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml
@@ -46,7 +46,7 @@
                                                <Export-Package>org.openecomp.appc.dg.licmgr</Export-Package>
                                                <Export-Service>org.openecomp.appc.dg.licmgr.LicenseManagerPlugin</Export-Service>
                                                <Private-Package>org.openecomp.appc.dg.licmgr.impl</Private-Package>
-                                               <Import-Package>org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects,!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.*,*</Import-Package>
+                                               <Import-Package>org.openecomp.appc.licmgr,org.openecomp.appc.licmgr.exception,org.openecomp.appc.licmgr.objects,!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</Import-Package>
                                                <Embed-Dependency>appc-license-manager-api,appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                        </instructions>

diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
index 25d2f5c..222d076 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml
@@ -78,7 +78,7 @@
                                                <Bundle-SymbolicName>appc-dg-netconf</Bundle-SymbolicName>
                                                <Export-Package>org.openecomp.appc.dg.netconf</Export-Package>
                                                <Private-Package>org.openecomp.appc.dg.netconf.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.*,*</Import-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</Import-Package>
                                                <Embed-Dependency>appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false</Embed-Dependency>
                                                <Embed-Transitive>true</Embed-Transitive>
                                        </instructions>