You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2008/07/15 16:37:36 UTC
svn commit: r676927 - in /activemq/trunk: assembly/pom.xml
assembly/src/main/descriptors/common-bin.xml pom.xml
Author: jstrachan
Date: Tue Jul 15 07:37:36 2008
New Revision: 676927
URL: http://svn.apache.org/viewvc?rev=676927&view=rev
Log:
Added spring-aop so the broker boots up correctly due to recent camel dependency
Modified:
activemq/trunk/assembly/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=676927&r1=676926&r2=676927&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Jul 15 07:37:36 2008
@@ -190,12 +190,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <optional>false</optional>
- </dependency>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
+ <artifactId>spring-jms</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -203,7 +202,12 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-jms</artifactId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <optional>false</optional>
</dependency>
<dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=676927&r1=676926&r2=676927&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Jul 15 07:37:36 2008
@@ -145,6 +145,7 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.xbean:xbean-spring</include>
+ <include>org.springframework:spring-aop</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=676927&r1=676926&r2=676927&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Jul 15 07:37:36 2008
@@ -130,6 +130,7 @@
<module>activemq-openwire-generator</module>
<module>activemq-optional</module>
<module>activemq-pool</module>
+ <module>activemq-protocol-buffer</module>
<module>activemq-ra</module>
<module>activemq-rar</module>
<module>activemq-run</module>
@@ -465,10 +466,10 @@
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
+ <artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
@@ -483,16 +484,22 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
+ <artifactId>spring-core</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring-version}</version>
+ <optional>true</optional>
+ </dependency>
<!--
<dependency>
<groupId>org.springframework</groupId>