Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-05-27 22:42:02 -0400
committerBorislav Kapukaranov2012-05-27 22:42:02 -0400
commit1e59ae959dd9832200bfacf04008c19822f0c581 (patch)
treef1013b479226dd3a73bfa02a99a5ac441f0c0bc6
parent7f21dc5d63a3bd121007227daf0ecd143739fe49 (diff)
downloadorg.eclipse.virgo.medic-1e59ae959dd9832200bfacf04008c19822f0c581.tar.gz
org.eclipse.virgo.medic-1e59ae959dd9832200bfacf04008c19822f0c581.tar.xz
org.eclipse.virgo.medic-1e59ae959dd9832200bfacf04008c19822f0c581.zip
Revert "Fixes some test failures"
-rw-r--r--org.eclipse.virgo.medic.core/ivy.xml2
-rw-r--r--org.eclipse.virgo.medic.core/template.mf2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/ivy.xml1
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties1
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/META-INF/MANIFEST.MF2
5 files changed, 3 insertions, 5 deletions
diff --git a/org.eclipse.virgo.medic.core/ivy.xml b/org.eclipse.virgo.medic.core/ivy.xml
index 13c6cd8..4b8065b 100644
--- a/org.eclipse.virgo.medic.core/ivy.xml
+++ b/org.eclipse.virgo.medic.core/ivy.xml
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.log" rev="${org.eclipse.equinox.log}" conf="compile->runtime"/>
+
<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf
index e62e6d2..be374da 100644
--- a/org.eclipse.virgo.medic.core/template.mf
+++ b/org.eclipse.virgo.medic.core/template.mf
@@ -9,7 +9,7 @@ Import-Template:
ch.qos.logback.core.*;version="${ch.qos.logback.core:[=.=.=, +1.0.0)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
- org.eclipse.equinox.log;version="0",
+ org.eclipse.equinox.log;version="${org.eclipse.equinox.log:[=.=.=, +1.=.=)}",
javax.jms;version="0";resolution:=optional,
javax.mail.*;version="0";resolution:=optional,
javax.management.*;version="0",
diff --git a/org.eclipse.virgo.medic.integrationtest/ivy.xml b/org.eclipse.virgo.medic.integrationtest/ivy.xml
index fbbcd7b..30637d5 100644
--- a/org.eclipse.virgo.medic.integrationtest/ivy.xml
+++ b/org.eclipse.virgo.medic.integrationtest/ivy.xml
@@ -40,7 +40,6 @@
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.log" rev="${org.eclipse.equinox.log}" conf="test->runtime"/>
<!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
<override org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index 2417599..79d0a96 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -8,7 +8,6 @@ launcher.bundles=\
file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-3.5.0.M04.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.log/${org.eclipse.equinox.log}/org.eclipse.equinox.log-${org.eclipse.equinox.log}.jar@start,\
file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
file:../org.eclipse.virgo.medic.logbackcorefragment/target/artifacts/org.eclipse.virgo.medic.logbackcorefragment.jar,\
file:../org.eclipse.virgo.medic.logbackclassicfragment/target/artifacts/org.eclipse.virgo.medic.logbackclassicfragment.jar,\
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/META-INF/MANIFEST.MF b/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/META-INF/MANIFEST.MF
index 55e71f2..25ae330 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: appender.fragment
-Fragment-Host: ch.qos.logback.classic
+Fragment-Host: com.springsource.ch.qos.logback.classic
Export-Package: org.eclipse.virgo.medic.log.appender

Back to the top