From 41e8194239b3ec6b844c3f21b9cc46c6f77e2acc Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 2 Sep 2010 12:42:23 +0000
Subject: [PATCH] Revert update to 3.0.4 (INT-1293) due to SpEL issue
 (SPR-7519)

Upon updating to 3.0.4 the build fails with SpEL error code EL1004E when
executing test method shouldFindSimpleAggregatorMethodWithArray().
Reverting for now, but SPR-7519 has been created for tracking what
appears to be a minor SpEL regression.

- template.mf files now declare range [3.0.3, 4.0.0) for all Spring dependencies

- pom.xml files reverted to dependence on 3.0.3.RELEASE
---
 pom.xml                                          |  2 +-
 spring-integration-core/template.mf              |  2 +-
 spring-integration-event/template.mf             |  6 +++---
 spring-integration-file/template.mf              | 14 +++++++-------
 spring-integration-ftp/template.mf               | 10 +++++-----
 spring-integration-groovy/template.mf            |  2 +-
 spring-integration-http/template.mf              | 16 ++++++++--------
 spring-integration-httpinvoker/template.mf       | 12 ++++++------
 spring-integration-ip/template.mf                | 10 +++++-----
 spring-integration-jdbc/template.mf              |  2 +-
 spring-integration-jms/template.mf               | 12 ++++++------
 spring-integration-jmx/template.mf               |  2 +-
 spring-integration-mail/template.mf              | 10 +++++-----
 spring-integration-parent/pom.xml                |  2 +-
 spring-integration-rmi/template.mf               | 10 +++++-----
 .../multipart-http/pom.xml                       |  2 +-
 spring-integration-samples/pom.xml               |  2 +-
 spring-integration-security/template.mf          | 10 +++++-----
 spring-integration-sftp/template.mf              | 10 +++++-----
 spring-integration-stream/template.mf            |  4 ++--
 spring-integration-test/template.mf              |  2 +-
 spring-integration-twitter/template.mf           |  8 ++++----
 spring-integration-ws/template.mf                | 10 +++++-----
 spring-integration-xml/template.mf               | 10 +++++-----
 spring-integration-xmpp/template.mf              |  8 ++++----
 25 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9b71234ac..dd9cd0c66e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
 								</group>
 							</groups>
 							<links>
-								<link>http://static.springframework.org/spring/docs/3.0.4.RELEASE/javadoc-api</link>
+								<link>http://static.springframework.org/spring/docs/3.0.3.RELEASE/javadoc-api</link>
 								<link>http://static.springsource.org/spring-integration/sites/${project.version}/apidocs</link>
 								<link>http://java.sun.com/javase/6/docs/api</link>
 							</links>
diff --git a/spring-integration-core/template.mf b/spring-integration-core/template.mf
index 57075e9ec8..9457d73b02 100644
--- a/spring-integration-core/template.mf
+++ b/spring-integration-core/template.mf
@@ -3,7 +3,7 @@ Bundle-Name: Spring Integration Core
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
- org.springframework.*;version="[3.0.4, 4.0.0)",
+ org.springframework.*;version="[3.0.3, 4.0.0)",
  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 b40d075f9a..f344fe42f9 100644
--- a/spring-integration-event/template.mf
+++ b/spring-integration-event/template.mf
@@ -4,8 +4,8 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-file/template.mf b/spring-integration-file/template.mf
index 6b857028ab..fcf52f56e4 100644
--- a/spring-integration-file/template.mf
+++ b/spring-integration-file/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.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
- org.springframework.util.xml;version="[3.0.4, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.4, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
+ org.springframework.util.xml;version="[3.0.3, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.3, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.3, 4.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-ftp/template.mf b/spring-integration-ftp/template.mf
index cc91d2cc72..36e6277820 100644
--- a/spring-integration-ftp/template.mf
+++ b/spring-integration-ftp/template.mf
@@ -7,11 +7,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.0.0, 2.0.1)",
- org.springframework.scheduling.*;version="[3.0.4, 4.0.0)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.3, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.jivesoftware.*;version="[3.1.0, 4.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-groovy/template.mf b/spring-integration-groovy/template.mf
index 78af9ffca1..752538a16e 100644
--- a/spring-integration-groovy/template.mf
+++ b/spring-integration-groovy/template.mf
@@ -5,6 +5,6 @@ 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.*;version="[3.0.4, 4.0.0)",
+ org.springframework.*;version="[3.0.3, 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 3f9896b084..1a53c82590 100644
--- a/spring-integration-http/template.mf
+++ b/spring-integration-http/template.mf
@@ -4,14 +4,14 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.validation.*;version="[3.0.4, 4.0.0)",
- org.springframework.expression.*;version="[3.0.4, 4.0.0)",
- org.springframework.context.*;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.http.*;version="[3.0.4, 4.0.0)",
- org.springframework.util.*;version="[3.0.4, 4.0.0)",
- org.springframework.web.*;version="[3.0.4, 4.0.0)";resolution:=optional,
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.validation.*;version="[3.0.3, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context.*;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.http.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util.*;version="[3.0.3, 4.0.0)",
+ org.springframework.web.*;version="[3.0.3, 4.0.0)";resolution:=optional,
  org.apache.commons.httpclient.*;version="[3.1.0, 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,
diff --git a/spring-integration-httpinvoker/template.mf b/spring-integration-httpinvoker/template.mf
index 4bbf416b6f..61119aea13 100644
--- a/spring-integration-httpinvoker/template.mf
+++ b/spring-integration-httpinvoker/template.mf
@@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.remoting.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
- org.springframework.web;version="[3.0.4, 4.0.0)";resolution:=optional,
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
+ org.springframework.web;version="[3.0.3, 4.0.0)";resolution:=optional,
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.servlet.*;version="[2.4.0, 3.0.0)";resolution:=optional,
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-ip/template.mf b/spring-integration-ip/template.mf
index 4a326c88fe..afcba3d71b 100644
--- a/spring-integration-ip/template.mf
+++ b/spring-integration-ip/template.mf
@@ -6,10 +6,10 @@ 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.commons.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 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 5e0dc0667a..3ffac0c1aa 100644
--- a/spring-integration-jdbc/template.mf
+++ b/spring-integration-jdbc/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.*;version="[3.0.4, 4.0.0)",
+ org.springframework.*;version="[3.0.3, 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 ef8ac69d7d..7dd04c178c 100644
--- a/spring-integration-jms/template.mf
+++ b/spring-integration-jms/template.mf
@@ -4,12 +4,12 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.jms.*;version="[3.0.4, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.jms.*;version="[3.0.3, 4.0.0)",
+ org.springframework.transaction.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 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 94733ac96d..524c4b6dcf 100644
--- a/spring-integration-jmx/template.mf
+++ b/spring-integration-jmx/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.*;version="[3.0.4, 4.0.0)",
+ org.springframework.*;version="[3.0.3, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  javax.management.*;version="0",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-mail/template.mf b/spring-integration-mail/template.mf
index 724cc65a41..748a52e9d3 100644
--- a/spring-integration-mail/template.mf
+++ b/spring-integration-mail/template.mf
@@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.mail.*;version="[3.0.4, 4.0.0)",
- org.springframework.util.*;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.mail.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util.*;version="[3.0.3, 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-parent/pom.xml b/spring-integration-parent/pom.xml
index 8c55a2f647..730821fdaf 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -23,7 +23,7 @@
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.hamcrest.version>1.1</org.hamcrest.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.4.RELEASE</org.springframework.version>
+		<org.springframework.version>3.0.3.RELEASE</org.springframework.version>
 		<org.springframework.security.version>2.0.5.RELEASE</org.springframework.security.version>
 		<org.springframework.ws.version>1.5.9</org.springframework.ws.version>
 	</properties>
diff --git a/spring-integration-rmi/template.mf b/spring-integration-rmi/template.mf
index 74fbf3e5e2..4198b3d42f 100644
--- a/spring-integration-rmi/template.mf
+++ b/spring-integration-rmi/template.mf
@@ -4,10 +4,10 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.remoting.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.remoting.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-samples/multipart-http/pom.xml b/spring-integration-samples/multipart-http/pom.xml
index 18d04a585b..0b27fdb518 100644
--- a/spring-integration-samples/multipart-http/pom.xml
+++ b/spring-integration-samples/multipart-http/pom.xml
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>3.0.4.RELEASE</version>
+			<version>3.0.3.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-fileupload</groupId>
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 1804264550..7cee9d8758 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -21,7 +21,7 @@
 		<org.mockito.version>1.8.4</org.mockito.version>
 		<org.hamcrest.version>1.1</org.hamcrest.version>
 		<org.slf4j.version>1.5.10</org.slf4j.version>
-		<org.springframework.version>3.0.4.RELEASE</org.springframework.version>
+		<org.springframework.version>3.0.3.RELEASE</org.springframework.version>
 		<org.springframework.security.version>2.0.5.RELEASE</org.springframework.security.version>
 		<org.springframework.ws.version>1.5.9</org.springframework.ws.version>
 	</properties>
diff --git a/spring-integration-security/template.mf b/spring-integration-security/template.mf
index e1dadc60d4..c32e6d8e8d 100644
--- a/spring-integration-security/template.mf
+++ b/spring-integration-security/template.mf
@@ -5,10 +5,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.0.4, 4.0.0)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.core;version="[3.0.4, 4.0.0)",
- org.springframework.util.*;version="[3.0.4, 4.0.0)",
+ org.springframework.aop.*;version="[3.0.3, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.core;version="[3.0.3, 4.0.0)",
+ org.springframework.util.*;version="[3.0.3, 4.0.0)",
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.security.*;version="[3.0.4, 4.0.0)",
+ 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 5403a837ed..7b19d578bc 100644
--- a/spring-integration-sftp/template.mf
+++ b/spring-integration-sftp/template.mf
@@ -7,11 +7,11 @@ Import-Template:
  org.apache.commons.lang.*;version="[2.5.0, 3.0.0)",
  org.apache.commons.io.*;version="[1.4.0, 2.0.0)",
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.3, 4.0.0)",
  org.jivesoftware.*;version="[3.1.0, 4.0.0)",
  com.jcraft.jsch.*;version="[0.1.41,0.1.41]",
  javax.*;version="0",
diff --git a/spring-integration-stream/template.mf b/spring-integration-stream/template.mf
index ed66b47300..dce5a02ccb 100644
--- a/spring-integration-stream/template.mf
+++ b/spring-integration-stream/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.commons.logging;version="[1.1.1, 2.0.0)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
  org.w3c.dom.*;version="0"
diff --git a/spring-integration-test/template.mf b/spring-integration-test/template.mf
index 20d8cb6689..4ed55683e8 100644
--- a/spring-integration-test/template.mf
+++ b/spring-integration-test/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.apache.tools.ant.*;version="[1.7.0, 2.0.0)",
- org.springframework.*;version="[3.0.4, 4.0.0)",
+ org.springframework.*;version="[3.0.3, 4.0.0)",
  org.springframework.integration.*;version="[2.0.0, 2.0.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 4d82450738..cc2e575d79 100644
--- a/spring-integration-twitter/template.mf
+++ b/spring-integration-twitter/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.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.jivesoftware.*;version="[3.1.0, 4.0.0)",
  org.apache.commons.io.*;version="[1.4,3.0)",
  twitter4j.*;version="[2.1.0,2.2.0]",
diff --git a/spring-integration-ws/template.mf b/spring-integration-ws/template.mf
index c65b59eb72..f0aa5f8361 100644
--- a/spring-integration-ws/template.mf
+++ b/spring-integration-ws/template.mf
@@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.expression;version="[3.0.4, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.expression;version="[3.0.3, 4.0.0)",
+ org.springframework.scheduling.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.springframework.oxm;version="[1.5.8.A, 3.1.0)",
  org.springframework.ws.*;version="[1.5.8.A, 2.0.0)",
  org.springframework.xml.transform;version="[1.5.8.A, 2.0.0)",
diff --git a/spring-integration-xml/template.mf b/spring-integration-xml/template.mf
index 52251fcdd7..43a99e537f 100644
--- a/spring-integration-xml/template.mf
+++ b/spring-integration-xml/template.mf
@@ -4,11 +4,11 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Template: 
  org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util.*;version="[3.0.4, 4.0.0)",
- org.springframework.expression.*;version="[3.0.4, 4.0.0)",
- org.springframework.context.expression.*;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util.*;version="[3.0.3, 4.0.0)",
+ org.springframework.expression.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context.expression.*;version="[3.0.3, 4.0.0)",
  org.springframework.oxm;version="[1.5.7.A, 2.0.0)";resolution:=optional,
  org.springframework.xml.*;version="[1.5.7.A, 2.0.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 da8e145666..90a4008667 100644
--- a/spring-integration-xmpp/template.mf
+++ b/spring-integration-xmpp/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.0.0, 2.0.1)",
- org.springframework.beans.*;version="[3.0.4, 4.0.0)",
- org.springframework.context;version="[3.0.4, 4.0.0)",
- org.springframework.core.*;version="[3.0.4, 4.0.0)",
- org.springframework.util;version="[3.0.4, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.3, 4.0.0)",
+ org.springframework.context;version="[3.0.3, 4.0.0)",
+ org.springframework.core.*;version="[3.0.3, 4.0.0)",
+ org.springframework.util;version="[3.0.3, 4.0.0)",
  org.jivesoftware.*;version="[3.1.0, 4.0.0)",
  javax.*;version="0",
  org.w3c.dom.*;version="0"