Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.osgi-extensions
diff --git a/build.versions b/build.versions
index 5ba0711..5c53e92 100644
--- a/build.versions
+++ b/build.versions
@@ -5,7 +5,7 @@
org.aspectj=1.6.6.RELEASE
org.junit=4.7.0
org.easymock=2.3.0
-org.eclipse.virgo.teststubs=3.0.0.RC2
+org.eclipse.virgo.teststubs=3.1.0.D-20111021090303
# Osgi Launcher Test
org.apache.commons=1.4.1
diff --git a/org.eclipse.virgo.osgi.console/template.mf b/org.eclipse.virgo.osgi.console/template.mf
index fd08768..b7def12 100644
--- a/org.eclipse.virgo.osgi.console/template.mf
+++ b/org.eclipse.virgo.osgi.console/template.mf
@@ -2,7 +2,7 @@
Bundle-Name: Console
Bundle-Vendor: SpringSource Inc.
Bundle-SymbolicName: org.eclipse.virgo.osgi.console
-Bundle-Version: 3.0.00
+Bundle-Version: ${version}
Fragment-Host: org.eclipse.osgi; extension:=framework
Excluded-Exports:
*.internal.*,
diff --git a/org.eclipse.virgo.osgi.extensions.equinox/.classpath b/org.eclipse.virgo.osgi.extensions.equinox/.classpath
index 41996d9..162eb67 100644
--- a/org.eclipse.virgo.osgi.extensions.equinox/.classpath
+++ b/org.eclipse.virgo.osgi.extensions.equinox/.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="OSGI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/OSGI_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="OSGI_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-3.7.0.v20110613.jar" sourcepath="/OSGI_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.0.v20110613/org.eclipse.osgi-sources-3.7.0.v20110613.jar"/>
<classpathentry kind="var" path="OSGI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/OSGI_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="OSGI_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-3.0.0.RC2.jar" sourcepath="/OSGI_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.0.0.RC2/org.eclipse.virgo.teststubs.osgi-sources-3.0.0.RC2.jar"/>
+ <classpathentry kind="var" path="OSGI_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.D-20111021090303/org.eclipse.virgo.teststubs.osgi-3.1.0.D-20111021090303.jar" sourcepath="/OSGI_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.1.0.D-20111021090303/org.eclipse.virgo.teststubs.osgi-sources-3.1.0.D-20111021090303.jar"/>
<classpathentry kind="var" path="OSGI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/OSGI_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.osgi.extensions.equinox/template.mf b/org.eclipse.virgo.osgi.extensions.equinox/template.mf
index 02d13e8..7e8a7f7 100644
--- a/org.eclipse.virgo.osgi.extensions.equinox/template.mf
+++ b/org.eclipse.virgo.osgi.extensions.equinox/template.mf
@@ -2,7 +2,7 @@
Bundle-Name: Equinox Specific OSGi Extensions
Bundle-Vendor: SpringSource Inc.
Bundle-SymbolicName: org.eclipse.virgo.osgi.extensions.equinox
-Bundle-Version: 3.0.0
+Bundle-Version: ${version}
Fragment-Host: org.eclipse.osgi; extension:=framework
Excluded-Exports:
*.internal.*,
diff --git a/org.eclipse.virgo.osgi.launcher/template.mf b/org.eclipse.virgo.osgi.launcher/template.mf
index ee40a24..4d542d2 100644
--- a/org.eclipse.virgo.osgi.launcher/template.mf
+++ b/org.eclipse.virgo.osgi.launcher/template.mf
@@ -2,7 +2,7 @@
Bundle-Name: Equinox Specific OSGi Extensions
Bundle-Vendor: SpringSource Inc.
Bundle-SymbolicName: org.eclipse.virgo.osgi.launcher
-Bundle-Version: 3.0.0
+Bundle-Version: ${version}
Main-Class: org.eclipse.virgo.osgi.launcher.Launcher
Import-Template:
org.osgi.framework.*;version="0"
diff --git a/virgo-build b/virgo-build
index 9c13d0e..b640ab8 160000
--- a/virgo-build
+++ b/virgo-build
@@ -1 +1 @@
-Subproject commit 9c13d0ee4f9d10024812dbc69c6cd387a48dfc1e
+Subproject commit b640ab8b07e3a56d8878ceb2e3be4b2aacb34f06
