summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Sklyut2010-07-15 10:32:24 (EDT)
committer Glyn Normington2010-07-15 10:32:24 (EDT)
commit4bcc97b1d1dbbd5e69d0d1d2d01c99bdc9129a79 (patch)
tree43077a1fd71413d5a27b45a57dd6f6f656016076
parentc18fb8eb9b74ea0a935f5659e8f9e79b9e0894d7 (diff)
downloadorg.eclipse.virgo.medic-4bcc97b1d1dbbd5e69d0d1d2d01c99bdc9129a79.zip
org.eclipse.virgo.medic-4bcc97b1d1dbbd5e69d0d1d2d01c99bdc9129a79.tar.gz
org.eclipse.virgo.medic-4bcc97b1d1dbbd5e69d0d1d2d01c99bdc9129a79.tar.bz2
bug 319984: export Logback packages with Logback version and avoid using woven Logback (as it is no longer woven)
-rw-r--r--build-medic/build.xml2
-rw-r--r--org.eclipse.virgo.medic.core/ivy.xml3
-rw-r--r--org.eclipse.virgo.medic.core/template.mf3
3 files changed, 5 insertions, 3 deletions
diff --git a/build-medic/build.xml b/build-medic/build.xml
index 678f857..cc5ec0b 100644
--- a/build-medic/build.xml
+++ b/build-medic/build.xml
@@ -4,7 +4,7 @@
<path id="bundles">
<pathelement location="../org.eclipse.virgo.medic"/>
<pathelement location="../org.eclipse.virgo.medic.weaving"/>
- <pathelement location="../org.eclipse.virgo.ch.qos.logback.classic.woven"/>
+ <!-- <pathelement location="../org.eclipse.virgo.ch.qos.logback.classic.woven"/> -->
<pathelement location="../org.eclipse.virgo.medic.core"/>
<pathelement location="../org.eclipse.virgo.medic.test"/>
<pathelement location="../org.eclipse.virgo.medic.testfragment"/>
diff --git a/org.eclipse.virgo.medic.core/ivy.xml b/org.eclipse.virgo.medic.core/ivy.xml
index c12b5a3..18d4da4 100644
--- a/org.eclipse.virgo.medic.core/ivy.xml
+++ b/org.eclipse.virgo.medic.core/ivy.xml
@@ -21,8 +21,9 @@
<dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.ch.qos.logback.classic.woven" rev="latest.integration" conf="provided, additional->runtime"/>
+ <!--<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.ch.qos.logback.classic.woven" rev="latest.integration" conf="provided, additional->runtime"/>-->
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic.weaving" rev="latest.integration" conf="provided, additional->runtime"/>
+ <dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.classic" rev="${ch.qos.logback}" conf="provided, additional->runtime"/>
<dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.core" rev="${ch.qos.logback}" conf="provided, additional->runtime"/>
<dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf
index 0b7539b..c3f35c3 100644
--- a/org.eclipse.virgo.medic.core/template.mf
+++ b/org.eclipse.virgo.medic.core/template.mf
@@ -24,7 +24,8 @@ Import-Template:
Excluded-Imports:
org.codehaus.janino.*
Export-Template:
- org.slf4j.impl;version="1.5.10"
+ org.slf4j.impl;version="1.5.10",
+ ch.qos.logback.*;version="${ch.qos.logback}"
Excluded-Exports:
org.eclipse.virgo.medic.*
Medic-LoggingConfiguration: org.eclipse.virgo.medic