summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-12-23 12:56:50 +0000
committerslaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>2010-12-23 12:56:50 +0000
commit9302e118aa7cea0a0a083051d6a36b186c702c89 (patch)
tree5d43d5cd6bdcd453925f9facacaa8d2ae715717b
parent9c51230ae13d21900e3ef0e17f1c70f56b33059f (diff)
Add exclusion to ActiveMQ dependency. Also why is this dependency here and not in the ActiveMQ specific module?
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1052248 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
index cca26fec30..5cdfb78d3e 100644
--- a/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/pom.xml
@@ -59,11 +59,18 @@
<scope>provided</scope>
</dependency>
- <!-- Add the dependency for ActiveMQ as the JMS runtime to use -->
+ <!-- Add the dependency for ActiveMQ as the JMS runtime to use -->
+ <!-- TODO - why is this here and not in the ActiveMQ specific module?-->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>5.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- end of addition for ActiveMQ -->