Author: jsdelfino
Date: Tue Jul 15 11:29:30 2008
New Revision: 677004

URL: http://svn.apache.org/viewvc?rev=677004&view=rev
Log:
Added exclusion of asm-2.2.3 which conflicted with asm-3.1-all.jar.

Modified:
    tuscany/java/sca/modules/binding-ejb-runtime/pom.xml
    tuscany/java/sca/modules/host-openejb/pom.xml

Modified: tuscany/java/sca/modules/binding-ejb-runtime/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ejb-runtime/pom.xml?rev=677004&r1=677003&r2=677004&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ejb-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-ejb-runtime/pom.xml Tue Jul 15 11:29:30 
2008
@@ -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>

Modified: tuscany/java/sca/modules/host-openejb/pom.xml
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-openejb/pom.xml?rev=677004&r1=677003&r2=677004&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-openejb/pom.xml (original)
+++ tuscany/java/sca/modules/host-openejb/pom.xml Tue Jul 15 11:29:30 2008
@@ -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>


Reply via email to