Author: slaws
Date: Tue Oct 12 13:41:22 2010
New Revision: 1021771
URL: http://svn.apache.org/viewvc?rev=1021771&view=rev
Log:
Exclude the server version of jaxb-impl. The client pulls in a later version
and we need to look at that too.
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
Modified: tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml?rev=1021771&r1=1021770&r2=1021771&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml Tue Oct 12
13:41:22 2010
@@ -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>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml?rev=1021771&r1=1021770&r2=1021771&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-jaxrs-runtime/pom.xml Tue
Oct 12 13:41:22 2010
@@ -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>
