diff --git a/spring-integration-samples/osgi-inbound/.springBeans b/spring-integration-samples/osgi-inbound/.springBeans
index d079ca1bc0..8058887db4 100644
--- a/spring-integration-samples/osgi-inbound/.springBeans
+++ b/spring-integration-samples/osgi-inbound/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.6.200908051215-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
diff --git a/spring-integration-samples/osgi-inbound/build.xml b/spring-integration-samples/osgi-inbound/build.xml
index cee0de159e..b05809cbc1 100644
--- a/spring-integration-samples/osgi-inbound/build.xml
+++ b/spring-integration-samples/osgi-inbound/build.xml
@@ -2,7 +2,7 @@
 <project name="osgi-inbound" default="jar">
 
 	<target name="jar">
-		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-inbound-1.0.3.jar" basedir="bin"/>
+		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-inbound-2.0.M1.jar" basedir="bin"/>
 	</target>
 
 </project>
diff --git a/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
index 7d7d7e8f1e..12e75b4ed8 100644
--- a/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 1.0.3
+Bundle-Version: 2.0.0
 Bundle-Name: org.springframework.integration.samples.osgi.inbound
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.osgi.inbound
@@ -8,7 +8,6 @@ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0",
  org.osgi.framework;version="1.4.0",
  org.osgi.service.packageadmin;version="1.2.0",
  org.eclipse.osgi.util
-Import-Library: org.aspectj;version="[1.6.2, 2.0.0)",
- org.springframework.spring;version="[2.5.6.A, 3.1.0)"
-Import-Bundle: org.springframework.integration;version="[1.0.3,1.0.4)",
- org.springframework.integration.file;version="[1.0.3,1.0.4)"
+Import-Library: org.springframework.spring;version="[3.0.0, 3.1.0)"
+Import-Bundle: org.springframework.integration;version="[2.0.0,2.1.0)",
+ org.springframework.integration.file;version="[2.0.0,2.1.0)"
diff --git a/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
index d7f8873403..32c1db800e 100644
--- a/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
+++ b/spring-integration-samples/osgi-inbound/src/META-INF/spring/osgi-inbound.xml
@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:osgi="http://www.springframework.org/schema/osgi"
 	xmlns:integration="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
-		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
     <osgi:service id="inboundService" ref="inboundChannel"
     		interface="org.springframework.integration.channel.SubscribableChannel"/>
diff --git a/spring-integration-samples/osgi-outbound/build.xml b/spring-integration-samples/osgi-outbound/build.xml
index ac1243646c..11eb026bbf 100644
--- a/spring-integration-samples/osgi-outbound/build.xml
+++ b/spring-integration-samples/osgi-outbound/build.xml
@@ -2,7 +2,7 @@
 <project name="osgi-outbound" default="jar">
 
 	<target name="jar">
-		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-outbound-1.0.3.jar" basedir="bin"/>
+		<jar manifest="src/META-INF/MANIFEST.MF" destfile="osgi-outbound-2.0.M1.jar" basedir="bin"/>
 	</target>
 
 </project>
diff --git a/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
index 4c6447f2cd..e583e44814 100644
--- a/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/osgi-outbound/src/META-INF/MANIFEST.MF
@@ -1,10 +1,8 @@
 Manifest-Version: 1.0
-Bundle-Version: 1.0.3
+Bundle-Version: 2.0.0
 Bundle-Name: org.springframework.integration.samples.osgi.outbound
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.springframework.integration.samples.osgi.outbound
-Import-Library: org.aspectj;version="[1.6.2, 2.0.0)",
- org.springframework.spring;version="[2.5.6.A, 3.1.0)"
-Import-Bundle: org.springframework.integration;version="[1.0.3, 1.0.4)",
- org.springframework.integration.file;version="[1.0.3, 1.0.4)"
-
+Import-Bundle: org.springframework.integration;version="[2.0.0,2.1.0)",
+ org.springframework.integration.file;version="[2.0.0,2.1.0)"
+Import-Library: org.springframework.spring;version="[3.0.0,3.1.0]"
\ No newline at end of file
diff --git a/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml b/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
index 2126491702..c924111506 100644
--- a/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
+++ b/spring-integration-samples/osgi-outbound/src/META-INF/spring/osgi-outbound.xml
@@ -3,10 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:osgi="http://www.springframework.org/schema/osgi"
 	xmlns:file="http://www.springframework.org/schema/integration/file"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
-		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+		http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
 
 	<osgi:reference id="filesIn"
 			interface="org.springframework.integration.channel.SubscribableChannel"/>