geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r747077 - in /geronimo/server/branches/2.0: modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java pom.xml
Date Mon, 23 Feb 2009 16:44:29 GMT
Author: dwoods
Date: Mon Feb 23 16:44:28 2009
New Revision: 747077

URL: http://svn.apache.org/viewvc?rev=747077&view=rev
Log:
GERONIMO-4541 Upgrade to ASM 3.1 and XBean 3.5 due to recent dependency changes in OpenEJB
3.0.1

Modified:
    geronimo/server/branches/2.0/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
    geronimo/server/branches/2.0/pom.xml

Modified: geronimo/server/branches/2.0/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java?rev=747077&r1=747076&r2=747077&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/classloader/TemporaryClassLoader.java
Mon Feb 23 16:44:28 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.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/pom.xml?rev=747077&r1=747076&r2=747077&view=diff
==============================================================================
--- geronimo/server/branches/2.0/pom.xml (original)
+++ geronimo/server/branches/2.0/pom.xml Mon Feb 23 16:44:28 2009
@@ -62,7 +62,7 @@
         Having a single well named property makes automatic updating for the weekly build
much easier.
         -->
         <openejbVersion>3.0.1-SNAPSHOT</openejbVersion>
-        <xbeanVersion>3.4.1</xbeanVersion>
+        <xbeanVersion>3.5</xbeanVersion>
 
         <!--
         HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
@@ -319,13 +319,19 @@
             <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>
+                        <artifactId>asm-tree</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             
             <!--
@@ -341,7 +347,7 @@
             <dependency>
                 <groupId>com.agical.rmock</groupId>
                 <artifactId>rmock</artifactId>
-                <version>2.0.0-rc-6</version>
+                <version>2.0.0</version>
             </dependency>
 
             <dependency>
@@ -1778,9 +1784,9 @@
                                     <version>[1.5,1.6)</version>
                                 </requireJavaVersion>
                                 
-                                <!-- Allow any Maven - 2.0.5 <= version <= 2.0.7
-->
+                                <!-- Allow any Maven >= 2.0.5 -->
                                 <requireMavenVersion>
-                                    <version>[2.0.5,2.0.7]</version>
+                                    <version>[2.0.5,)</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>



Mime
View raw message