diff --git a/pom.xml b/pom.xml
index dd9cd0c66e..d9b71234ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,7 +259,7 @@
- http://static.springframework.org/spring/docs/3.0.3.RELEASE/javadoc-api
+ http://static.springframework.org/spring/docs/3.0.4.RELEASE/javadoc-api
http://static.springsource.org/spring-integration/sites/${project.version}/apidocs
http://java.sun.com/javase/6/docs/api
diff --git a/spring-integration-core/template.mf b/spring-integration-core/template.mf
index 2c9db420b9..57075e9ec8 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.0, 4.0.0)",
+ org.springframework.*;version="[3.0.4, 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 0d7242696f..b40d075f9a 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.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
+ 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.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 cc7dd1ef9b..6b857028ab 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.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.util;version="[3.0.0, 4.0.0)",
- org.springframework.util.xml;version="[3.0.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.0, 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.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.w3c.dom.*;version="0"
diff --git a/spring-integration-ftp/template.mf b/spring-integration-ftp/template.mf
index a68ffe7388..cc91d2cc72 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.0, 4.0.0)",
- 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.util;version="[3.0.0, 4.0.0)",
+ 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.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 b5dc9104b0..78af9ffca1 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.0, 4.0.0)",
+ org.springframework.*;version="[3.0.4, 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 bf5fe575db..3f9896b084 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.0, 4.0.0)",
- org.springframework.validation.*;version="[3.0.0, 4.0.0)",
- org.springframework.expression.*;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.http.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.web.*;version="[3.0.0, 4.0.0)";resolution:=optional,
+ 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.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 df3f62d4fb..4bbf416b6f 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.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.remoting.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
- org.springframework.web;version="[3.0.0, 4.0.0)";resolution:=optional,
+ 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.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 4a374d6c79..4a326c88fe 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.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.scheduling.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 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.scheduling.*;version="[3.0.4, 4.0.0)",
+ org.springframework.util;version="[3.0.4, 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 2d675fbfc9..5e0dc0667a 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.0, 4.0.0)",
+ org.springframework.*;version="[3.0.4, 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 feb66b3d9a..ef8ac69d7d 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.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.jms.*;version="[3.0.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 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.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.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 fea0d784cd..94733ac96d 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.0, 4.0.0)",
+ org.springframework.*;version="[3.0.4, 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 81e168323c..724cc65a41 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.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.mail.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 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.mail.*;version="[3.0.4, 4.0.0)",
+ org.springframework.util.*;version="[3.0.4, 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 730821fdaf..8c55a2f647 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -23,7 +23,7 @@
1.8.4
1.1
1.5.10
- 3.0.3.RELEASE
+ 3.0.4.RELEASE
2.0.5.RELEASE
1.5.9
diff --git a/spring-integration-rmi/template.mf b/spring-integration-rmi/template.mf
index 34d5cc4df5..74fbf3e5e2 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.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.remoting.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 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.remoting.*;version="[3.0.4, 4.0.0)",
+ org.springframework.util;version="[3.0.4, 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 232697ce09..18d04a585b 100644
--- a/spring-integration-samples/multipart-http/pom.xml
+++ b/spring-integration-samples/multipart-http/pom.xml
@@ -18,7 +18,7 @@
org.springframework
spring-webmvc
- 3.0.3.RELEASE
+ 3.0.4.RELEASE
commons-fileupload
@@ -31,4 +31,4 @@
1.3.2
-
\ No newline at end of file
+
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 7cee9d8758..1804264550 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -21,7 +21,7 @@
1.8.4
1.1
1.5.10
- 3.0.3.RELEASE
+ 3.0.4.RELEASE
2.0.5.RELEASE
1.5.9
diff --git a/spring-integration-security/template.mf b/spring-integration-security/template.mf
index 973aec7a8e..e1dadc60d4 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.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.core;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.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.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.security.*;version="[3.0.0, 4.0.0)",
+ org.springframework.security.*;version="[3.0.4, 4.0.0)",
org.w3c.dom.*;version="0"
diff --git a/spring-integration-sftp/template.mf b/spring-integration-sftp/template.mf
index 41766a1f0d..5403a837ed 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.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.util;version="[3.0.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.0, 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.4, 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 9adfd38d95..ed66b47300 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.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 4.0.0)",
+ org.springframework.beans.*;version="[3.0.4, 4.0.0)",
+ org.springframework.util;version="[3.0.4, 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 273fb780f2..20d8cb6689 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.0, 4.0.0)",
+ org.springframework.*;version="[3.0.4, 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 dbe783159f..4d82450738 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.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.util;version="[3.0.0, 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.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 7b33962ec3..c65b59eb72 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.0, 4.0.0)",
- org.springframework.context;version="[3.0.0, 4.0.0)",
- org.springframework.expression;version="[3.0.0, 4.0.0)",
- org.springframework.scheduling.*;version="[3.0.0, 4.0.0)",
- org.springframework.util;version="[3.0.0, 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.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.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 866d7c87b0..52251fcdd7 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.0, 4.0.0)",
- org.springframework.core.*;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.context.expression.*;version="[3.0.0, 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.expression.*;version="[3.0.4, 4.0.0)",
+ org.springframework.context.expression.*;version="[3.0.4, 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 095c7c0ae1..da8e145666 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.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.util;version="[3.0.0, 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.jivesoftware.*;version="[3.1.0, 4.0.0)",
javax.*;version="0",
org.w3c.dom.*;version="0"