diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-30 17:31:21 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-30 17:31:21 +0000 |
| commit | 5b25a38af216bbf60a0804068678849dca338ff7 (patch) | |
| tree | b2ff328ad66ff291bc502fd3f31867554618d8a8 /java/sca/distribution/pom.xml | |
| parent | 1fe194e5cfe9606af6710c146aaca564f8f41354 (diff) | |
Merge the fix from 1.3 branch for TUSCANY-2509, TUSCANY-2506
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681137 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/distribution/pom.xml')
| -rw-r--r-- | java/sca/distribution/pom.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml index 0f50571fbf..71b47668c7 100644 --- a/java/sca/distribution/pom.xml +++ b/java/sca/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> |