Skip to content

Commit 2dba480

Browse files
committed
used specific SLF4J versions for running the test suites of individual modules (fixing the Hibernate Validator 4.2 upgrade)
1 parent 9d93b54 commit 2dba480

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

build.versions

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# common dependency versions
22
aspectj.version=1.6.8.RELEASE
3-
slf4j.version=1.5.3
43
junit.version=4.9.0
54
testng.version=5.12.1

org.springframework.context/ivy.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@
5151
<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
5252
<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional, groovy->compile"/>
5353
<dependency org="org.codehaus.jsr166-mirror" name="com.springsource.jsr166" rev="1.7.0" conf="provided->compile"/>
54-
<!-- the following works -->
55-
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="optional->compile"/>
56-
<!-- the following upgrade to 4.2.0.Final *should* work, but results in NoClassDefFound errors for net.sf.ehcache.store.MemoryStoreEvictionPolicy
5754
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.2.0.Final" conf="optional->compile"/>
58-
-->
5955
<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
6056
<dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, jruby->compile"/>
6157
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
@@ -74,7 +70,7 @@
7470
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
7571
<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
7672
<dependency org="org.hamcrest" name="com.springsource.org.hamcrest" rev="1.1.0" conf="test->runtime"/>
77-
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
73+
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.6.1" conf="test->runtime"/>
7874
</dependencies>
7975

8076
</ivy-module>

org.springframework.orm/ivy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
6363
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
6464
<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
65-
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
65+
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
6666
</dependencies>
6767

6868
</ivy-module>

org.springframework.test/ivy.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" conf="test->compile"/>
3737
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
3838
<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="optional->compile"/>
39-
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->compile"/>
39+
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->compile"/>
4040
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="optional->compile"/>
4141
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional->compile"/>
4242
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="optional->compile"/>

org.springframework.web.servlet/ivy.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,8 @@
103103
conf="test->compile"/>
104104
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
105105
<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
106-
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.1.0.GA" conf="test->runtime"/>
107-
<!-- causes NoClassDefFoundError: Could not initialize class org.hibernate.validator.engine.ConfigurationImpl
108106
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.2.0.Final" conf="test->runtime"/>
109-
-->
110-
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
107+
<dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.6.1" conf="test->runtime"/>
111108
<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="test->runtime"/>
112109
<dependency org="org.mortbay.jetty" name="com.springsource.org.mortbay.jetty.server" rev="6.1.9"
113110
conf="test->compile"/>

0 commit comments

Comments
 (0)