Author: djencks
Date: Fri Oct 24 11:42:30 2008
New Revision: 707709
URL: http://svn.apache.org/viewvc?rev=707709&view=rev
Log:
GERONIMO-4375 xbean upgrade requires asm upgrade. GERONIMO-4360 minor build fix to increase
tm version independence
Modified:
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
geronimo/server/trunk/plugins/concurrent/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
Fri Oct 24 11:42:30 2008
@@ -39,7 +39,7 @@
<artifactId>geronimo-gbean-deployer</artifactId>
<version>${version}</version>
<type>car</type>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -245,7 +245,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -259,7 +259,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/geronimo-plugin.xml
Fri Oct 24 11:42:30 2008
@@ -68,7 +68,7 @@
<dependency start="false">
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -80,7 +80,7 @@
<dependency start="false">
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
</dependency>
<dependency start="false">
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/src/test/resources/META-INF/plan.xml
Fri Oct 24 11:42:30 2008
@@ -74,7 +74,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -88,7 +88,7 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
Fri Oct 24 11:42:30 2008
@@ -129,7 +129,7 @@
private static boolean isAnnotationClass(byte[] bytes) {
IsAnnotationVisitor isAnnotationVisitor = new IsAnnotationVisitor();
ClassReader classReader = new ClassReader(bytes);
- classReader.accept(isAnnotationVisitor, true);
+ classReader.accept(isAnnotationVisitor, ClassReader.SKIP_DEBUG);
return isAnnotationVisitor.isAnnotation;
}
Modified: geronimo/server/trunk/plugins/concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/pom.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/pom.xml Fri Oct 24 11:42:30 2008
@@ -47,4 +47,15 @@
<module>concurrent-deployer</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${txmanagerVersion}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Fri Oct 24 11:42:30 2008
@@ -57,7 +57,7 @@
<module>axis2</module>
<module>client</module>
<module>clustering</module>
- <module>connector</module>
+ <module>connector${connectorSuffix}</module>
<module>console</module>
<module>corba</module>
<module>cxf</module>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=707709&r1=707708&r2=707709&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Oct 24 11:42:30 2008
@@ -90,6 +90,8 @@
<!--<connectorSuffix>-1_6</connectorSuffix>-->
<connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>
<!--<connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>-->
+ <txmanagerVersion>2.1.1</txmanagerVersion>
+ <!--<txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>-->
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
@@ -309,24 +311,6 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>2.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>2.1.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -470,13 +454,13 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <version>2.2.3</version>
+ <version>3.1</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
|