merge -c 917534,917645 https://svn.apache.org/repos/asf/activemq/trunk - camel 2.2.0 for spring 3.0

git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.3@918415 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-03-03 11:15:40 +00:00
parent 950251e925
commit 0bfaa3d07c
3 changed files with 11 additions and 1 deletions

View File

@ -130,6 +130,11 @@
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>

View File

@ -71,6 +71,11 @@
<artifactId>spring-core</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring-version}</version>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>

View File

@ -44,7 +44,7 @@
<aopalliance-version>1.0</aopalliance-version>
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.2-RC1</axis-version>
<camel-version>2.0.0</camel-version>
<camel-version>2.2.0</camel-version>
<cglib-version>2.0</cglib-version>
<commons-beanutils-version>1.6.1</commons-beanutils-version>
<commons-collections-version>3.2.1</commons-collections-version>