diff options
5 files changed, 39 insertions, 39 deletions
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/release/bin/LICENSE index 4586f6b833..78b21411e2 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/branches/sca-java-2.0-M5/distribution/all/src/main/release/bin/LICENSE @@ -317,9 +317,9 @@ The following components come under Apache Software License 2.0 stripes-1.5.2.jar
tranql-connector-1.1.jar
tribes-6.0.26.jar
- wink-common-1.1-incubating.jar
- wink-client-1.1-incubating.jar
- wink-server-1.1-incubating.jar
+ wink-common-1.1.1-incubating.jar
+ wink-client-1.1.1-incubating.jar
+ wink-server-1.1.1-incubating.jar
woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
wss4j-1.5.4.jar
diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/pom.xml index 2007793522..b0cff65ac8 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/binding-rest-runtime/pom.xml @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. --> <project> <modelVersion>4.0.0</modelVersion> @@ -35,26 +35,26 @@ <artifactId>tuscany-binding-rest</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - + <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>1.1</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-data-api</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-common-http</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-core-spi</artifactId> @@ -66,7 +66,7 @@ <artifactId>tuscany-core</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding</artifactId> @@ -78,7 +78,7 @@ <artifactId>tuscany-databinding-jaxb</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-databinding-json</artifactId> @@ -97,28 +97,28 @@ <version>2.5</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-impl</artifactId> <version>2.0-M5-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-jetty</artifactId> <version>2.0-M5-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-interface-java-jaxrs</artifactId> <version>2.0-M5-SNAPSHOT</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> @@ -129,22 +129,22 @@ <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.1-incubating</version> - </dependency> - + <version>1.1.1-incubating</version> + </dependency> + <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-client</artifactId> - <version>1.1-incubating</version> + <version>1.1.1-incubating</version> </dependency> - + <dependency> <groupId>httpunit</groupId> <artifactId>httpunit</artifactId> <version>1.6.1</version> <scope>test</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/modules/implementation-jaxrs-runtime/pom.xml index f21ddb19ed..4b70e22981 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/implementation-jaxrs-runtime/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/implementation-jaxrs-runtime/pom.xml @@ -50,7 +50,7 @@ <version>2.0-M5-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-http</artifactId> @@ -62,8 +62,8 @@ <artifactId>tuscany-sca-api</artifactId> <version>2.0-M5-SNAPSHOT</version> </dependency> - - <!-- + + <!-- <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> @@ -87,21 +87,21 @@ <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.1-incubating</version> - </dependency> + <version>1.1.1-incubating</version> + </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>1.1</version> </dependency> - + <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-client</artifactId> - <version>1.1-incubating</version> + <version>1.1.1-incubating</version> <scope>test</scope> </dependency> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/modules/wink/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/modules/wink/pom.xml index 5258788acd..70981d1987 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/modules/wink/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M5/modules/wink/pom.xml @@ -7,15 +7,15 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. + * under the License. --> <project> @@ -43,20 +43,20 @@ <version>2.0-M5-SNAPSHOT</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.1-incubating</version> + <version>1.1.1-incubating</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-common</artifactId> - <version>1.1-incubating</version> + <version>1.1.1-incubating</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> diff --git a/sca-java-2.x/branches/sca-java-2.0-M5/samples/webapps/helloworld-jaxrs/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M5/samples/webapps/helloworld-jaxrs/pom.xml index 0d1da092ee..0f7d112422 100644 --- a/sca-java-2.x/branches/sca-java-2.0-M5/samples/webapps/helloworld-jaxrs/pom.xml +++ b/sca-java-2.x/branches/sca-java-2.0-M5/samples/webapps/helloworld-jaxrs/pom.xml @@ -43,12 +43,12 @@ <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-common</artifactId> - <version>1.0-incubating</version> + <version>1.1.1-incubating</version> </dependency> <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.0-incubating</version> + <version>1.1.1-incubating</version> </dependency> <dependency> |