aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-02-28 08:26:32 -0800
committerPatrick Brady <pb071s@att.com>2017-02-28 08:27:32 -0800
commit5ecd2ae4ce527e41476ff925c7450244e248fb79 (patch)
treeb1ab506d732abb1140d6a283a3858ce9b4109447
parent79fe428ec9c89fc370b142ccacdc5c99a13b4339 (diff)
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>
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml2
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml2
2 files changed, 2 insertions, 2 deletions
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 6133ac6ae..ec6ad68a3 100644
--- 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 25d2f5ca5..222d07692 100644
--- 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>