From 6ff205c75b44baa2063bfe16542b39be6d70800b Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 12 Oct 2010 13:41:22 +0000
Subject: Exclude the server version of jaxb-impl. The client pulls in a later
 version and we need to look at that too.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1021771 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml         | 6 ++++++
 sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
index ab860b5029..330188cafd 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
@@ -100,6 +100,12 @@
             <groupId>org.apache.wink</groupId>
             <artifactId>wink-server</artifactId>
             <version>1.1.1-incubating</version>
+             <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
index 36c244d8fd..66bf8b64c2 100644
--- a/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
@@ -88,7 +88,14 @@
             <groupId>org.apache.wink</groupId>
             <artifactId>wink-server</artifactId>
             <version>1.1.1-incubating</version>
+             <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+            </exclusions>            
         </dependency>
+        
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>jsr311-api</artifactId>
-- 
cgit v1.2.3