diff --git a/build.gradle b/build.gradle
index 7a1cbf07d6..631d752b78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,14 +62,15 @@ allprojects {
 
     // default set of maven repositories to be used when resolving dependencies
     repositories {
-        mavenRepo urls: 'http://maven.springframework.org/snapshot'
+        mavenRepo name: 'SpringSource Snapshot Repository', urls: 'http://maven.springframework.org/snapshot'
+        mavenRepo name: 'SpringSource Milestone Repository',  urls: 'http://maven.springframework.org/milestone'
         mavenCentral()
-        mavenRepo urls: 'http://maven.springframework.org/release'
-        mavenRepo urls: 'http://maven.springframework.org/milestone'
-        mavenRepo urls: 'http://repository.springsource.com/maven/bundles/external'
-        mavenRepo urls: 'http://repository.springsource.com/maven/bundles/release'
-        mavenRepo urls: 'http://repository.springsource.com/maven/bundles/milestone'
-        mavenRepo urls: 'http://download.java.net/maven/2' // for javax.mail 1.4.3
+        // only really necessary for artifacts not yet in Maven Central, i.e. immediately post-release
+        mavenRepo name: 'SpringSource Release Repository', urls: 'http://maven.springframework.org/release'
+        // needed for bundlor:
+        mavenRepo name: 'SpringSource Release Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/release'
+        // needed for external dependencies required by bundlor:
+        mavenRepo name: 'SpringSource External Bundle Repository', urls: 'http://repository.springsource.com/maven/bundles/external'
     }
 }
 
diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml
index 7098fc50a3..935fe09028 100644
--- a/spring-integration-amqp/pom.xml
+++ b/spring-integration-amqp/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -112,30 +104,6 @@
       <version>2.1.0.BUILD-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-      <version>2.3</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-rabbit</artifactId>
@@ -168,6 +136,36 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <version>2.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-test</artifactId>
@@ -198,12 +196,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml
index 465115cd36..483cf7fe6b 100644
--- a/spring-integration-event/pom.xml
+++ b/spring-integration-event/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -142,12 +140,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml
index 49a4558cd9..e7bd980cc2 100644
--- a/spring-integration-feed/pom.xml
+++ b/spring-integration-feed/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -130,6 +122,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -166,12 +164,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>net.java.dev.rome</groupId>
       <artifactId>rome</artifactId>
diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml
index 8f3ae3d163..1aedbe0ae2 100644
--- a/spring-integration-file/pom.xml
+++ b/spring-integration-file/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -142,12 +140,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml
index 149a276f95..063d7af88c 100644
--- a/spring-integration-ftp/pom.xml
+++ b/spring-integration-ftp/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-file</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -161,12 +159,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-file</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml
index ae87fa2f89..944282ad46 100644
--- a/spring-integration-gemfire/pom.xml
+++ b/spring-integration-gemfire/pom.xml
@@ -70,37 +70,29 @@
     </plugins>
   </build>
   <repositories>
+    <repository>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
+    </repository>
+    <repository>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
+    </repository>
+    <repository>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
+    </repository>
+    <repository>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
+    </repository>
+    <repository>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
+    </repository>
     <repository>
       <id>http://dist.gemstone.com/maven/release</id>
-      <url>http://dist.gemstone.com/maven/release</url>
-    </repository>
-    <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <url>http://dist.gemstone.com/maven/release/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -128,6 +120,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -164,12 +162,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.data.gemfire</groupId>
       <artifactId>spring-gemfire</artifactId>
diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml
index 95570dfc73..cca1fbfb06 100644
--- a/spring-integration-groovy/pom.xml
+++ b/spring-integration-groovy/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -142,12 +140,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml
index 4d66494472..a71fe40ca3 100644
--- a/spring-integration-http/pom.xml
+++ b/spring-integration-http/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -124,6 +116,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -173,12 +171,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml
index 498962880d..31ecc52eb3 100644
--- a/spring-integration-ip/pom.xml
+++ b/spring-integration-ip/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -148,12 +146,6 @@
       <version>2.1.0.BUILD-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index 211cee341f..791d7da180 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -71,37 +71,29 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
+    </repository>
+    <repository>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
     <repository>
       <id>http://objectstyle.org/maven2/</id>
       <url>http://objectstyle.org/maven2/</url>
     </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </repository>
   </repositories>
   <dependencies>
     <dependency>
@@ -128,6 +120,12 @@
       <version>1.6.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -135,10 +133,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib-nodep</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
@@ -200,12 +198,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index e5ff07b9f2..49c34ddaee 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -142,6 +134,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -166,30 +164,24 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml
index ee88754464..ca494b9031 100644
--- a/spring-integration-jmx/pom.xml
+++ b/spring-integration-jmx/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -124,6 +116,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -160,12 +158,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml
index ec72bb7b82..46af8e2fd4 100644
--- a/spring-integration-mail/pom.xml
+++ b/spring-integration-mail/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -112,6 +104,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -155,12 +153,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml
index 52214a2bfe..8f6bdadb03 100644
--- a/spring-integration-mongodb/pom.xml
+++ b/spring-integration-mongodb/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -130,6 +122,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -166,12 +164,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml
index 279f4820bb..fe0003c837 100644
--- a/spring-integration-redis/pom.xml
+++ b/spring-integration-redis/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -162,6 +154,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -186,30 +184,24 @@
       <version>1.8.3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml
index ef59db944c..6a70a76472 100644
--- a/spring-integration-rmi/pom.xml
+++ b/spring-integration-rmi/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -148,12 +146,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml
index 3b456f755d..f8fdb3fb37 100644
--- a/spring-integration-scripting/pom.xml
+++ b/spring-integration-scripting/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -142,12 +140,6 @@
       <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index 8b4d071e94..32a838a726 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -124,6 +116,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -178,12 +176,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml
index f0a03d2c78..ca7f90c046 100644
--- a/spring-integration-sftp/pom.xml
+++ b/spring-integration-sftp/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-file</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jsch</artifactId>
@@ -124,6 +122,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -167,24 +171,12 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-file</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml
index 9d82d5cb4f..262cd3be1c 100644
--- a/spring-integration-stream/pom.xml
+++ b/spring-integration-stream/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -136,12 +134,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml
index 31ed29ab1f..66b2910fcf 100644
--- a/spring-integration-test/pom.xml
+++ b/spring-integration-test/pom.xml
@@ -71,35 +71,33 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -136,12 +134,6 @@
       <version>1.8.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml
index 676954c2d2..b214fcd810 100644
--- a/spring-integration-twitter/pom.xml
+++ b/spring-integration-twitter/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -118,6 +110,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -161,12 +159,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index e66121f402..6603dc240e 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -164,6 +156,12 @@
       </exclusions>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -213,12 +211,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index 695173b6e2..cb7f9cc090 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -158,6 +150,12 @@
       <version>2.0EA3</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -176,12 +174,6 @@
       <version>1.0.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-test</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -189,6 +181,12 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
@@ -207,12 +205,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml
index 4b67f27bbf..446bf42196 100644
--- a/spring-integration-xmpp/pom.xml
+++ b/spring-integration-xmpp/pom.xml
@@ -71,32 +71,24 @@
   </build>
   <repositories>
     <repository>
-      <id>http://download.java.net/maven/2</id>
-      <url>http://download.java.net/maven/2</url>
+      <id>SpringSource External Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/external/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/milestone</id>
-      <url>http://maven.springframework.org/milestone</url>
+      <id>SpringSource Milestone Repository</id>
+      <url>http://maven.springframework.org/milestone/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/release</id>
-      <url>http://maven.springframework.org/release</url>
+      <id>SpringSource Release Bundle Repository</id>
+      <url>http://repository.springsource.com/maven/bundles/release/</url>
     </repository>
     <repository>
-      <id>http://maven.springframework.org/snapshot</id>
-      <url>http://maven.springframework.org/snapshot</url>
+      <id>SpringSource Release Repository</id>
+      <url>http://maven.springframework.org/release/</url>
     </repository>
     <repository>
-      <id>http://repository.springsource.com/maven/bundles/external</id>
-      <url>http://repository.springsource.com/maven/bundles/external</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/milestone</id>
-      <url>http://repository.springsource.com/maven/bundles/milestone</url>
-    </repository>
-    <repository>
-      <id>http://repository.springsource.com/maven/bundles/release</id>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
+      <id>SpringSource Snapshot Repository</id>
+      <url>http://maven.springframework.org/snapshot/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -118,6 +110,12 @@
       <version>1.2.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.1.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -179,12 +177,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration</groupId>
-      <artifactId>spring-integration-core</artifactId>
-      <version>2.1.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>