From 5b25a38af216bbf60a0804068678849dca338ff7 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 30 Jul 2008 17:31:21 +0000
Subject: Merge the fix from 1.3 branch for TUSCANY-2509, TUSCANY-2506

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681137 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/modules/binding-atom-abdera/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'java/sca/modules/binding-atom-abdera/pom.xml')

diff --git a/java/sca/modules/binding-atom-abdera/pom.xml b/java/sca/modules/binding-atom-abdera/pom.xml
index f7bda483b2..72caa56169 100644
--- a/java/sca/modules/binding-atom-abdera/pom.xml
+++ b/java/sca/modules/binding-atom-abdera/pom.xml
@@ -82,6 +82,12 @@
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
             <version>0.3.0-incubating</version> 
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>    
         
         <dependency>
-- 
cgit v1.2.3