Merge pull request #413 from garyrussell/INT-2535

* INT-2535: INT-2535 Update Version to 2.2.0.BUILD-SNAPSHOT
2012-05-04 08:58:52 -04:00
parent bfa55cbf58 87666d7d8e
commit fae49aa593
2 changed files with 145 additions and 144 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,7 @@ subprojects { subproject ->
 		junitVersion = '4.8.2'
 		log4jVersion = '1.2.12'
 		mockitoVersion = '1.9.0'
+		// When changing Spring Versions - don't forget to update bundlor ranges
 		springVersion = '3.1.1.RELEASE'
 		springAmqpVersion = '1.0.0.RELEASE'
 		springDataMongoVersion = '1.0.0.RELEASE'
@@ -149,13 +150,13 @@ project('spring-integration-amqp') {
 		importTemplate += [
 			'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.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.transaction.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.transaction.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'org.springframework.amqp.*;version="[1.0.0, 2.0.0)"',
 			'org.aopalliance.*;version="[1.0.0, 2.0.0)"',
 			'javax.*;version="0"',
@@ -177,8 +178,8 @@ project('spring-integration-core') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration'
 		importTemplate += [
-			'org.springframework.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional',
+			'org.springframework.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.transaction;version="[3.1.1, 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',
@@ -197,11 +198,11 @@ project('spring-integration-event') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.event'
 		importTemplate += [
-			'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.expression.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -224,12 +225,12 @@ project('spring-integration-feed') {
 		importTemplate += [
 			'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.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)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'com.sun.syndication.*;version="[1.0.0, 2.0.0)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
@@ -248,15 +249,15 @@ project('spring-integration-file') {
 		bundleSymbolicName = 'org.springframework.integration.file'
 		importTemplate += [
 			'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.0.5, 4.0.0)"',
-			'org.springframework.expression.*;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.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.transaction.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.xml;version="[3.1.1, 4.0.0)"',
 			'org.w3c.dom.*;version="0"'
 		]
 	}
@@ -276,12 +277,12 @@ project('spring-integration-ftp') {
 		importTemplate += [
 			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
 			'org.apache.commons.net.*;version="[2.0.0, 3.1.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.scheduling.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -309,12 +310,12 @@ project('spring-integration-gemfire') {
 		bundleSymbolicName = 'org.springframework.integration.gemfire'
 		importTemplate += [
 			'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.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.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 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"',
@@ -336,8 +337,8 @@ project('spring-integration-groovy') {
 		bundleSymbolicName = 'org.springframework.integration.groovy'
 		importTemplate += [
 			'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.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.*;version="[3.1.1, 4.0.0)"',
 			'groovy.*;version="[1.7.3, 2.0.0)"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -364,15 +365,15 @@ project('spring-integration-http') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.http'
 		importTemplate += [
-			'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.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.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.http.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.validation.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.web.*;version="[3.1.1, 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',
@@ -394,13 +395,13 @@ project('spring-integration-ip') {
 		bundleSymbolicName = 'org.springframework.integration.ip'
 		importTemplate += [
 			'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.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.springframework.jmx.*;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
+			'org.springframework.jmx.*;version="[3.1.1, 4.0.0)"',
 			'org.w3c.dom.*;version="0"',
 			'javax.net.*;version="0"'
 		]
@@ -424,8 +425,8 @@ project('spring-integration-jdbc') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.jdbc'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'org.springframework.*;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.*;version="[3.1.1, 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"',
@@ -453,14 +454,14 @@ project('spring-integration-jms') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.jms'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'org.springframework.beans.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.expression.*;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.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.jms.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.transaction.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 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"'
@@ -480,8 +481,8 @@ project('spring-integration-jmx') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.jmx'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'org.springframework.*;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.*;version="[3.1.1, 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"',
@@ -502,14 +503,14 @@ project('spring-integration-mail') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.mail'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'org.springframework.beans.*;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.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.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.mail.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 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',
@@ -541,13 +542,13 @@ project('spring-integration-mongodb') {
 		bundleSymbolicName = 'org.springframework.integration.mongodb'
 		importTemplate += [
 			'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.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.jmx.*;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
+			'org.springframework.jmx.*;version="[3.1.1, 4.0.0)"',
 			'org.springframework.data.mongodb.*;version="[1.0.0, 2.0.0)"',
 			'org.springframework.data.mapping.*;version="[1.0.0, 2.0.0)"',
 			'org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)"',
@@ -577,12 +578,12 @@ project('spring-integration-redis') {
 		bundleSymbolicName = 'org.springframework.integration.redis'
 		importTemplate += [
 			'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.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.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'org.springframework.data.redis.*;version="[1.0.0, 2.0.0)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
@@ -601,12 +602,12 @@ project('spring-integration-rmi') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.rmi'
 		importTemplate += [
-			'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.remoting.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.remoting.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'org.apache.commons.logging;version="[1.1.1, 2.0.0)"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -629,8 +630,8 @@ project('spring-integration-scripting') {
 		bundleSymbolicName = 'org.springframework.integration.scripting'
 		importTemplate += [
 			'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.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.*;version="[3.1.1, 4.0.0)"',
 			'org.w3c.dom.*;version="0"',
 			'javax.script.*;version="0"'
 		]
@@ -655,11 +656,11 @@ project('spring-integration-security') {
 		importTemplate += [
 			'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.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.aop.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
 			'org.springframework.security.*;version="[3.0.3, 4.0.0)"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -681,12 +682,12 @@ project('spring-integration-sftp') {
 		bundleSymbolicName = 'org.springframework.integration.sftp'
 		importTemplate += [
 			'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.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.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'com.jcraft.jsch.*;version="[0.1.41, 0.1.50)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
@@ -704,9 +705,9 @@ project('spring-integration-stream') {
 		bundleSymbolicName = 'org.springframework.integration.stream'
 		importTemplate += [
 			'org.apache.commons.logging;version="[1.1.1, 2.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.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
 			'org.w3c.dom.*;version="0"'
 		]
 	}
@@ -725,8 +726,8 @@ project('spring-integration-test') {
 		bundleSymbolicName = 'org.springframework.integration.test'
 		importTemplate += [
 			'org.apache.tools.ant.*;version="[1.7.0, 2.0.0)"',
-			'org.springframework.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
+			'org.springframework.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
 			'junit.framework.*;version="[4.6.0, 4.7.0)"',
 			'org.junit.*;version="[4.6.0, 4.7.0)"',
 			'org.mockito.*;version="[1.6.0, 2.0.0)"',
@@ -758,16 +759,16 @@ project('spring-integration-twitter') {
 		importTemplate += [
 			'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.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.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.aop.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
 			'org.springframework.social.*;version="[1.0.0, 1.1.0)"',
 			'org.springframework.security.crypto.*;version="[3.1.0, 3.2.0)"',
-			'org.springframework.scheduling.*;version="[3.0.5, 4.0.0)"',
-			'org.springframework.util;version="[3.0.5, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
 		]
@@ -799,14 +800,14 @@ project('spring-integration-ws') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.ws'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'org.springframework.core.convert;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.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.web.*;version="[3.0.5, 4.0.0)"',
+			'org.springframework.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.core.convert;version="[3.1.1, 4.0.0)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.scheduling.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.web.*;version="[3.1.1, 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)"',
@@ -837,12 +838,12 @@ project('spring-integration-xml') {
 	bundlor {
 		bundleSymbolicName = 'org.springframework.integration.xml'
 		importTemplate += [
-			'org.springframework.integration.*;version="[2.1.0, 2.1.1)"',
-			'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.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.expression.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util.*;version="[3.1.1, 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)"',
@@ -868,11 +869,11 @@ project('spring-integration-xmpp') {
 		bundleSymbolicName = 'org.springframework.integration.xmpp'
 		importTemplate += [
 			'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.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.integration.*;version="[2.2.0, 2.2.1)"',
+			'org.springframework.beans.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.context;version="[3.1.1, 4.0.0)"',
+			'org.springframework.core.*;version="[3.1.1, 4.0.0)"',
+			'org.springframework.util;version="[3.1.1, 4.0.0)"',
 			'org.jivesoftware.*;version="[3.0.5, 4.0.0)"',
 			'javax.*;version="0"',
 			'org.w3c.dom.*;version="0"'
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=2.1.2.BUILD-SNAPSHOT
+version=2.2.0.BUILD-SNAPSHOT