diff options
| -rw-r--r-- | sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE | 9 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml | 16 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/modules/wink/pom.xml | 18 |
3 files changed, 33 insertions, 10 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE index 3b7a4719b2..c0cd3dca16 100644 --- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE +++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE @@ -256,7 +256,8 @@ The following components come under Apache Software License 2.0 commons-pool-1.3.jar
derby-10.4.1.3.jar
dwr-2.0.3.jar
- geronimo-activation_1.1_spec-1.0.1.jar
+ geronimo-activation_1.1_spec-1.0.1.jar + geronimo-annotation_1.1_spec-1.0.jar
geronimo-connector-2.1.4.jar
geronimo-ejb_3.0_spec-1.0.1.jar
geronimo-javamail_1.4_spec-1.6.jar
@@ -318,9 +319,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.1-incubating.jar
- wink-client-1.1.1-incubating.jar
- wink-server-1.1.1-incubating.jar
+ wink-common-1.1.2-incubating.jar
+ wink-client-1.1.2-incubating.jar
+ wink-server-1.1.2-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/trunk/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-rest-runtime/pom.xml index 451eb65cea..eaac1de1a8 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 @@ -107,19 +107,27 @@ <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.1.2-incubating-SNAPSHOT</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> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-client</artifactId> - <version>1.1.2-incubating-SNAPSHOT</version> + <version>1.1.2-incubating</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/wink/pom.xml b/sca-java-2.x/trunk/modules/wink/pom.xml index 4ef4f22595..9038be4c04 100644 --- a/sca-java-2.x/trunk/modules/wink/pom.xml +++ b/sca-java-2.x/trunk/modules/wink/pom.xml @@ -47,14 +47,28 @@ <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-server</artifactId> - <version>1.1.2-incubating-SNAPSHOT</version> + <version>1.1.2-incubating</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.wink</groupId> <artifactId>wink-common</artifactId> - <version>1.1.2-incubating-SNAPSHOT</version> + <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> |