You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/11/09 15:34:14 UTC
svn commit: r1032993 - in /geronimo/server/trunk: ./
plugins/aries/aries-deployer/src/main/history/
plugins/axis2/axis2/src/main/history/ plugins/client/client/src/main/history/
plugins/connector-1_6/connector-deployer-1_6/src/main/history/ plugins/j2e...
Author: rickmcguire
Date: Tue Nov 9 14:34:13 2010
New Revision: 1032993
URL: http://svn.apache.org/viewvc?rev=1032993&view=rev
Log:
use the new servicemix javassist bundle
Modified:
geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -58,11 +58,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
@@ -333,6 +328,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -28,11 +28,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -168,6 +163,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -48,11 +48,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jstl</artifactId>
<type>jar</type>
</dependency>
@@ -373,6 +368,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -138,6 +133,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee/pom.xml Tue Nov 9 14:34:13 2010
@@ -79,8 +79,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -81,4 +76,9 @@
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -157,6 +152,11 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -8,11 +8,6 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -163,6 +158,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -28,11 +28,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>jaxb-impl</artifactId>
<type>jar</type>
</dependency>
@@ -313,6 +308,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Tue Nov 9 14:34:13 2010
@@ -141,8 +141,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Tue Nov 9 14:34:13 2010
@@ -38,11 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
<artifactId>scannotation</artifactId>
<type>jar</type>
</dependency>
@@ -128,6 +123,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.serp</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Tue Nov 9 14:34:13 2010
@@ -143,8 +143,8 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
</dependency>
<dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1032993&r1=1032992&r2=1032993&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Nov 9 14:34:13 2010
@@ -1317,9 +1317,9 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>javassist</artifactId>
- <version>3.12.0.GA_1-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <version>3.12.0.ga_1</version>
</dependency>
<dependency>