You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2012/01/10 03:00:38 UTC
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...
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>