Skip to content

Commit

Permalink
fixed Hibernate Validator import range
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeams committed Aug 18, 2011
1 parent 58ea5a7 commit 66be6b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
12 changes: 5 additions & 7 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,25 @@ 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
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
2 changes: 1 addition & 1 deletion org.springframework.context/template.mf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.springframework.web.servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 66be6b7

Please sign in to comment.