From a3c3b257e12986abf51944c9f551cf40c7e4b4aa Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sun, 11 Oct 2009 15:03:18 +0000
Subject: [PATCH] Pet Clinic tests now run against JUnit 4.7.

---
 org.springframework.samples.petclinic/.classpath    | 2 +-
 org.springframework.samples.petclinic/build.xml     | 1 +
 org.springframework.samples.petclinic/ivy.xml       | 4 +---
 org.springframework.samples.petclinic/petclinic.iml | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/org.springframework.samples.petclinic/.classpath b/org.springframework.samples.petclinic/.classpath
index 36b29c7aa4..b60cdffa6b 100644
--- a/org.springframework.samples.petclinic/.classpath
+++ b/org.springframework.samples.petclinic/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa/1.1.0/com.springsource.org.apache.openjpa-1.1.0.jar" sourcepath="/IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa/1.10/com.springsource.org.apache.openjpa-sources-1.10.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib/1.0.2/com.springsource.org.apache.openjpa.lib-1.0.2.jar" sourcepath="/IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.lib/1.0.2/com.springsource.org.apache.openjpa.lib-sources-1.0.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence/1.0.2/com.springsource.org.apache.openjpa.persistence-1.0.2.jar" sourcepath="/IVY_CACHE/org.apache.openjpa/com.springsource.org.apache.openjpa.persistence/1.0.2/com.springsource.org.apache.openjpa.persistence-sources-1.0.2.jar"/>
diff --git a/org.springframework.samples.petclinic/build.xml b/org.springframework.samples.petclinic/build.xml
index 75ee8575f1..5a9d4bb381 100644
--- a/org.springframework.samples.petclinic/build.xml
+++ b/org.springframework.samples.petclinic/build.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="org.springframework.samples.petclinic">
 	<property file="${basedir}/../build.properties"/>
+	<property file="${basedir}/../build.versions"/>
 	<import file="${basedir}/../spring-build/war/default.xml"/>
 </project>
diff --git a/org.springframework.samples.petclinic/ivy.xml b/org.springframework.samples.petclinic/ivy.xml
index 6a5e7ebec3..cb9760a198 100644
--- a/org.springframework.samples.petclinic/ivy.xml
+++ b/org.springframework.samples.petclinic/ivy.xml
@@ -42,10 +42,8 @@
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="compile->compile"/>
 
 		<!-- test dependencies -->
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.6.0" conf="test->compile" />
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile" />
 		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="compile->compile"/>
-
-		<!--dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->compile"/-->
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
 		<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations" rev="3.4.0.GA" conf="test->compile"/>
 
diff --git a/org.springframework.samples.petclinic/petclinic.iml b/org.springframework.samples.petclinic/petclinic.iml
index 34c67d1139..134ccb6324 100644
--- a/org.springframework.samples.petclinic/petclinic.iml
+++ b/org.springframework.samples.petclinic/petclinic.iml
@@ -173,11 +173,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar!/" />
+          <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>