diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-17 04:25:49 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-17 04:25:49 +0000 |
| commit | 1fd89af50fdafdda7a08f2c40cbd42dd52f23d67 (patch) | |
| tree | edae0e4dcbca7cdfb6ebc0422a412d290cdacefa | |
| parent | 9fa18cea173b89342fc0fef211354fb9deb323cb (diff) | |
More exclusions from wink-1.1.2 update to avoid legal-check test failure
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035918 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
4 files changed, 62 insertions, 9 deletions
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 eaac1de1a8..2748c71c02 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 @@ -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> 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 76572499a3..389aecf5ee 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 @@ -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> diff --git a/sca-java-2.x/trunk/modules/wink/pom.xml b/sca-java-2.x/trunk/modules/wink/pom.xml index 9038be4c04..1d187486b9 100644 --- a/sca-java-2.x/trunk/modules/wink/pom.xml +++ b/sca-java-2.x/trunk/modules/wink/pom.xml @@ -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> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml index 74a12d6309..94ab56cc30 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml @@ -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>
|