Revert "380764 - Upgrades to latest Equinox and Orbit bundles"
This reverts commit e28c78fe16e1d676360c0bc5c9b7d47de9d8d87f.
diff --git a/build.versions b/build.versions
index de4841b..68a1b74 100644
--- a/build.versions
+++ b/build.versions
@@ -1,5 +1,5 @@
# Compile
-org.eclipse.osgi=3.8.0.v20120508-2119
+org.eclipse.osgi=3.7.1.R37x_v20110808-1106
# Test
org.aspectj=1.6.12.RELEASE
diff --git a/org.eclipse.virgo.osgi.console/ivy.xml b/org.eclipse.virgo.osgi.console/ivy.xml
index 82a7cf3..10c01c4 100644
--- a/org.eclipse.virgo.osgi.console/ivy.xml
+++ b/org.eclipse.virgo.osgi.console/ivy.xml
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
<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"/>
diff --git a/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml b/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
index 2be429a..1a4dca5 100644
--- a/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
+++ b/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
<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"/>
diff --git a/org.eclipse.virgo.osgi.launcher/ivy.xml b/org.eclipse.virgo.osgi.launcher/ivy.xml
index 9821b98..53e4689 100644
--- a/org.eclipse.virgo.osgi.launcher/ivy.xml
+++ b/org.eclipse.virgo.osgi.launcher/ivy.xml
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
</dependencies>
diff --git a/org.eclipse.virgo.osgi.launcher/smoke-test.xml b/org.eclipse.virgo.osgi.launcher/smoke-test.xml
index 4546bd3..30e092b 100644
--- a/org.eclipse.virgo.osgi.launcher/smoke-test.xml
+++ b/org.eclipse.virgo.osgi.launcher/smoke-test.xml
@@ -11,14 +11,13 @@
</target>
<target name="startup">
- <ivy:cachepath resolveId="osgi.classpath" pathid="osgi.classpath" organisation="org.eclipse.virgo.mirrored"
+ <ivy:cachepath resolveId="osgi.classpath" pathid="osgi.classpath" organisation="org.eclipse.osgi"
module="org.eclipse.osgi" revision="${org.eclipse.osgi}"
conf="runtime" type="jar" inline="true" log="download-only"/>
<echo message="Starting Up OSGi Launcher" />
<java classname="org.eclipse.virgo.osgi.launcher.Launcher" fork="true" spawn="true">
<arg value="-Fosgi.console=${console.port}"/>
- <arg value="-Fosgi.console.enable.builtin=true"/>
<arg value="-Fosgi.configuration.area=target"/>
<arg value="-B${test.bundle}"/>
<classpath>
