diff --git a/build.versions b/build.versions index 3ecf22342c9..6fa5d9a7033 100644 --- a/build.versions +++ b/build.versions @@ -1,2 +1,6 @@ +#common dependency versions +aspectj.version=1.6.8.RELEASE +commons.pool.version=1.5.3 +slf4j.version=1.5.10 org.testng.version=5.10.0 org.junit.version=4.7.0 \ No newline at end of file diff --git a/org.springframework.aop/build.xml b/org.springframework.aop/build.xml index 4ce649f89d0..73cf8acf0fd 100644 --- a/org.springframework.aop/build.xml +++ b/org.springframework.aop/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.aop/ivy.xml b/org.springframework.aop/ivy.xml index d5676e27cd2..c09103b4f36 100644 --- a/org.springframework.aop/ivy.xml +++ b/org.springframework.aop/ivy.xml @@ -28,14 +28,14 @@ - - + + - + diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml index e1c29daea08..b4996bf2f87 100644 --- a/org.springframework.aop/pom.xml +++ b/org.springframework.aop/pom.xml @@ -35,7 +35,7 @@ commons-pool commons-pool - 1.4 + 1.5.3 true diff --git a/org.springframework.aspects/build.xml b/org.springframework.aspects/build.xml index a424a62bb28..149f2f61a50 100644 --- a/org.springframework.aspects/build.xml +++ b/org.springframework.aspects/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.aspects/ivy.xml b/org.springframework.aspects/ivy.xml index ccd472da3ce..4277c715dc7 100644 --- a/org.springframework.aspects/ivy.xml +++ b/org.springframework.aspects/ivy.xml @@ -24,14 +24,14 @@ - + - + diff --git a/org.springframework.beans/build.xml b/org.springframework.beans/build.xml index 027fd641d7f..4bde9eb6e49 100644 --- a/org.springframework.beans/build.xml +++ b/org.springframework.beans/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.beans/ivy.xml b/org.springframework.beans/ivy.xml index f8629d95d7f..1b6cd508f0c 100644 --- a/org.springframework.beans/ivy.xml +++ b/org.springframework.beans/ivy.xml @@ -28,7 +28,7 @@ - + diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml index 9064dbc0afc..81bbce4f1f3 100644 --- a/org.springframework.beans/pom.xml +++ b/org.springframework.beans/pom.xml @@ -21,8 +21,8 @@ javax.inject - com.springsource.javax.inject - 0.9.0.PFD + javax.inject + 1 provided diff --git a/org.springframework.context.support/build.xml b/org.springframework.context.support/build.xml index 643fa1f7b80..67d632d055c 100644 --- a/org.springframework.context.support/build.xml +++ b/org.springframework.context.support/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.context.support/ivy.xml b/org.springframework.context.support/ivy.xml index 2bb0e8507fe..dcbdf187e6d 100644 --- a/org.springframework.context.support/ivy.xml +++ b/org.springframework.context.support/ivy.xml @@ -49,7 +49,7 @@ - + diff --git a/org.springframework.context/build.xml b/org.springframework.context/build.xml index 2f9d8d2485d..24653c5c4b9 100644 --- a/org.springframework.context/build.xml +++ b/org.springframework.context/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml index 506d42a0e5b..c314fe1d220 100644 --- a/org.springframework.context/ivy.xml +++ b/org.springframework.context/ivy.xml @@ -43,7 +43,7 @@ - + @@ -63,8 +63,8 @@ - - + + diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index 2391e5710b0..0fb3f1700e4 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -169,7 +169,7 @@ commons-pool commons-pool - 1.4 + 1.5.3 test diff --git a/org.springframework.core/build.xml b/org.springframework.core/build.xml index dd79022c7d1..9ec442705ab 100644 --- a/org.springframework.core/build.xml +++ b/org.springframework.core/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml index b0d0bf29ce3..9f1acc53c15 100644 --- a/org.springframework.core/ivy.xml +++ b/org.springframework.core/ivy.xml @@ -25,12 +25,12 @@ - + - + diff --git a/org.springframework.expression/build.xml b/org.springframework.expression/build.xml index 04d8ce0c7c4..bf253006024 100644 --- a/org.springframework.expression/build.xml +++ b/org.springframework.expression/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.instrument/build.xml b/org.springframework.instrument/build.xml index 237154117b5..a86d256c232 100644 --- a/org.springframework.instrument/build.xml +++ b/org.springframework.instrument/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.integration-tests/build.xml b/org.springframework.integration-tests/build.xml index 618aca54f4c..22af73bde8f 100644 --- a/org.springframework.integration-tests/build.xml +++ b/org.springframework.integration-tests/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml index 5f4a06a8317..f443290228e 100644 --- a/org.springframework.integration-tests/ivy.xml +++ b/org.springframework.integration-tests/ivy.xml @@ -22,15 +22,13 @@ - - - + @@ -63,7 +61,7 @@ - + @@ -74,7 +72,7 @@ - + @@ -94,7 +92,7 @@ - + diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml index b7c6b3b2b4f..5b9133e55f1 100644 --- a/org.springframework.integration-tests/pom.xml +++ b/org.springframework.integration-tests/pom.xml @@ -30,24 +30,12 @@ 1.6.2 test - - com.oracle.oc4j - oracle.classloader - 10.1.3.1 - provided - com.oracle.toplink.essentials oracle.toplink.essentials 2.0.0.b41-beta2 test - - com.sun.enterprise - com.sun.enterprise.loader - 1.0 - test - com.sun.syndication com.sun.syndication @@ -189,7 +177,7 @@ commons-pool commons-pool - 1.4 + 1.5.3 test diff --git a/org.springframework.jdbc/build.xml b/org.springframework.jdbc/build.xml index c8b6069577a..c93d64ea056 100644 --- a/org.springframework.jdbc/build.xml +++ b/org.springframework.jdbc/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.jdbc/ivy.xml b/org.springframework.jdbc/ivy.xml index f0f28025bec..152a85e9067 100644 --- a/org.springframework.jdbc/ivy.xml +++ b/org.springframework.jdbc/ivy.xml @@ -35,7 +35,7 @@ - + diff --git a/org.springframework.jms/build.xml b/org.springframework.jms/build.xml index 5df978288cd..47a67616c0f 100644 --- a/org.springframework.jms/build.xml +++ b/org.springframework.jms/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.jms/ivy.xml b/org.springframework.jms/ivy.xml index 8a84235c73f..3f43b50d204 100644 --- a/org.springframework.jms/ivy.xml +++ b/org.springframework.jms/ivy.xml @@ -29,10 +29,10 @@ - - + commons-pool commons-pool - 1.3 + 1.5.3 true @@ -57,37 +57,37 @@ org.springframework spring-aop - 3.0.1.BUILD-SNAPSHOT + ${project.version} compile org.springframework spring-beans - 3.0.1.BUILD-SNAPSHOT + ${project.version} compile org.springframework spring-context - 3.0.1.BUILD-SNAPSHOT + ${project.version} compile org.springframework spring-core - 3.0.1.BUILD-SNAPSHOT + ${project.version} compile org.springframework spring-oxm - 3.0.1.BUILD-SNAPSHOT + ${project.version} true org.springframework spring-tx - 3.0.1.BUILD-SNAPSHOT + ${project.version} true diff --git a/org.springframework.orm/build.xml b/org.springframework.orm/build.xml index ac4c8153a52..6737c9d6d61 100644 --- a/org.springframework.orm/build.xml +++ b/org.springframework.orm/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.orm/ivy.xml b/org.springframework.orm/ivy.xml index 6e2b2e29a54..14eb8dd2c80 100644 --- a/org.springframework.orm/ivy.xml +++ b/org.springframework.orm/ivy.xml @@ -53,7 +53,7 @@ - + diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml index f3246420a50..8de34f3c7ac 100644 --- a/org.springframework.orm/pom.xml +++ b/org.springframework.orm/pom.xml @@ -182,6 +182,12 @@ 1.2.2 test + + commons-pool + commons-pool + 1.5.3 + test + org.easymock easymock diff --git a/org.springframework.oxm/build.xml b/org.springframework.oxm/build.xml index 9623453fb1f..f1acbfae3b6 100644 --- a/org.springframework.oxm/build.xml +++ b/org.springframework.oxm/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.oxm/ivy.xml b/org.springframework.oxm/ivy.xml index 792e0d11e49..f4e05e3edd8 100644 --- a/org.springframework.oxm/ivy.xml +++ b/org.springframework.oxm/ivy.xml @@ -48,7 +48,7 @@ - + diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml index fe6b11dd4d9..cd944ffb0e1 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -38,7 +38,7 @@ javax.inject com.springsource.javax.inject - 0.9.0.PFD + 1.0.0 provided @@ -50,7 +50,7 @@ org.aspectj aspectjweaver - 1.6.5 + 1.6.8 true @@ -62,12 +62,12 @@ org.slf4j slf4j-api - 1.5.8 + 1.5.10 org.slf4j slf4j-log4j12 - 1.5.8 + 1.5.10 log4j diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml index 4f2e2897d78..899d4c24da7 100644 --- a/org.springframework.test/ivy.xml +++ b/org.springframework.test/ivy.xml @@ -22,7 +22,7 @@ - + @@ -30,12 +30,12 @@ - + - + diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml index 3b7a0affc0a..7ed46168b05 100644 --- a/org.springframework.test/pom.xml +++ b/org.springframework.test/pom.xml @@ -27,8 +27,8 @@ javax.inject - com.springsource.javax.inject - 0.9.0.PFD + javax.inject + 1 test diff --git a/org.springframework.transaction/build.xml b/org.springframework.transaction/build.xml index 0e16faffdb8..257816b5989 100644 --- a/org.springframework.transaction/build.xml +++ b/org.springframework.transaction/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.transaction/ivy.xml b/org.springframework.transaction/ivy.xml index ebce68522f7..de64935e012 100644 --- a/org.springframework.transaction/ivy.xml +++ b/org.springframework.transaction/ivy.xml @@ -34,8 +34,8 @@ - - + + diff --git a/org.springframework.web.portlet/build.xml b/org.springframework.web.portlet/build.xml index ce0ccd56387..c463a792db4 100644 --- a/org.springframework.web.portlet/build.xml +++ b/org.springframework.web.portlet/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.web.portlet/ivy.xml b/org.springframework.web.portlet/ivy.xml index ae3f031cbc6..04dbf6172d8 100644 --- a/org.springframework.web.portlet/ivy.xml +++ b/org.springframework.web.portlet/ivy.xml @@ -35,7 +35,7 @@ - + diff --git a/org.springframework.web.servlet/build.xml b/org.springframework.web.servlet/build.xml index b1807ec3baf..5707224bae3 100644 --- a/org.springframework.web.servlet/build.xml +++ b/org.springframework.web.servlet/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.web.struts/build.xml b/org.springframework.web.struts/build.xml index acfd7e6840c..f795e2bffa0 100644 --- a/org.springframework.web.struts/build.xml +++ b/org.springframework.web.struts/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.web.struts/ivy.xml b/org.springframework.web.struts/ivy.xml index de19367920c..032ca64ef4e 100644 --- a/org.springframework.web.struts/ivy.xml +++ b/org.springframework.web.struts/ivy.xml @@ -38,7 +38,7 @@ - + diff --git a/org.springframework.web/build.xml b/org.springframework.web/build.xml index 479c9926a24..6cfd327dc4f 100644 --- a/org.springframework.web/build.xml +++ b/org.springframework.web/build.xml @@ -1,6 +1,7 @@ + diff --git a/org.springframework.web/ivy.xml b/org.springframework.web/ivy.xml index 7fae83adb2a..d64953bd4e2 100644 --- a/org.springframework.web/ivy.xml +++ b/org.springframework.web/ivy.xml @@ -72,7 +72,7 @@ - +