From 97e3b5ca8c24e7954382b572ed30ad7094b107cc Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Wed, 5 Aug 2009 17:48:53 +0000
Subject: [PATCH] SPR-5976 - Upgrade POMS to JUnit 4.6

---
 org.springframework.aop/pom.xml               |  2 +-
 org.springframework.aspects/pom.xml           | 30 +++++++++++++++++++
 org.springframework.beans/pom.xml             |  2 +-
 org.springframework.context/pom.xml           |  2 +-
 org.springframework.core/pom.xml              |  2 +-
 org.springframework.expression/pom.xml        |  2 +-
 org.springframework.integration-tests/pom.xml | 14 ++++++++-
 org.springframework.jdbc/pom.xml              | 17 +++++++++--
 .../EmbeddedDatabaseBuilderTests.java         |  2 +-
 org.springframework.jms/pom.xml               |  2 +-
 org.springframework.orm/pom.xml               |  2 +-
 org.springframework.oxm/pom.xml               |  2 +-
 org.springframework.spring-parent/pom.xml     |  2 +-
 org.springframework.test/pom.xml              |  2 +-
 org.springframework.transaction/pom.xml       |  2 +-
 org.springframework.web.portlet/pom.xml       |  2 +-
 16 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 9fa456894cd8..12a50be4fd91 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index b4171ccd47ac..a90e6a7ff9b1 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -37,6 +37,36 @@
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context</artifactId>
+	<version>${project.version}</version>
+	<scope>compile</scope>
+    </dependency>
+    <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context-support</artifactId>
+	<version>${project.version}</version>
+	<optional>true</optional>
+    </dependency>
+    <dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-test</artifactId>
+	<version>${project.version}</version>
+	<scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 1e21dfaf5031..ef40b6524005 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index cea71e1cfd36..53098657aab4 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -178,7 +178,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index c622d99e1ca9..776dbc1c299f 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 2e9a7cedd796..05077bf8e884 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml
index 51ad2068018d..12444da761c1 100644
--- a/org.springframework.integration-tests/pom.xml
+++ b/org.springframework.integration-tests/pom.xml
@@ -149,6 +149,12 @@
       <artifactId>net.sf.jasperreports</artifactId>
       <version>2.0.5</version>
       <scope>test</scope>
+      <exclusions>
+	<exclusion>
+	  <groupId>xml-apis</groupId>
+	  <artifactId>xml-apis</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
@@ -281,6 +287,12 @@
       <artifactId>org.dom4j</artifactId>
       <version>1.6.1</version>
       <scope>test</scope>
+      <exclusions>
+	<exclusion>
+	  <groupId>xml-apis</groupId>
+	  <artifactId>xml-apis</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
@@ -459,7 +471,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index bd379d949610..8311ff5b6d2f 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -75,11 +75,11 @@
       <version>10.4.2.0</version>
       <scope>compile</scope>
       <optional>true</optional>      
-    </dependency>   
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,4 +95,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <testResources>
+      <testResource>
+        <directory>${pom.build.sourceDirectory}</directory>
+        <includes>
+          <include>**/*.sql</include>
+          <include>**/*.xml</include>
+        </includes>
+      </testResource>
+    </testResources>
+  </build>
+
 </project>
diff --git a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
index 0a61e4269c09..7b7ca46a188e 100644
--- a/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
+++ b/org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
@@ -30,7 +30,7 @@ public void testBuildH2() {
 		assertDatabaseCreatedAndShutdown(db);
 	}
 
-	@Test
+
 	public void testBuildDerby() {
 		EmbeddedDatabaseBuilder builder = EmbeddedDatabaseBuilder.relativeTo(getClass());
 		EmbeddedDatabase db = builder.type(DERBY).script("db-schema-derby.sql").script("db-test-data.sql").build();
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index 2ec8eaa0dff8..6a53763ce86f 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 2495f3b58491..53971964eaf0 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -207,7 +207,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 6d8bc15d1fc0..94d513287d52 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index 2499718efe8f..ccb90bea33ae 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -79,7 +79,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index ece2da977626..b46ccfd75722 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index 1bb85c17ef13..4df0fbcfd09e 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 98e5bc3acc50..68fa02511e22 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>