From 85adac1a4116c920f431a30e98e808812a994988 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 3 Mar 2017 06:02:11 -0800 Subject: Revert "Removing resolution optional" This reverts commit c0b99426c3b8eff26830bccb6e54010b4bbfbfba. Change-Id: Ic4a61188a88f5feabf7c76af4fff3a6fc1e5c3d0 Signed-off-by: Patrick Brady --- appc-dg/appc-dg-shared/appc-dg-aai/pom.xml | 2 +- appc-dg/appc-dg-shared/appc-dg-common/pom.xml | 2 +- appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml | 2 +- appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml | 2 +- appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'appc-dg/appc-dg-shared') 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 0b3a62f46..5aa804baa 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml @@ -71,7 +71,7 @@ org.openecomp.appc.dg.aai org.openecomp.appc.dg.aai.impl.* - !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.*,* + !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 appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml index e0742c627..e353d8321 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml @@ -70,7 +70,7 @@ appc-dg-common org.openecomp.appc.dg.common,org.openecomp.appc.dg.common.objects,org.openecomp.appc.dg.common.utils org.openecomp.appc.dg.common.impl.* - !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.*,* + !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 appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true 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 @@ org.openecomp.appc.dg.licmgr org.openecomp.appc.dg.licmgr.LicenseManagerPlugin org.openecomp.appc.dg.licmgr.impl - 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.*,* + 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 appc-license-manager-api,appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true 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 @@ appc-dg-netconf org.openecomp.appc.dg.netconf org.openecomp.appc.dg.netconf.impl.* - !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.*,* + !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 appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml index e271ff152..166a8b1d5 100644 --- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml @@ -58,7 +58,7 @@ appc-dg-ssh org.openecomp.appc.dg.ssh org.openecomp.appc.dg.ssh.impl.* - !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.*,* + !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 appc-common,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true -- cgit 1.2.3-korg