diff options
Diffstat (limited to 'branches/sca-java-1.3/distribution')
| -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> |