Permalink
Browse files

+ upgrade to AspectJ 1.6.8

+ externalize some of the jar versions
+ align the versions of some dependencies between pom.xml and ivy.xml
  • Loading branch information...
1 parent ac93b81 commit 0fd4a45070328c257039973db2153ca3572c8d34 Costin Leau committed Feb 4, 2010
Showing with 75 additions and 61 deletions.
  1. +4 −0 build.versions
  2. +1 −0 org.springframework.aop/build.xml
  3. +3 −3 org.springframework.aop/ivy.xml
  4. +1 −1 org.springframework.aop/pom.xml
  5. +1 −0 org.springframework.aspects/build.xml
  6. +2 −2 org.springframework.aspects/ivy.xml
  7. +1 −0 org.springframework.beans/build.xml
  8. +1 −1 org.springframework.beans/ivy.xml
  9. +2 −2 org.springframework.beans/pom.xml
  10. +1 −0 org.springframework.context.support/build.xml
  11. +1 −1 org.springframework.context.support/ivy.xml
  12. +1 −0 org.springframework.context/build.xml
  13. +3 −3 org.springframework.context/ivy.xml
  14. +1 −1 org.springframework.context/pom.xml
  15. +1 −0 org.springframework.core/build.xml
  16. +2 −2 org.springframework.core/ivy.xml
  17. +1 −0 org.springframework.expression/build.xml
  18. +1 −0 org.springframework.instrument/build.xml
  19. +1 −0 org.springframework.integration-tests/build.xml
  20. +4 −6 org.springframework.integration-tests/ivy.xml
  21. +1 −13 org.springframework.integration-tests/pom.xml
  22. +1 −0 org.springframework.jdbc/build.xml
  23. +1 −1 org.springframework.jdbc/ivy.xml
  24. +1 −0 org.springframework.jms/build.xml
  25. +2 −2 org.springframework.jms/ivy.xml
  26. +7 −7 org.springframework.jms/pom.xml
  27. +1 −0 org.springframework.orm/build.xml
  28. +1 −1 org.springframework.orm/ivy.xml
  29. +6 −0 org.springframework.orm/pom.xml
  30. +1 −0 org.springframework.oxm/build.xml
  31. +1 −1 org.springframework.oxm/ivy.xml
  32. +4 −4 org.springframework.spring-parent/pom.xml
  33. +3 −3 org.springframework.test/ivy.xml
  34. +2 −2 org.springframework.test/pom.xml
  35. +1 −0 org.springframework.transaction/build.xml
  36. +2 −2 org.springframework.transaction/ivy.xml
  37. +1 −0 org.springframework.web.portlet/build.xml
  38. +1 −1 org.springframework.web.portlet/ivy.xml
  39. +1 −0 org.springframework.web.servlet/build.xml
  40. +1 −0 org.springframework.web.struts/build.xml
  41. +1 −1 org.springframework.web.struts/ivy.xml
  42. +1 −0 org.springframework.web/build.xml
  43. +1 −1 org.springframework.web/ivy.xml
View
@@ -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
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.aop">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -28,14 +28,14 @@
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="optional, pooling->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+ <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
<!-- test dependencies -->
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
</dependencies>
@@ -35,7 +35,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.5.3</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.aspects">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/aspect/default.xml"/>
@@ -24,14 +24,14 @@
<dependencies>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
</dependencies>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.beans">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -28,7 +28,7 @@
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
<!-- test dependencies -->
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
</dependencies>
@@ -21,8 +21,8 @@
</dependency>
<dependency>
<groupId>javax.inject</groupId>
- <artifactId>com.springsource.javax.inject</artifactId>
- <version>0.9.0.PFD</version>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.context.support">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -49,7 +49,7 @@
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime"/>
<dependency org="org.apache.poi" name="com.springsource.org.apache.poi" rev="3.0.2.FINAL" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
</dependencies>
</ivy-module>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.context">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -43,7 +43,7 @@
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile, aop->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional, groovy->compile"/>
<dependency org="org.joda" name="com.springsource.org.joda.time" rev="1.6.0" conf="optional->compile"/>
@@ -63,8 +63,8 @@
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.0.GA" conf="test->runtime"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
- <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="1.5.3" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.jcl" rev="${slf4j.version}" conf="test->runtime"/>
</dependencies>
</ivy-module>
@@ -169,7 +169,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.core" xmlns:ivy="antlib:org.apache.ivy.ant">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
<target name="create.pom" depends="ivy.init, resolve">
@@ -25,12 +25,12 @@
<dependencies>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
<dependency org="org.jboss.vfs" name="com.springsource.org.jboss.virtual" rev="2.1.0.GA" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="optional->compile"/>
<!-- test dependencies -->
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
<dependency org="org.codehaus.woodstox" name="com.springsource.com.ctc.wstx" rev="3.2.7" conf="test->compile"/>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.expression">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.instrument">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.integration-tests">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
<target name="publish" description="Publishes all artifacts to remote repositories"/>
@@ -22,15 +22,13 @@
<dependency org="com.caucho" name="com.springsource.com.caucho" rev="3.2.1" conf="test->compile"/>
<dependency org="com.ibm.websphere" name="com.springsource.com.ibm.websphere.uow" rev="6.0.2.17" conf="test->compile"/>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="1.6.2" conf="test->compile"/>
- <dependency org="com.oracle.oc4j" name="com.springsource.oracle.classloader" rev="10.1.3.1" conf="provided->compile"/>
<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="test->compile"/>
- <dependency org="com.sun.enterprise" name="com.springsource.com.sun.enterprise.loader" rev="1.0.0" conf="test->compile"/>
<dependency org="com.sun.syndication" name="com.springsource.com.sun.syndication" rev="1.0.0" conf="test->compile"/>
<dependency org="edu.emory.mathcs.backport" name="com.springsource.edu.emory.mathcs.backport" rev="3.0.0" conf="test->compile"/>
<dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="3.0.0" conf="test->compile"/>
<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="test->compile"/>
<dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.08" conf="test->compile"/>
- <dependency org="javax.inject" name="com.springsource.javax.inject" rev="0.9.0.PFD" conf="test->compile"/>
+ <dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="test->compile"/>
<dependency org="javax.jdo" name="com.springsource.javax.jdo" rev="2.1.0" conf="test->compile"/>
<dependency org="javax.jms" name="com.springsource.javax.jms" rev="1.1.0" conf="test->compile"/>
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
@@ -63,7 +61,7 @@
<dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.0.5" conf="test->compile"/>
<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="test->compile"/>
<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity.tools.view" rev="1.4.0" conf="test->compile"/>
- <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="test->compile"/>
+ <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="test->compile"/>
<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="test->compile"/>
<dependency org="org.dom4j" name="com.springsource.org.dom4j" rev="1.6.1" conf="test->compile"/>
<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence" rev="1.0.1" conf="test->compile"/>
@@ -74,7 +72,7 @@
<dependency org="org.hibernate" name="com.springsource.org.hibernate.annotations.common" rev="3.3.0.ga" conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.ejb" rev="3.4.0.GA" conf="test->compile"/>
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
- <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.2.0" conf="optional, runtime->compile"/>
+ <dependency org="org.jruby" name="com.springsource.org.jruby" rev="1.4.0" conf="optional, runtime->compile"/>
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="test->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
@@ -94,7 +92,7 @@
<dependency org="org.custommonkey.xmlunit" name="com.springsource.org.custommonkey.xmlunit" rev="1.2.0" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
<dependency org="org.easymock" name="com.springsource.org.easymock.classextension" rev="2.3.0" conf="test->compile"/>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
<dependency org="org.testng" name="com.springsource.org.testng" rev="5.9.0" conf="test->compile"/>
</dependencies>
@@ -31,24 +31,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.oracle.oc4j</groupId>
- <artifactId>oracle.classloader</artifactId>
- <version>10.1.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>com.oracle.toplink.essentials</groupId>
<artifactId>oracle.toplink.essentials</artifactId>
<version>2.0.0.b41-beta2</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.enterprise</groupId>
- <artifactId>com.sun.enterprise.loader</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.sun.syndication</groupId>
<artifactId>com.sun.syndication</artifactId>
<version>0.9</version>
@@ -189,7 +177,7 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.5.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.jdbc">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
@@ -35,7 +35,7 @@
<dependency org="com.h2database" name="com.springsource.org.h2" rev="1.0.71" conf="optional->compile"/>
<dependency org="org.apache.derby" name="com.springsource.org.apache.derby" rev="10.5.1000001.764942" conf="optional->compile"/>
<!-- test dependencies -->
- <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
+ <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
</dependencies>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.springframework.jms">
<property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../build.versions"/>
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
<import file="${basedir}/../spring-build/standard/default.xml"/>
</project>
Oops, something went wrong.

0 comments on commit 0fd4a45

Please sign in to comment.