diff --git a/spring-integration-amqp/template.mf b/spring-integration-amqp/template.mf
index 618b310949..7011237cb4 100644
--- a/spring-integration-amqp/template.mf
+++ b/spring-integration-amqp/template.mf
@@ -6,10 +6,10 @@ Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.apache.commons.lang.*;version="[2.5.0, 3.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.amqp.*;version="[1.0.0, 2.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-core/template.mf b/spring-integration-core/template.mf
index 64f90a71b5..300c9ffa69 100644
--- a/spring-integration-core/template.mf
+++ b/spring-integration-core/template.mf
@@ -4,8 +4,8 @@ Bundle-Vendor: SpringSource
 Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.*;version="[3.1.0, 4.0.0)",
- org.springframework.transaction;version="[3.1.0, 4.0.0)";resolution:=optional,
+ org.springframework.*;version="[3.0.5, 4.0.0)",
+ org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional,
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional,
diff --git a/spring-integration-event/template.mf b/spring-integration-event/template.mf
index d26cc66ea2..021323a981 100644
--- a/spring-integration-event/template.mf
+++ b/spring-integration-event/template.mf
@@ -5,9 +5,9 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.expression.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-feed/template.mf b/spring-integration-feed/template.mf
index b4c9ea4536..9d56cdca69 100644
--- a/spring-integration-feed/template.mf
+++ b/spring-integration-feed/template.mf
@@ -8,11 +8,11 @@ Import-Template:
  org.apache.commons.lang.*;version="[2.5.0, 3.0.0)",
  org.apache.commons.net.*;version="[2.0.0, 3.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  com.sun.syndication.*;version="[1.0.0, 2.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-file/template.mf b/spring-integration-file/template.mf
index 8ca25f1415..73f985f796 100644
--- a/spring-integration-file/template.mf
+++ b/spring-integration-file/template.mf
@@ -6,11 +6,11 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
- org.springframework.util.xml;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
+ org.springframework.util.xml;version="[3.0.5, 4.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-ftp/template.mf b/spring-integration-ftp/template.mf
index dfb8e86f75..39b5d94ad1 100644
--- a/spring-integration-ftp/template.mf
+++ b/spring-integration-ftp/template.mf
@@ -7,10 +7,10 @@ Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.apache.commons.net.*;version="[2.0.0, 3.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-gemfire/template.mf b/spring-integration-gemfire/template.mf
index a4eb9baffd..c471f224d7 100644
--- a/spring-integration-gemfire/template.mf
+++ b/spring-integration-gemfire/template.mf
@@ -5,11 +5,11 @@ Bundle-ManifestVersion: 2
 Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.expression.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.data.gemfire.*;version="[1.0.1, 2.0.0)",
  com.gemstone.gemfire.*;version="[6.5.1, 7.0.0)",
  javax.*;version="0",
diff --git a/spring-integration-groovy/template.mf b/spring-integration-groovy/template.mf
index 9d4344b4be..fab9b23657 100644
--- a/spring-integration-groovy/template.mf
+++ b/spring-integration-groovy/template.mf
@@ -6,6 +6,6 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.*;version="[3.1.0, 4.0.0)",
+ org.springframework.*;version="[3.0.5, 4.0.0)",
  groovy.*;version="[1.7.3, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-http/template.mf b/spring-integration-http/template.mf
index 89a2c0fa52..b9f9d8aa2a 100644
--- a/spring-integration-http/template.mf
+++ b/spring-integration-http/template.mf
@@ -5,15 +5,15 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context.*;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.expression.*;version="[3.1.0, 4.0.0)",
- org.springframework.http.*;version="[3.1.0, 4.0.0)",
- org.springframework.util.*;version="[3.1.0, 4.0.0)",
- org.springframework.validation.*;version="[3.1.0, 4.0.0)",
- org.springframework.web.*;version="[3.1.0, 4.0.0)";resolution:=optional,
- org.apache.commons.httpclient.*;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context.*;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.http.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util.*;version="[3.0.5, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.5, 4.0.0)",
+ org.springframework.web.*;version="[3.0.5, 4.0.0)";resolution:=optional,
+ org.apache.commons.httpclient.*;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
  javax.xml.*;version="0",
diff --git a/spring-integration-ip/template.mf b/spring-integration-ip/template.mf
index bfa1c62591..eb90c7aa5c 100644
--- a/spring-integration-ip/template.mf
+++ b/spring-integration-ip/template.mf
@@ -6,10 +6,10 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.w3c.dom.*;version="0",
  javax.net.*;version="0"
diff --git a/spring-integration-jdbc/template.mf b/spring-integration-jdbc/template.mf
index 46c3be1a16..4fd3857856 100644
--- a/spring-integration-jdbc/template.mf
+++ b/spring-integration-jdbc/template.mf
@@ -5,7 +5,7 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.*;version="[3.1.0, 4.0.0)",
+ org.springframework.*;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  javax.sql.*;version="0",
diff --git a/spring-integration-jms/template.mf b/spring-integration-jms/template.mf
index e92a120a28..9e4c89103b 100644
--- a/spring-integration-jms/template.mf
+++ b/spring-integration-jms/template.mf
@@ -5,12 +5,12 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.jms.*;version="[3.1.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.jms.*;version="[3.0.5, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.jms;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-jmx/template.mf b/spring-integration-jmx/template.mf
index a28bc5ef26..b77f2318f9 100644
--- a/spring-integration-jmx/template.mf
+++ b/spring-integration-jmx/template.mf
@@ -5,7 +5,7 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.*;version="[3.1.0, 4.0.0)",
+ org.springframework.*;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  javax.management.*;version="0",
diff --git a/spring-integration-mail/template.mf b/spring-integration-mail/template.mf
index 9427f8ca30..383a867954 100644
--- a/spring-integration-mail/template.mf
+++ b/spring-integration-mail/template.mf
@@ -5,11 +5,11 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.mail.*;version="[3.1.0, 4.0.0)",
- org.springframework.util.*;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.mail.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util.*;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.mail.*;version="[1.4.0, 2.0.0)",
  com.sun.mail.imap.*;version="[1.4.0, 2.0.0)";resolution:=optional,
diff --git a/spring-integration-mongodb/template.mf b/spring-integration-mongodb/template.mf
index a40a9053e4..adf546f98a 100644
--- a/spring-integration-mongodb/template.mf
+++ b/spring-integration-mongodb/template.mf
@@ -4,13 +4,12 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.context;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.1.0, 2.1.1)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.data.document.mongodb.*;version="[1.0.0, 2.0.0)",
  com.mongodb.*;version="[2.4.0, 2.5.0]",
  javax.*;version="0",
diff --git a/spring-integration-redis/template.mf b/spring-integration-redis/template.mf
index 85d851ac13..ce25bdaf37 100644
--- a/spring-integration-redis/template.mf
+++ b/spring-integration-redis/template.mf
@@ -4,13 +4,12 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template:
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.context;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
+ org.springframework.integration.*;version="[2.1.0, 2.1.1)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.data.keyvalue.redis.*;version="[1.0.0, 2.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-rmi/template.mf b/spring-integration-rmi/template.mf
index f80fadcbce..a10c4f3e82 100644
--- a/spring-integration-rmi/template.mf
+++ b/spring-integration-rmi/template.mf
@@ -5,10 +5,10 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.remoting.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-scripting/template.mf b/spring-integration-scripting/template.mf
index 3b5aa739e0..fe87499006 100644
--- a/spring-integration-scripting/template.mf
+++ b/spring-integration-scripting/template.mf
@@ -6,6 +6,6 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.*;version="[3.1.0, 4.0.0)",
+ org.springframework.*;version="[3.0.5, 4.0.0)",
  org.w3c.dom.*;version="0",
  javax.script.*;version="0"
diff --git a/spring-integration-security/template.mf b/spring-integration-security/template.mf
index e74bb6396e..9215dacb46 100644
--- a/spring-integration-security/template.mf
+++ b/spring-integration-security/template.mf
@@ -6,10 +6,10 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.aop.*;version="[3.1.0, 4.0.0)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.core;version="[3.1.0, 4.0.0)",
- org.springframework.util.*;version="[3.1.0, 4.0.0)",
+ org.springframework.aop.*;version="[3.0.5, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.core;version="[3.0.5, 4.0.0)",
+ org.springframework.util.*;version="[3.0.5, 4.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
  org.springframework.security.*;version="[3.0.3, 4.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-sftp/template.mf b/spring-integration-sftp/template.mf
index e6790b43ab..c8049cdf7c 100644
--- a/spring-integration-sftp/template.mf
+++ b/spring-integration-sftp/template.mf
@@ -6,11 +6,11 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  com.jcraft.jsch.*;version="[0.1.41, 0.1.50)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-stream/template.mf b/spring-integration-stream/template.mf
index cb48fb7be7..2b93680919 100644
--- a/spring-integration-stream/template.mf
+++ b/spring-integration-stream/template.mf
@@ -5,7 +5,7 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-test/template.mf b/spring-integration-test/template.mf
index 57992c3cf1..724a965a04 100644
--- a/spring-integration-test/template.mf
+++ b/spring-integration-test/template.mf
@@ -5,7 +5,7 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.tools.ant.*;version="[1.7.0, 2.0.0)",
- org.springframework.*;version="[3.1.0, 4.0.0)",
+ org.springframework.*;version="[3.0.5, 4.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
  junit.framework.*;version="[4.6.0, 4.7.0)",
  org.junit.*;version="[4.6.0, 4.7.0)",
diff --git a/spring-integration-twitter/template.mf b/spring-integration-twitter/template.mf
index a3fcaaab85..06dcc8f210 100644
--- a/spring-integration-twitter/template.mf
+++ b/spring-integration-twitter/template.mf
@@ -7,13 +7,13 @@ Import-Template:
  org.aopalliance.*;version="[1.0.0, 2.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.aop.*;version="[3.1.0, 4.0.0)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.aop.*;version="[3.0.5, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  twitter4j.*;version="[2.1.0, 2.3.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-ws/template.mf b/spring-integration-ws/template.mf
index ed5de28200..9604a19f4d 100644
--- a/spring-integration-ws/template.mf
+++ b/spring-integration-ws/template.mf
@@ -5,11 +5,11 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.expression;version="[3.1.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.expression;version="[3.0.5, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
  org.springframework.oxm;version="[1.5.9, 3.1.0)",
  org.springframework.ws.*;version="[2.0.0, 2.1.0)",
  org.springframework.xml.*;version="[1.5.9, 2.1.0)",
diff --git a/spring-integration-xml/template.mf b/spring-integration-xml/template.mf
index feabb4ac17..0bbc25fd1c 100644
--- a/spring-integration-xml/template.mf
+++ b/spring-integration-xml/template.mf
@@ -5,11 +5,11 @@ Bundle-Version: ${version}
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.context.expression.*;version="[3.1.0, 4.0.0)",
- org.springframework.expression.*;version="[3.1.0, 4.0.0)",
- org.springframework.util.*;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util.*;version="[3.0.5, 4.0.0)",
  org.springframework.oxm;version="[1.5.9, 3.1.0)";resolution:=optional,
  org.springframework.xml.*;version="[1.5.9, 2.1.0)",
  org.apache.commons.logging.*;version="[1.0, 2.0)",
diff --git a/spring-integration-xmpp/template.mf b/spring-integration-xmpp/template.mf
index b2fdd22ad1..62627b63f7 100644
--- a/spring-integration-xmpp/template.mf
+++ b/spring-integration-xmpp/template.mf
@@ -6,10 +6,10 @@ Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.springframework.integration.*;version="[2.1.0, 2.1.1)",
- org.springframework.beans.*;version="[3.1.0, 4.0.0)",
- org.springframework.context;version="[3.1.0, 4.0.0)",
- org.springframework.core.*;version="[3.1.0, 4.0.0)",
- org.springframework.util;version="[3.1.0, 4.0.0)",
- org.jivesoftware.*;version="[3.1.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.5, 4.0.0)",
+ org.springframework.context;version="[3.0.5, 4.0.0)",
+ org.springframework.core.*;version="[3.0.5, 4.0.0)",
+ org.springframework.util;version="[3.0.5, 4.0.0)",
+ org.jivesoftware.*;version="[3.0.5, 4.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"