diff --git a/org.springframework.aspects/ivy.xml b/org.springframework.aspects/ivy.xml index ae5786d640b..415b3dc3dd2 100644 --- a/org.springframework.aspects/ivy.xml +++ b/org.springframework.aspects/ivy.xml @@ -28,7 +28,7 @@ - + diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index 018d517fb44..88ae3a456da 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -26,12 +26,6 @@ 1.6.2 true - - org.freemarker - freemarker - 2.3.15 - true - javax.activation activation @@ -47,7 +41,7 @@ net.sf.ehcache ehcache - 1.3.0 + 1.6.2 true @@ -81,9 +75,9 @@ true - jfree - jfreechart - 1.0.9 + org.freemarker + freemarker + 2.3.15 true diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml index 88177933714..947434308ce 100644 --- a/org.springframework.jdbc/pom.xml +++ b/org.springframework.jdbc/pom.xml @@ -92,12 +92,6 @@ easymock test - - commons-collections - commons-collections - 3.2 - test - diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml index 46065e3dcdd..cfbd928794e 100644 --- a/org.springframework.test/pom.xml +++ b/org.springframework.test/pom.xml @@ -50,14 +50,10 @@ provided - junit - junit - 3.8.2 - true - - - junit - junit + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + provided commons-logging @@ -77,10 +73,37 @@ true - org.testng - testng - 5.10 - jdk15 + org.hibernate + hibernate-core + 3.3.1.GA + true + test + + + org.hibernate + hibernate-cglib-repack + 2.1_3 + test + + + hsqldb + hsqldb + 1.8.0.7 + test + + + junit + junit + 3.8.2 + true + + + junit + junit + + + org.aspectj + aspectjweaver true @@ -144,23 +167,13 @@ true - hsqldb - hsqldb - 1.8.0.7 - test - - - org.hibernate - hibernate-core - 3.3.1.GA + org.testng + testng + 5.10 + jdk15 true - test - - - org.hibernate - hibernate-cglib-repack - 2.2 - test + + diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml index 8472a83c56f..b360af6c08a 100644 --- a/org.springframework.web.servlet/pom.xml +++ b/org.springframework.web.servlet/pom.xml @@ -120,10 +120,16 @@ true - rhino - js - 1.7R1 - test + org.apache.tiles + tiles-servlet + 2.1.2 + true + + + apache-taglibs + standard + 1.1.2 + true velocity @@ -137,6 +143,12 @@ 1.4 true + + org.codehaus.jackson + jackson-mapper-asl + 1.0.1 + true + org.springframework spring-asm @@ -245,6 +257,12 @@ 2.2 test + + rhino + js + 1.7R1 + test + org.hibernate hibernate-core @@ -260,17 +278,21 @@ true - jfree - jfreechart - 1.0.7 - runtime - true + javax.validation + com.springsource.javax.validation + 1.0.0.CR3 - org.codehaus.jackson - jackson-mapper-asl - 1.0.1 - true + org.hibernate + hibernate-validator + 4.0.0.Beta2 + test + + org.slf4j + slf4j-jcl + 1.5.3 + test + diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml index afd048f7abd..ef79991da98 100644 --- a/org.springframework.web/pom.xml +++ b/org.springframework.web/pom.xml @@ -19,12 +19,15 @@ 3.2.1 true + + javax.el el-api