bug 310217: use Equinox instead of Felix for Config Adminequinox-config-admin

4 files changed, 15 insertions, 4 deletions

diff --git a/build.versions b/build.versions
index c466405..660435c 100644
--- a/build.versions
+++ b/build.versions
@@ -2,7 +2,8 @@
 ch.qos.logback=0.9.24
 org.slf4j=1.6.1
 org.eclipse.osgi=3.6.1.R36x_v20100806
-org.apache.felix.configadmin=1.2.4
+org.eclipse.osgi.services=3.1.200.v20071203
+org.eclipse.equinox.cm=1.0.200.v20100520
 org.aspectj=1.6.6.RELEASE
 
 # Test
diff --git a/org.eclipse.virgo.medic.core/ivy.xml b/org.eclipse.virgo.medic.core/ivy.xml
index 18d4da4..38a5ef1 100644
--- a/org.eclipse.virgo.medic.core/ivy.xml
+++ b/org.eclipse.virgo.medic.core/ivy.xml
@@ -27,11 +27,15 @@
 		<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"/>
 		
-		<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix.configadmin}" conf="optional->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
+		<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="optional->runtime"/>
 
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
 		<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
+		
+		<!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
+		<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.eclipse.virgo.medic.integrationtest/ivy.xml b/org.eclipse.virgo.medic.integrationtest/ivy.xml
index e2d576f..a7c8263 100644
--- a/org.eclipse.virgo.medic.integrationtest/ivy.xml
+++ b/org.eclipse.virgo.medic.integrationtest/ivy.xml
@@ -27,7 +27,12 @@
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
 		<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
 		<dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.classic" rev="${ch.qos.logback}" conf="test->runtime"/>
-		<dependency org="org.apache.felix" name="org.apache.felix.configadmin" rev="${org.apache.felix.configadmin}" conf="test->runtime"/>		
+		
+		<dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
+		<dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
+		
+		<!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
+		<override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>		
 	</dependencies>
 
 </ivy-module>
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 03a8755..be07729 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
@@ -4,7 +4,8 @@ file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.spri
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar,\
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar,\
 file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.2.0.D-20101108165433/org.eclipse.virgo.util.parser.manifest-2.2.0.D-20101108165433.jar,\
-file:../ivy-cache/repository/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar@start,\
+file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.1.200.v20071203/org.eclipse.osgi.services-3.1.200.v20071203.jar,\
+file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/1.0.200.v20100520/org.eclipse.equinox.cm-1.0.200.v20100520.jar@start,\
 file:../org.eclipse.virgo.medic/target/artifacts/org.eclipse.virgo.medic.jar@start,\
 file:../org.eclipse.virgo.medic.core/target/artifacts/org.eclipse.virgo.medic.core.jar@start,\
 file:src/test/resources/config-fragment,\