geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r917708 - in /geronimo/server/trunk: ./ framework/ framework/bundles/ framework/configs/client-system/ framework/configs/client-system/src/main/history/ framework/configs/geronimo-boilerplate/ framework/configs/geronimo-gbean-deployer-boots...
Date Mon, 01 Mar 2010 20:43:58 GMT
Author: gawor
Date: Mon Mar  1 20:43:57 2010
New Revision: 917708

URL: http://svn.apache.org/viewvc?rev=917708&view=rev
Log:
switch to asm 3.2 - framework builds and starts now

Modified:
    geronimo/server/trunk/framework/bundles/pom.xml
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Mon Mar  1 20:43:57 2010
@@ -35,8 +35,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>asm-3.1</module>
-        <module>asm-commons-3.1</module>
         <module>aspectjrt</module>
         <module>aspectjweaver</module>
         <module>axis</module>

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Mon Mar  1 20:43:57 2010
@@ -178,11 +178,7 @@
                         </element>
                         <element>
                             <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
+                            <artifactId>asm-all</artifactId>
                         </element>
                         <element>
                             <groupId>commons-cli</groupId>

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -32,16 +37,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml Mon Mar  1 20:43:57
2010
@@ -48,12 +48,7 @@
         <!-- lib Dependencies -->
         <dependency>
             <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-commons</artifactId>
+            <artifactId>asm-all</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -22,16 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -37,16 +42,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Mon Mar  1 20:43:57 2010
@@ -67,8 +67,8 @@
 
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>asm</artifactId>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
@@ -79,11 +79,6 @@
             <artifactId>sxc-runtime</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>asm</groupId>-->
-            <!--<artifactId>asm-commons</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
@@ -240,11 +235,7 @@
                         </element>
                         <element>
                             <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
+                            <artifactId>asm-all</artifactId>
                         </element>
                         <element>
                             <groupId>commons-cli</groupId>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -33,16 +38,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Mon
Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -27,16 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Mon Mar  1 20:43:57
2010
@@ -145,11 +145,7 @@
                         </element>
                         <element>
                             <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
+                            <artifactId>asm-all</artifactId>
                         </element>
                         <element>
                             <groupId>cglib</groupId>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -22,16 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Mon Mar  1 20:43:57 2010
@@ -79,8 +79,7 @@
 org/apache/servicemix/specs/org.apache.servicemix.specs.jaxb-api-2.1/1.2.0/org.apache.servicemix.specs.jaxb-api-2.1-1.2.0.jar=40
 org/apache/servicemix/specs/org.apache.servicemix.specs.stax-api-1.0/1.3.0/org.apache.servicemix.specs.stax-api-1.0-1.3.0.jar=40
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.woodstox/3.2.8_1/org.apache.servicemix.bundles.woodstox-3.2.8_1.jar=40
-org/apache/geronimo/bundles/asm/3.1_1-SNAPSHOT/asm-3.1_1-SNAPSHOT.jar=40
-org/apache/geronimo/bundles/asm-commons/3.1_1-SNAPSHOT/asm-commons-3.1_1-SNAPSHOT.jar=40
+asm/asm-all/3.2/asm-all-3.2.jar=40
 commons-cli/commons-cli/1.2/commons-cli-1.2.jar=40
 org/apache/geronimo/bundles/sxc-jaxb/0.7.2_1-SNAPSHOT/sxc-jaxb-0.7.2_1-SNAPSHOT.jar=40
 org/apache/geronimo/bundles/sxc-runtime/0.7.2_1-SNAPSHOT/sxc-runtime-0.7.2_1-SNAPSHOT.jar=40

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -217,16 +222,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Mon Mar  1 20:43:57 2010
@@ -155,11 +155,7 @@
                         </element>
                         <element>
                             <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
+                            <artifactId>asm-all</artifactId>
                         </element>
                         <element>
                             <groupId>cglib</groupId>

Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
Mon Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -27,16 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Mon
Mar  1 20:43:57 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
         <type>jar</type>
@@ -27,16 +32,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Mon Mar  1 20:43:57 2010
@@ -51,13 +51,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>asm-commons</artifactId>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Mon Mar  1 20:43:57 2010
@@ -181,17 +181,6 @@
                 <!--</exclusions>-->
             <!--</dependency>-->
 
-            <!-- bundleized jars -->
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>asm</artifactId>
-                <version>3.1_1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>3.1_1-SNAPSHOT</version>
-            </dependency>
             <!--<dependency>-->
                 <!--<groupId>org.apache.geronimo.bundles</groupId>-->
                 <!--<artifactId>plexus-archiver</artifactId>-->

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=917708&r1=917707&r2=917708&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Mar  1 20:43:57 2010
@@ -495,20 +495,8 @@
 
             <dependency>
                 <groupId>asm</groupId>
-                <artifactId>asm</artifactId>
-                <version>3.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm-commons</artifactId>
-                <version>3.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>asm</groupId>
-                        <artifactId>asm-tree</artifactId>
-                    </exclusion>
-                </exclusions>
+                <artifactId>asm-all</artifactId>
+                <version>3.2</version>
             </dependency>
 
             <dependency>
@@ -1512,6 +1500,10 @@
                         <artifactId>geronimo-javamail_1.4_spec</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>    
+                        <artifactId>geronimo-stax-api_1.0_spec</artifactId> 
 
+                    </exclusion>
+                    <exclusion>
                         <groupId>jaxen</groupId>
                         <artifactId>jaxen</artifactId>
                     </exclusion>
@@ -1543,6 +1535,14 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-javamail_1.4_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>    
+                        <artifactId>geronimo-stax-api_1.0_spec</artifactId> 
 
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.codehaus.woodstox</groupId>
+                        <artifactId>wstx-asl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message