Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added spring-aop so the broker boots up correctly due to recent camel dependency 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@676927 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2008-07-15 14:37:36 +00:00
parent 8ee94b802c
commit 35e33eab07
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assembly/pom.xml
View File

@ -190,12 +190,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-aop</artifactId>
<optional>false</optional> </dependency>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-jms</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -203,7 +202,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <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>
<dependency> <dependency>

1
assembly/src/main/descriptors/common-bin.xml
View File

@ -145,6 +145,7 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include> <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.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.xbean:xbean-spring</include> <include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-core</include> <include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include> <include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include> <include>org.springframework:spring-context</include>

15
pom.xml
View File

@ -130,6 +130,7 @@
<module>activemq-openwire-generator</module> <module>activemq-openwire-generator</module>
<module>activemq-optional</module> <module>activemq-optional</module>
<module>activemq-pool</module> <module>activemq-pool</module>
<module>activemq-protocol-buffer</module>
<module>activemq-ra</module> <module>activemq-ra</module>
<module>activemq-rar</module> <module>activemq-rar</module>
<module>activemq-run</module> <module>activemq-run</module>
@ -465,10 +466,10 @@
<!-- Optional Spring Support --> <!-- Optional Spring Support -->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-aop</artifactId>
<version>${spring-version}</version> <version>${spring-version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
@ -483,13 +484,19 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId> <artifactId>spring-core</artifactId>
<version>${spring-version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring-version}</version> <version>${spring-version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId> <artifactId>spring-tx</artifactId>
<version>${spring-version}</version> <version>${spring-version}</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>