Skip to content

Commit 0fd4a45

Browse files
author
Costin Leau
committed
+ upgrade to AspectJ 1.6.8
+ externalize some of the jar versions + align the versions of some dependencies between pom.xml and ivy.xml
1 parent ac93b81 commit 0fd4a45

43 files changed

Lines changed: 75 additions & 61 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.versions‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
#common dependency versions
2+
aspectj.version=1.6.8.RELEASE
3+
commons.pool.version=1.5.3
4+
slf4j.version=1.5.10
15
org.testng.version=5.10.0
26
org.junit.version=4.7.0

‎org.springframework.aop/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="org.springframework.aop">
33
<property file="${basedir}/../build.properties"/>
4+
<property file="${basedir}/../build.versions"/>
45
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
56
<import file="${basedir}/../spring-build/standard/default.xml"/>
67
</project>

‎org.springframework.aop/ivy.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
2929
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
3030
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
31-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="optional, pooling->compile"/>
32-
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
31+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="${commons.pool.version}" conf="optional, pooling->compile"/>
32+
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
3333
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
3434
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
3535
<!-- test dependencies -->
3636
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
3737
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
38-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
38+
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
3939
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="test->runtime"/>
4040
</dependencies>
4141

‎org.springframework.aop/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>commons-pool</groupId>
3737
<artifactId>commons-pool</artifactId>
38-
<version>1.4</version>
38+
<version>1.5.3</version>
3939
<optional>true</optional>
4040
</dependency>
4141
<dependency>

‎org.springframework.aspects/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="org.springframework.aspects">
33
<property file="${basedir}/../build.properties"/>
4+
<property file="${basedir}/../build.versions"/>
45
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
56
<import file="${basedir}/../spring-build/aspect/default.xml"/>
67

‎org.springframework.aspects/ivy.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
<dependencies>
2626
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
27-
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
27+
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${aspectj.version}" conf="optional, aspectj->compile"/>
2828
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
2929
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
3030
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
3131
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
3232
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
3333
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
34-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
34+
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->compile"/>
3535
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
3636
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
3737
</dependencies>

‎org.springframework.beans/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="org.springframework.beans">
33
<property file="${basedir}/../build.properties"/>
4+
<property file="${basedir}/../build.versions"/>
45
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
56
<import file="${basedir}/../spring-build/standard/default.xml"/>
67
</project>

‎org.springframework.beans/ivy.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
2929
<!-- test dependencies -->
3030
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
31-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
31+
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
3232
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
3333
<dependency org="org.springframework" name="org.springframework.asm" rev="latest.integration" conf="compile->compile"/>
3434
</dependencies>

‎org.springframework.beans/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</dependency>
2222
<dependency>
2323
<groupId>javax.inject</groupId>
24-
<artifactId>com.springsource.javax.inject</artifactId>
25-
<version>0.9.0.PFD</version>
24+
<artifactId>javax.inject</artifactId>
25+
<version>1</version>
2626
<scope>provided</scope>
2727
</dependency>
2828
<dependency>

‎org.springframework.context.support/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="org.springframework.context.support">
33
<property file="${basedir}/../build.properties"/>
4+
<property file="${basedir}/../build.versions"/>
45
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
56
<import file="${basedir}/../spring-build/standard/default.xml"/>
67
</project>

0 commit comments

Comments
 (0)