From f0b5ff07a8ebc16036c37967c8366135825fd9bc Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Wed, 25 May 2011 18:15:47 +0200
Subject: [PATCH] Updated pom.xml files.

* use Maven artifacts over the ones from the EBR
* moved common test dependencies to parent pom
* updated dependency versions where possible
---
 core/pom.xml | 26 ++++----------------------
 pom.xml      | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b640001..a6d6a59 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -15,40 +15,22 @@
 	
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.beans</artifactId>
+			<artifactId>spring-beans</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<artifactId>spring-context</artifactId>
 			<version>${spring.version}</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.test</artifactId>
+			<artifactId>spring-test</artifactId>
 			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>com.springsource.org.apache.log4j</artifactId>
-			<version>1.2.15</version>
-			<scope>test</scope>
-		</dependency>
-        
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.8.2</version>
-			<scope>test</scope>
-		</dependency>
+		
 	</dependencies>
 
 
diff --git a/pom.xml b/pom.xml
index 0ba488f..51d6edc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,28 @@
             <timezone>+1</timezone>
         </developer>
     </developers>
+    
+    <dependencies>
+    	<dependency>
+    		<groupId>junit</groupId>
+    		<artifactId>junit</artifactId>
+    		<version>4.8.2</version>
+    		<scope>test</scope>
+    	</dependency>
+    	<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.8.4</version>
+			<scope>test</scope>
+		</dependency>
+    </dependencies>
+    
 
     <build>
         <plugins>