geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r745916 - in /geronimo/server/branches/2.1: framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java pom.xml
Date Thu, 19 Feb 2009 16:18:56 GMT
Author: dwoods
Date: Thu Feb 19 16:18:56 2009
New Revision: 745916

URL: http://svn.apache.org/viewvc?rev=745916&view=rev
Log:
GERONIMO-4541 Upgrade to ASM 3.1 as required by latest OpenEJB 3.0.1 updates

Modified:
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml?rev=745916&r1=745915&r2=745916&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
(original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
Thu Feb 19 16:18:56 2009
@@ -261,7 +261,7 @@
                         <dependency>
                             <groupId>asm</groupId>
                             <artifactId>asm</artifactId>
-                            <version>2.2.3</version>
+                            <version>3.1</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
@@ -275,7 +275,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/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java?rev=745916&r1=745915&r2=745916&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
Thu Feb 19 16:18:56 2009
@@ -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/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=745916&r1=745915&r2=745916&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Feb 19 16:18:56 2009
@@ -82,7 +82,7 @@
         <springVersion>2.5.6</springVersion>
         <plutoVersion>1.1.6-G643117</plutoVersion>
         <openjpaVersion>1.2.1-SNAPSHOT</openjpaVersion>
-        <xbeanVersion>3.4.1</xbeanVersion>
+        <xbeanVersion>3.5</xbeanVersion>
         <wadiVersion>2.0</wadiVersion>
 
         <!-- Deployers -->
@@ -323,7 +323,7 @@
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
-                <version>3.5</version>
+                <version>${xbeanVersion}</version>
             </dependency>
 
             <dependency>
@@ -347,13 +347,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>



Mime
View raw message