diff --git a/.gitignore b/.gitignore
index 5f193ca..3b84b50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 target
 integration-repo
 ivy-cache
diff --git a/build.properties b/build.properties
index fb10b5c..352c39b 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=2.0.0
+version=3.0.0
 release.type=integration
 natural.name=configuration-properties
 project.name=Virgo Web Server Samples
diff --git a/build.versions b/build.versions
index 450428b..4b66e0a 100644
--- a/build.versions
+++ b/build.versions
@@ -1,8 +1,8 @@
 # Compile
-org.eclipse.virgo.kernel=2.1.0.D-20100331094249
-org.eclipse.virgo.osgi=2.1.0.D-20100331093025
-org.eclipse.virgo.repository=2.1.0.D-20100331094008
-org.eclipse.virgo.util=2.1.0.D-20100331093222
+org.eclipse.virgo.kernel=3.0.0.D-20110209161555
+org.eclipse.virgo.osgi=3.0.0.D-20110209111605
+org.eclipse.virgo.repository=3.0.0.D-20110209112904
+org.eclipse.virgo.util=3.0.0.D-20110209111851
 javax.annotation=1.0.0
 javax.servlet.jsp=2.1.0
 javax.servlet.jstl=1.1.2
@@ -11,17 +11,17 @@
 org.apache.taglibs.standard=1.1.2
 org.apache.xmlcommons=1.3.3
 org.aspectj=1.6.6.RELEASE
-org.eclipse.osgi=3.6.1.R36x_v20100806
+org.eclipse.osgi=3.7.0.v20110124-0830
+org.eclipse.osgi.services=3.3.0.v20110110
+org.eclipse.equinox.cm=1.0.300.v20101204
 org.slf4j=1.5.10
 org.springframework.js=2.0.8.RELEASE
 org.springframework.osgi=1.2.1
 org.springframework=3.0.0.RELEASE
-org.apache.felix=1.2.4
-org.apache.felix.eventadmin=1.0.0
 
 # Test
-org.eclipse.virgo.teststubs=1.0.0.D-20100513114711
-org.eclipse.virgo.test=2.1.0.D-20100331093519
+org.eclipse.virgo.teststubs=3.0.0.D-20110209111336
+org.eclipse.virgo.test=3.0.0.D-20110209112249
 org.junit.spring.3=4.7.0
 javax.el=1.0.0
 org.easymock=2.3.0
\ No newline at end of file
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml b/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
index 7c2782a..d541575 100644
--- a/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
+++ b/org.eclipse.virgo.sample.configuration.properties.core/ivy.xml
@@ -23,7 +23,7 @@
 
 		<!-- === PROVIDED-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}" conf="provided->runtime"/>
+		<dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf='provided->runtime'/>
 		<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="provided->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->runtime"/>
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF
index 3238258..e1cb377 100644
--- a/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.sample.configuration.properties.core/src/main/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.virgo.sample.configuration.properties.core
  ;version="2.0.0";uses:="org.osgi.service.cm"
-Bundle-Version: 2.0.0
+Bundle-Version: 3.0.0
 Tool: Bundlor 1.0.0.BUILD-20091207202403
 Bundle-Name: Configuration Sample Content Bundle
 Bundle-ManifestVersion: 2
diff --git a/org.eclipse.virgo.sample.configuration.properties.core/template.mf b/org.eclipse.virgo.sample.configuration.properties.core/template.mf
index f9cda66..1657aff 100644
--- a/org.eclipse.virgo.sample.configuration.properties.core/template.mf
+++ b/org.eclipse.virgo.sample.configuration.properties.core/template.mf
@@ -3,7 +3,7 @@
 Bundle-Description: Configuration Sample Content Provider
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.core
-Bundle-Version: 2.0.0
+Bundle-Version: 3.0.0
 Import-Template: 
  javax.management.*;version="0",
  org.springframework.*;version="[3.0,3.1)",
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF
index 42e89aa..b5d5c4f 100644
--- a/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.sample.configuration.properties.web/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Import-Bundle: com.springsource.org.apache.taglibs.standard;version="[
  1.1.2,1.3)",org.springframework.js;version="[2.0.7.RELEASE,3.0.0)"
-Bundle-Version: 2.0.0
+Bundle-Version: 3.0.0
 Tool: Bundlor 1.0.0.BUILD-20091207202403
 Bundle-Name: Configuration Sample Web Bundle
 Bundle-ManifestVersion: 2
diff --git a/org.eclipse.virgo.sample.configuration.properties.web/template.mf b/org.eclipse.virgo.sample.configuration.properties.web/template.mf
index 8074156..3e45ff7 100644
--- a/org.eclipse.virgo.sample.configuration.properties.web/template.mf
+++ b/org.eclipse.virgo.sample.configuration.properties.web/template.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-Name: Configuration Sample Web Bundle
-Bundle-Version: 2.0.0
+Bundle-Version: 3.0.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.virgo.sample.configuration.properties.web
 Import-Template: