From 66be6b7078c25ae58e787b4d9f709138f35b4d13 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 18 Aug 2011 23:38:19 +0000
Subject: [PATCH] fixed Hibernate Validator import range

---
 build.properties                        | 12 +++++-------
 org.springframework.context/template.mf |  2 +-
 org.springframework.web.servlet/pom.xml |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.properties b/build.properties
index 54bcfc6f7661..89fc9e6ad7c9 100644
--- a/build.properties
+++ b/build.properties
@@ -4,8 +4,6 @@ spring.osgi.range.nq=${version:[=.=.=, =.=.+1)}
 spring.osgi.range="${spring.osgi.range.nq}"
 aj.osgi.range="[1.5.4, 2.0.0)"
 
-#
-#release.type=integration
 natural.name=spring-framework
 project.name=Spring Framework
 project.key=SPR
@@ -13,18 +11,18 @@ ivy.cache.dir=${basedir}/../ivy-cache
 integration.repo.dir=${basedir}/../integration-repo
 license.dir=${basedir}/../build-spring-framework/resources
 javadoc.exclude.package.names=org/springframework/samples/**
-javadoc.max.memory=256M
+javadoc.max.memory=1024M
 test.vm.args=-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError
 compiler.args=-enableJavadoc -warn:none
 
 # For when releasing
-#release.type=release
-#build.stamp=RELEASE
+release.type=release
+build.stamp=RELEASE
 
 # For when releasing milestones
 #release.type=milestone
 #build.stamp=M1
 
 # For development in trunk
-release.type=integration
-build.stamp=BUILD-SNAPSHOT
+#release.type=integration
+#build.stamp=BUILD-SNAPSHOT
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index 0520294124d9..6e6564b7e7c4 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -27,7 +27,7 @@ Import-Template:
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
  org.aspectj.weaver.*;version=${aj.osgi.range};resolution:=optional,
  org.codehaus.groovy.*;version="[1.5.0, 2.0.0)";resolution:=optional,
- org.hibernate.validator.*;version="[4.1.0, 5.0.0)";resolution:=optional,
+ org.hibernate.validator.*;version="[4.0.0, 5.0.0)";resolution:=optional,
  org.joda.*;version="[1.6.0, 2.0.0)";resolution:=optional,
  org.jruby.*;version="[1.1.0, 2.0.0)";resolution:=optional,
  org.omg.CORBA.*;version="0";resolution:=optional,
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 3f4eb08588f8..6a4c9ccb60e8 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -282,7 +282,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>4.0.0.GA</version>
+			<version>4.1.0.GA</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>