diff --git a/pom.xml b/pom.xml
index dee2cc4119..1627c13ad1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration
Spring Integration
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
pom
spring-integration-parent
@@ -36,7 +36,7 @@
Spring Integration
INT
${project.version}
- snapshot
+ milestone
${dist.id}-${dist.version}
${dist.finalName}.zip
target/${dist.fileName}
@@ -181,7 +181,7 @@
- org.springframework.integration.samples
+ org.springframework.integration.samples:com.springframework.integration.samples
http://static.springframework.org/spring/docs/3.0.3.RELEASE/javadoc-api
http://static.springsource.org/spring-integration/sites/${project.version}/apidocs
diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml
index cbcdff546b..e7e02acef4 100644
--- a/spring-integration-core/pom.xml
+++ b/spring-integration-core/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
spring-integration-core
diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml
index 073a51a677..9e67a359b5 100644
--- a/spring-integration-event/pom.xml
+++ b/spring-integration-event/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml
index 2dde9ad854..11e30e7850 100644
--- a/spring-integration-file/pom.xml
+++ b/spring-integration-file/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml
index 200415533e..459c979426 100644
--- a/spring-integration-groovy/pom.xml
+++ b/spring-integration-groovy/pom.xml
@@ -6,7 +6,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
org.springframework.integration
spring-integration-groovy
diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml
index 6a1714e396..8f57327f98 100644
--- a/spring-integration-http/pom.xml
+++ b/spring-integration-http/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml
index 3f52186228..bcd0643724 100644
--- a/spring-integration-httpinvoker/pom.xml
+++ b/spring-integration-httpinvoker/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml
index ebb6e47988..ab6d51767e 100644
--- a/spring-integration-ip/pom.xml
+++ b/spring-integration-ip/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index b8a8eadfc1..e9abb1e61b 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
spring-integration-jdbc
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index 1245c68575..f7da9f2cd4 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml
index 5b231f18d3..ea7d336bf9 100644
--- a/spring-integration-jmx/pom.xml
+++ b/spring-integration-jmx/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml
index 2aafa0b8f8..0407b40c88 100644
--- a/spring-integration-mail/pom.xml
+++ b/spring-integration-mail/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index 0eb0c895b1..6644b66159 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -6,7 +6,7 @@
spring-integration-parent
Spring Integration Parent
http://www.springsource.org/spring-integration
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
pom
UTF-8
diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml
index d024a45db1..405268d957 100644
--- a/spring-integration-rmi/pom.xml
+++ b/spring-integration-rmi/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml
index e803cdb580..d227ca8715 100644
--- a/spring-integration-samples/cafe/pom.xml
+++ b/spring-integration-samples/cafe/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
cafe
Spring Integration Cafe Sample
diff --git a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
index 53c8cbdad0..0d8101aea2 100644
--- a/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
+++ b/spring-integration-samples/cafe/src/main/resources/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Bundle-Version: 2.0.0.BUILD-SNAPSHOT
+Bundle-Version: 2.0.0.M6
Bundle-Name: org.springframework.integration.samples.cafe
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.springframework.integration.samples.cafe
diff --git a/spring-integration-samples/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml
index 889b9c52fe..c5e697ecd7 100644
--- a/spring-integration-samples/errorhandling/pom.xml
+++ b/spring-integration-samples/errorhandling/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
errorhandling
Spring Integration Error Handling Sample
diff --git a/spring-integration-samples/filecopy/pom.xml b/spring-integration-samples/filecopy/pom.xml
index 85a20dff48..aac8f5b43c 100644
--- a/spring-integration-samples/filecopy/pom.xml
+++ b/spring-integration-samples/filecopy/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
filecopy
Spring Integration File Copy Sample
diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml
index 8ee01e01a1..941fc9b615 100644
--- a/spring-integration-samples/helloworld/pom.xml
+++ b/spring-integration-samples/helloworld/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
helloworld
Spring Integration Hello World Sample
diff --git a/spring-integration-samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml
index 790df4b475..d8ffbcd132 100644
--- a/spring-integration-samples/jms/pom.xml
+++ b/spring-integration-samples/jms/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
jms
Spring Integration JMS Sample
diff --git a/spring-integration-samples/jmx/pom.xml b/spring-integration-samples/jmx/pom.xml
index 31f4e1713e..143a61a4ce 100644
--- a/spring-integration-samples/jmx/pom.xml
+++ b/spring-integration-samples/jmx/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
jmx
Spring Integration JMX Sample
diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml
index 3312671297..22403bd396 100644
--- a/spring-integration-samples/loan-broker/pom.xml
+++ b/spring-integration-samples/loan-broker/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
loan-broker
Spring Integration Loan Broker Sample
diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml
index 4472161a69..1c5715a0db 100644
--- a/spring-integration-samples/loanshark/pom.xml
+++ b/spring-integration-samples/loanshark/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
loanshark
Spring Integration Loan Shark Sample
diff --git a/spring-integration-samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml
index 5f7d473069..9973dfc1b9 100644
--- a/spring-integration-samples/oddeven/pom.xml
+++ b/spring-integration-samples/oddeven/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
oddeven
Spring Integration Odd-Even Sample
diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml
index 5e4d5ffbfb..fd1e533489 100644
--- a/spring-integration-samples/pom.xml
+++ b/spring-integration-samples/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration.samples
diff --git a/spring-integration-samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml
index 488e3caccb..bee1b68cbc 100644
--- a/spring-integration-samples/quote/pom.xml
+++ b/spring-integration-samples/quote/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
quote
Spring Integration Quote Sample
diff --git a/spring-integration-samples/ws-inbound-gateway/pom.xml b/spring-integration-samples/ws-inbound-gateway/pom.xml
index 43c02f0387..a24461d105 100644
--- a/spring-integration-samples/ws-inbound-gateway/pom.xml
+++ b/spring-integration-samples/ws-inbound-gateway/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
ws-inbound-gateway
Spring Integration WS Inbound Gateway Sample
diff --git a/spring-integration-samples/ws-outbound-gateway/pom.xml b/spring-integration-samples/ws-outbound-gateway/pom.xml
index f3b0d1777f..ac2ff68b49 100644
--- a/spring-integration-samples/ws-outbound-gateway/pom.xml
+++ b/spring-integration-samples/ws-outbound-gateway/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
ws-outbound-gateway
Spring Integration WS Outbound Gateway Sample
diff --git a/spring-integration-samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml
index c054a1fb73..9178e961b9 100644
--- a/spring-integration-samples/xml/pom.xml
+++ b/spring-integration-samples/xml/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration.samples
spring-integration-samples
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
xml
Spring Integration XML Sample
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index 715e9f9cb6..0176492868 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-security/template.mf b/spring-integration-security/template.mf
index ac2fe30ddb..973aec7a8e 100644
--- a/spring-integration-security/template.mf
+++ b/spring-integration-security/template.mf
@@ -10,5 +10,5 @@ Import-Template:
org.springframework.core;version="[3.0.0, 4.0.0)",
org.springframework.util.*;version="[3.0.0, 4.0.0)",
org.springframework.integration.*;version="[2.0.0, 2.0.1)",
- org.springframework.security.*;version="[2.0.5.RELEASE, 3.0.0)",
+ org.springframework.security.*;version="[3.0.0, 4.0.0)",
org.w3c.dom.*;version="0"
diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml
index 12c1174a89..731116b53f 100644
--- a/spring-integration-stream/pom.xml
+++ b/spring-integration-stream/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml
index 29eb61cf05..964a0f271a 100644
--- a/spring-integration-test/pom.xml
+++ b/spring-integration-test/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 88a5e9f54b..47739adab1 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index e671d9571a..2607d08af4 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -5,7 +5,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
../spring-integration-parent/pom.xml
org.springframework.integration
diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml
index 75c1a1b978..73fe94966c 100644
--- a/spring-integration-xmpp/pom.xml
+++ b/spring-integration-xmpp/pom.xml
@@ -6,7 +6,7 @@
org.springframework.integration
spring-integration-parent
- 2.0.0.BUILD-SNAPSHOT
+ 2.0.0.M6
spring-integration-xmpp
jar