Brings back 4 reverted commits
This reverts commit e6a83adb0ec9eca521016976638bfa0c6b3aa057.
This reverts commit e84ebc0c2c2f0c9ee67188f383a9d9a86878ce5d.
This reverts commit 6d388612a09ba9bcc9841c49d9762d0f9ed9cca5.
This reverts commit 817fa664cb3dfde450a144429aee599e005ce94e.
diff --git a/build.properties b/build.properties
index 12ee15a..cf9bac8 100644
--- a/build.properties
+++ b/build.properties
@@ -1,8 +1,9 @@
version=3.5.0
release.type=integration
javadoc.exclude.package.names=**/internal/**,**/internal
-ivy.cache.dir=${basedir}/../ivy-cache
-integration.repo.dir=${basedir}/../integration-repo
+ivy.cache.dir=${user.home}/ivy/ivy-cache
+integration.repo.dir=${ivy.cache.dir}/repository
+project.organisation=org.eclipse.virgo.osgi
findbugs.enforce=true
clover.enforce=true
clover.coverage=65
diff --git a/build.versions b/build.versions
index 68a1b74..de4841b 100644
--- a/build.versions
+++ b/build.versions
@@ -1,5 +1,5 @@
# Compile
-org.eclipse.osgi=3.7.1.R37x_v20110808-1106
+org.eclipse.osgi=3.8.0.v20120508-2119
# 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 10c01c4..2075e54 100644
--- a/org.eclipse.virgo.osgi.console/ivy.xml
+++ b/org.eclipse.virgo.osgi.console/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" module="${ant.project.name}" />
+ <info organisation="${project.organisation}" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" 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 1a4dca5..86753e1 100644
--- a/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
+++ b/org.eclipse.virgo.osgi.extensions.equinox/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" 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 53e4689..148adfd 100644
--- a/org.eclipse.virgo.osgi.launcher/ivy.xml
+++ b/org.eclipse.virgo.osgi.launcher/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.osgi" module="${ant.project.name}" />
+ <info organisation="${project.organisation}" module="${ant.project.name}" />
<configurations>
<include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" 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 30e092b..4546bd3 100644
--- a/org.eclipse.virgo.osgi.launcher/smoke-test.xml
+++ b/org.eclipse.virgo.osgi.launcher/smoke-test.xml
@@ -11,13 +11,14 @@
</target>
<target name="startup">
- <ivy:cachepath resolveId="osgi.classpath" pathid="osgi.classpath" organisation="org.eclipse.osgi"
+ <ivy:cachepath resolveId="osgi.classpath" pathid="osgi.classpath" organisation="org.eclipse.virgo.mirrored"
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>
diff --git a/virgo-build b/virgo-build
index a56426f..f059977 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit a56426f086c0b7031b80a1c0b08a925784b08524
+Subproject commit f0599774df7a99db114a760070cd42607796c386
