Return-Path: 
 <scm-return-48044-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 874509ACB
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Tue, 10 Jan 2012 02:01:05 +0000 (UTC)
Received: (qmail 1863 invoked by uid 500); 10 Jan 2012 02:01:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 1769 invoked by uid 500); 10 Jan 2012 02:01:04 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 1762 invoked by uid 99); 10 Jan 2012 02:01:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jan 2012 02:01:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jan 2012 02:01:01 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8EE9723889ED;
	Tue, 10 Jan 2012 02:00:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1229449 - in /geronimo/server/trunk: ./
 framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/
 framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/
 framework/configs/j2ee-system/ framework/configs/j2ee-system/src/ma...
Date: Tue, 10 Jan 2012 02:00:38 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120110020039.8EE9723889ED@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Tue Jan 10 02:00:38 2012
New Revision: 1229449

URL: http://svn.apache.org/viewvc?rev=1229449&view=rev
Log:
use same asm as karaf

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.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/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Jan 10 02:00:38 2012
@@ -60,8 +60,8 @@
 
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Jan 10 02:00:38 2012
@@ -66,8 +66,8 @@
 
         <!-- Used by TemporaryClassLoader in kernel -->
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

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=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Tue Jan 10 02:00:38 2012
@@ -93,21 +93,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Used by TemporaryClassLoader in kernel -->
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.servicemix.bundles</groupId>-->
-            <!--<artifactId>org.apache.servicemix.bundles.xstream</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.cglib</artifactId>

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=1229449&r1=1229448&r2=1229449&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 Tue Jan 10 02:00:38 2012
@@ -7,11 +7,6 @@
         <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>

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=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Tue Jan 10 02:00:38 2012
@@ -57,8 +57,9 @@
         </dependency>
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml Tue Jan 10 02:00:38 2012
@@ -91,8 +91,9 @@
         </dependency>
 
         <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml Tue Jan 10 02:00:38 2012
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-all</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Tue Jan 10 02:00:38 2012
@@ -3,15 +3,10 @@
     <module-id>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto-support</artifactId>
-        <version>3.0-beta-1-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-all</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Tue Jan 10 02:00:38 2012
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries.web</groupId>
         <artifactId>org.apache.aries.web.urlhandler</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1229449&r1=1229448&r2=1229449&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jan 10 02:00:38 2012
@@ -536,12 +536,6 @@
             </dependency>
 
             <dependency>
-                <groupId>asm</groupId>
-                <artifactId>asm-all</artifactId>
-                <version>3.2</version>
-            </dependency>
-
-            <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjrt</artifactId>
                 <version>1.6.8_1</version>