From c52915bde6ac2eab7554fd665870d0c4f4592307 Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Tue, 16 Nov 2010 17:12:32 +0000
Subject: [PATCH] Add hamcrest to beans pom in the right place to make tests
 compile

---
 .gitignore                                | 6 ++++--
 org.springframework.beans/pom.xml         | 2 +-
 org.springframework.spring-parent/pom.xml | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 052e3e4a2dc..55517f74172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,15 @@
 target
+bin
 integration-repo
 ivy-cache
 jmx.log
 .springBeans
+.settings
 .DS_Store
 *.sw*
 org.springframework.test/test-output/
+org.springframework.spring-parent/.classpath
+org.springframework.spring-parent/.project
 build.sh
-org.springframework.beans/.settings/org.springframework.ide.eclipse.beans.core.prefs
-org.springframework.beans/.settings/org.springframework.ide.eclipse.core.prefs
 org.springframework.jdbc/derby.log
 spring-build
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 3ce23681f9a..67ae140c827 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -15,7 +15,7 @@
   <dependencies>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
+        <artifactId>hamcrest-all</artifactId>
         <scope>test</scope>
       </dependency>
     <dependency>
diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml
index 3c9572718c7..ee4be80e53b 100644
--- a/org.springframework.spring-parent/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -49,8 +49,8 @@
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>1.2</version>
+        <artifactId>hamcrest-all</artifactId>
+        <version>1.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>