diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-15 18:29:30 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-15 18:29:30 +0000 |
commit | fe0a6e9f85047d10ef1a524996ecfe0eefdb1e40 (patch) | |
tree | 188bbfc80e680b61edace836b15b40f943125470 /java/sca/modules | |
parent | 787e4871904a8b6d31c1c9050eb7ca6058daa555 (diff) |
Added exclusion of asm-2.2.3 which conflicted with asm-3.1-all.jar.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@677004 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | java/sca/modules/binding-ejb-runtime/pom.xml | 17 | ||||
-rw-r--r-- | java/sca/modules/host-openejb/pom.xml | 15 |
2 files changed, 30 insertions, 2 deletions
diff --git a/java/sca/modules/binding-ejb-runtime/pom.xml b/java/sca/modules/binding-ejb-runtime/pom.xml index 9e2257a779..38a6d9b19d 100644 --- a/java/sca/modules/binding-ejb-runtime/pom.xml +++ b/java/sca/modules/binding-ejb-runtime/pom.xml @@ -120,12 +120,25 @@ <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> </exclusion> - + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm-commons</artifactId> + </exclusion> </exclusions> - </dependency> <dependency> + <groupId>asm</groupId> + <artifactId>asm-all</artifactId> + <version>3.1</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>1.1</version> diff --git a/java/sca/modules/host-openejb/pom.xml b/java/sca/modules/host-openejb/pom.xml index ad583f453c..396d847f15 100644 --- a/java/sca/modules/host-openejb/pom.xml +++ b/java/sca/modules/host-openejb/pom.xml @@ -56,9 +56,24 @@ <groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <version>3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
<build>
|