From 1d3f4b298701e4edf824690cf6ef24af895e4081 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Mon, 22 Nov 2010 14:58:24 -0700
Subject: [PATCH] Upgrade junit:junit:4.7 -> junit:junit-dep:4.8.2

junit-dep does not bundle dependencies like hamcrest. This avoids
'duplicate package org.hamcrest' errors during javadoc generation
---
 build.gradle                           | 15 ++++--
 spring-integration-event/pom.xml       | 18 +++----
 spring-integration-feed/pom.xml        | 72 +++++++++++++-------------
 spring-integration-file/pom.xml        | 18 +++----
 spring-integration-ftp/pom.xml         | 40 ++++++--------
 spring-integration-groovy/pom.xml      | 18 +++----
 spring-integration-http/pom.xml        | 64 +++++++++++------------
 spring-integration-httpinvoker/pom.xml | 18 +++----
 spring-integration-ip/pom.xml          | 18 +++----
 spring-integration-jdbc/pom.xml        | 30 +++++------
 spring-integration-jms/pom.xml         | 10 +---
 spring-integration-jmx/pom.xml         | 18 +++----
 spring-integration-mail/pom.xml        | 34 +++++-------
 spring-integration-rmi/pom.xml         | 18 +++----
 spring-integration-security/pom.xml    | 70 ++++++++++++-------------
 spring-integration-sftp/pom.xml        | 18 +++----
 spring-integration-stream/pom.xml      | 18 +++----
 spring-integration-test/pom.xml        | 18 +++----
 spring-integration-twitter/pom.xml     | 46 +++++++---------
 spring-integration-ws/pom.xml          | 18 +++----
 spring-integration-xml/pom.xml         | 10 +---
 spring-integration-xmpp/pom.xml        | 18 +++----
 22 files changed, 249 insertions(+), 358 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11ba2d116c..42ade5cd4f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,7 +116,7 @@ configure(javaprojects) {
     easymockVersion = '2.3'
     jacksonVersion = '1.4.3'
     javaxActivationVersion = '1.1.1'
-    junitVersion = '4.7'
+    junitVersion = '4.8.2'
     log4jVersion = '1.2.12'
     mockitoVersion = '1.8.4'
     springVersion = '3.0.5.RELEASE'
@@ -134,7 +134,7 @@ configure(javaprojects) {
     // dependencies that are common across all java projects
     dependencies {
         testCompile "cglib:cglib-nodep:$cglibVersion"
-        testCompile "junit:junit:$junitVersion"
+        testCompile "junit:junit-dep:$junitVersion"
         testCompile "log4j:log4j:$log4jVersion"
         testCompile "org.easymock:easymock:$easymockVersion"
         testCompile "org.easymock:easymockclassextension:$easymockVersion"
@@ -185,7 +185,9 @@ project('spring-integration-feed') {
     dependencies {
         compile project(":spring-integration-core")
         compile "org.springframework:spring-context:$springVersion"
-        compile "net.java.dev.rome:rome-fetcher:1.0.0"
+        compile("net.java.dev.rome:rome-fetcher:1.0.0") {
+            exclude group: 'junit', module: 'junit'
+        }
         compile "net.java.dev.rome:rome:1.0.0"
         testCompile project(":spring-integration-test")
     }
@@ -226,7 +228,10 @@ project('spring-integration-http') {
         compile project(":spring-integration-core")
         compile "org.springframework:spring-webmvc:$springVersion"
         compile("javax.servlet:servlet-api:2.4") { provided = true }
-        compile("commons-httpclient:commons-httpclient:3.1") { optional = true }
+        compile("commons-httpclient:commons-httpclient:3.1") {
+            optional = true
+            exclude group: 'junit', module: 'junit'
+        }
         testCompile project(":spring-integration-test")
     }
 }
@@ -352,7 +357,7 @@ project('spring-integration-test') {
     description = 'Spring Integration Test Support'
     dependencies {
         compile project(":spring-integration-core")
-        compile "junit:junit:$junitVersion"
+        compile "junit:junit-dep:$junitVersion"
         compile "org.mockito:mockito-all:$mockitoVersion"
         compile "org.springframework:spring-context:$springVersion"
     }
diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml
index 1e93cef2af..c50c7318ad 100644
--- a/spring-integration-event/pom.xml
+++ b/spring-integration-event/pom.xml
@@ -94,12 +94,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -112,12 +106,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -130,6 +118,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml
index 0e17a14fb8..4932a5c04e 100644
--- a/spring-integration-feed/pom.xml
+++ b/spring-integration-feed/pom.xml
@@ -70,30 +70,6 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.rome</groupId>
-      <artifactId>rome-fetcher</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</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>
@@ -114,14 +90,26 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
+      <artifactId>spring-context</artifactId>
       <version>3.0.5.RELEASE</version>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
+      <groupId>net.java.dev.rome</groupId>
+      <artifactId>rome-fetcher</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.0.5.RELEASE</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -131,16 +119,22 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <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.0.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.java.dev.rome</groupId>
@@ -148,6 +142,12 @@
       <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-core</artifactId>
+      <version>2.0.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml
index c708411293..cbfb8b2593 100644
--- a/spring-integration-file/pom.xml
+++ b/spring-integration-file/pom.xml
@@ -94,12 +94,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -112,12 +106,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -130,6 +118,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml
index f475190266..c68aa70242 100644
--- a/spring-integration-ftp/pom.xml
+++ b/spring-integration-ftp/pom.xml
@@ -71,15 +71,9 @@
   </build>
   <dependencies>
     <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>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -88,12 +82,6 @@
       <version>2.0</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>
@@ -125,12 +113,6 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -143,10 +125,22 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml
index 0c8bf3d20e..922999c439 100644
--- a/spring-integration-groovy/pom.xml
+++ b/spring-integration-groovy/pom.xml
@@ -82,12 +82,6 @@
       <version>2.3</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>
@@ -106,12 +100,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
@@ -130,6 +118,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml
index fd1e7a69b3..3937b87c90 100644
--- a/spring-integration-http/pom.xml
+++ b/spring-integration-http/pom.xml
@@ -70,41 +70,29 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</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.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>3.1</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit</artifactId>
+          <groupId>junit</groupId>
+        </exclusion>
+      </exclusions>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -125,22 +113,34 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml
index da76bf1b3a..86c843b889 100644
--- a/spring-integration-httpinvoker/pom.xml
+++ b/spring-integration-httpinvoker/pom.xml
@@ -94,12 +94,6 @@
       <version>2.3</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>
@@ -118,12 +112,6 @@
       <version>2.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -136,6 +124,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml
index 2585ac878c..48a330569d 100644
--- a/spring-integration-ip/pom.xml
+++ b/spring-integration-ip/pom.xml
@@ -100,12 +100,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -118,12 +112,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -136,6 +124,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml
index b121b5df4c..b77f253a61 100644
--- a/spring-integration-jdbc/pom.xml
+++ b/spring-integration-jdbc/pom.xml
@@ -82,18 +82,18 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>10.5.3.0_1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjweaver</artifactId>
       <version>1.6.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.5.3.0_1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
@@ -142,12 +142,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -166,18 +160,18 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
       <version>1.6.8</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml
index 44d252e7ba..c963150052 100644
--- a/spring-integration-jms/pom.xml
+++ b/spring-integration-jms/pom.xml
@@ -142,12 +142,6 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -156,8 +150,8 @@
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml
index 3ace60194e..7e00135076 100644
--- a/spring-integration-jmx/pom.xml
+++ b/spring-integration-jmx/pom.xml
@@ -88,12 +88,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -112,12 +106,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
@@ -136,6 +124,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml
index 5bcc5bc03e..0c3fae0053 100644
--- a/spring-integration-mail/pom.xml
+++ b/spring-integration-mail/pom.xml
@@ -70,18 +70,6 @@
     </plugins>
   </build>
   <dependencies>
-    <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>
@@ -119,12 +107,6 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -137,10 +119,22 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml
index 6c04f8e6ea..109c8ff307 100644
--- a/spring-integration-rmi/pom.xml
+++ b/spring-integration-rmi/pom.xml
@@ -94,12 +94,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -112,12 +106,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -130,6 +118,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml
index 9156c2c9db..6f05b8e488 100644
--- a/spring-integration-security/pom.xml
+++ b/spring-integration-security/pom.xml
@@ -70,30 +70,6 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>3.0.5.RELEASE</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-support</artifactId>
-          <groupId>org.springframework</groupId>
-        </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.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -124,18 +100,6 @@
       <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.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.8.4</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-config</artifactId>
@@ -148,10 +112,40 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.8.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>3.0.5.RELEASE</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>spring-support</artifactId>
+          <groupId>org.springframework</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml
index 41050b72b0..b19ebc7a93 100644
--- a/spring-integration-sftp/pom.xml
+++ b/spring-integration-sftp/pom.xml
@@ -131,30 +131,24 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml
index 9e03b9767e..8cf106062c 100644
--- a/spring-integration-stream/pom.xml
+++ b/spring-integration-stream/pom.xml
@@ -88,12 +88,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -106,12 +100,6 @@
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -124,6 +112,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml
index 18c3f73b23..d48b06eca7 100644
--- a/spring-integration-test/pom.xml
+++ b/spring-integration-test/pom.xml
@@ -88,12 +88,6 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</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>
@@ -106,12 +100,6 @@
       <version>1.8.4</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
@@ -124,6 +112,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml
index 2aeedb33d5..ce2539ec6b 100644
--- a/spring-integration-twitter/pom.xml
+++ b/spring-integration-twitter/pom.xml
@@ -70,24 +70,6 @@
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>org.twitter4j</groupId>
-      <artifactId>twitter4j-core</artifactId>
-      <version>2.1.3</version>
-      <scope>compile</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>
@@ -119,12 +101,6 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -137,10 +113,28 @@
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.twitter4j</groupId>
+      <artifactId>twitter4j-core</artifactId>
+      <version>2.1.3</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 36cbc9fe0a..218f2505b3 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -151,30 +151,24 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
       <version>2.0.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index b0f1f8d4fc..4cae21d715 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -131,12 +131,6 @@
       <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.ws</groupId>
       <artifactId>spring-xml</artifactId>
@@ -151,8 +145,8 @@
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml
index 30ffe77d56..1b30cf94e7 100644
--- a/spring-integration-xmpp/pom.xml
+++ b/spring-integration-xmpp/pom.xml
@@ -131,30 +131,24 @@
       <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.mockito</groupId>
       <artifactId>mockito-all</artifactId>
       <version>1.8.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.7</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
       <version>3.0.5.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>