You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/11/17 05:25:49 UTC
svn commit: r1035918 - in /tuscany/sca-java-2.x/trunk:
modules/binding-rest-runtime/pom.xml
modules/implementation-jaxrs-runtime/pom.xml modules/wink/pom.xml
samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
Author: lresende
Date: Wed Nov 17 04:25:49 2010
New Revision: 1035918
URL: http://svn.apache.org/viewvc?rev=1035918&view=rev
Log:
More exclusions from wink-1.1.2 update to avoid legal-check test failure
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
tuscany/sca-java-2.x/trunk/modules/wink/pom.xml
tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/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=1035918&r1=1035917&r2=1035918&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 Wed Nov 17 04:25:49 2010
@@ -128,6 +128,20 @@
<groupId>org.apache.wink</groupId>
<artifactId>wink-client</artifactId>
<version>1.1.2-incubating</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</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=1035918&r1=1035917&r2=1035918&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 Wed Nov 17 04:25:49 2010
@@ -87,13 +87,21 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
- <version>1.1.1-incubating</version>
- <exclusions>
+ <version>1.1.2-incubating</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -105,7 +113,7 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-client</artifactId>
- <version>1.1.1-incubating</version>
+ <version>1.1.2-incubating</version>
<scope>test</scope>
</dependency>
@@ -137,25 +145,27 @@
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
Modified: tuscany/sca-java-2.x/trunk/modules/wink/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/wink/pom.xml?rev=1035918&r1=1035917&r2=1035918&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/wink/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/wink/pom.xml Wed Nov 17 04:25:49 2010
@@ -49,6 +49,20 @@
<artifactId>wink-server</artifactId>
<version>1.1.2-incubating</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml?rev=1035918&r1=1035917&r2=1035918&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml Wed Nov 17 04:25:49 2010
@@ -43,13 +43,28 @@
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-common</artifactId>
- <version>1.1.1-incubating</version>
+ <version>1.1.2-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
- <version>1.1.1-incubating</version>
- </dependency>
+ <version>1.1.2-incubating</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>