diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-29 03:50:40 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-29 03:50:40 +0000 |
commit | d9302c3e06100144e21cc3b9d4731d07edf6b1de (patch) | |
tree | 4a4f68db9eb47bd8a081402024ad1d4cd5000048 /branches/sca-java-1.3/distribution | |
parent | 6416b45d9f18272983be98787adb92933378765e (diff) |
Fix for TUSCANY-2509, TUSCANY-2506 and TUSCANY-2508 (to include zipcode-jaxws into the build)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@680620 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.3/distribution/bundle/pom.xml | 9 | ||||
-rw-r--r-- | branches/sca-java-1.3/distribution/pom.xml | 14 |
2 files changed, 19 insertions, 4 deletions
diff --git a/branches/sca-java-1.3/distribution/bundle/pom.xml b/branches/sca-java-1.3/distribution/bundle/pom.xml index fa6e8d7bfd..653e9a5fba 100644 --- a/branches/sca-java-1.3/distribution/bundle/pom.xml +++ b/branches/sca-java-1.3/distribution/bundle/pom.xml @@ -460,6 +460,15 @@ <groupId>${pom.groupId}</groupId> <artifactId>tuscany-wsdl2java</artifactId> <version>${pom.version}</version> + <exclusions> + + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + + </exclusions> </dependency> <dependency> diff --git a/branches/sca-java-1.3/distribution/pom.xml b/branches/sca-java-1.3/distribution/pom.xml index 85ff1aeb4d..340786c063 100644 --- a/branches/sca-java-1.3/distribution/pom.xml +++ b/branches/sca-java-1.3/distribution/pom.xml @@ -82,14 +82,20 @@ <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </exclusion> + <!-- <exclusion> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> </exclusion> - <exclusion> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-activation_1.0.2_spec</artifactId> - </exclusion> + --> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.0.2_spec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> |