geronimo-xbean-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1596333 - in /geronimo/xbean/trunk/xbean-reflect: pom.xml src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
Date Tue, 20 May 2014 17:30:40 GMT
Author: rmannibucau
Date: Tue May 20 17:30:40 2014
New Revision: 1596333

URL: http://svn.apache.org/r1596333
Log:
XBEAN-266 xbean-reflect shouldn't embed asm + little fixes on OSGi metadata

Modified:
    geronimo/xbean/trunk/xbean-reflect/pom.xml
    geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java

Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=1596333&r1=1596332&r2=1596333&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Tue May 20 17:30:40 2014
@@ -83,9 +83,10 @@
                 <version>2.0.0</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <excludeDependencies>true</excludeDependencies>
                     <instructions>
                         <Export-Package>!org.apache.xbean.asm.*,org.apache.xbean.*;version=${project.version}</Export-Package>
-                        <Import-Package>*,org.apache.log4j;resolution:=optional,org.apache.commons.logging;resolution:=optional,org.objectweb.asm;resolution:=optional;version=5,org.objectweb.asm.commons;resolution:=optional;version=5,org.apache.xbean.asm;resolution:=optional;version=5,org.apache.xbean.asm.commons;resolution:=optional;version=5</Import-Package>
+                        <Import-Package>*,org.apache.log4j;resolution:=optional,org.apache.commons.logging;resolution:=optional,org.objectweb.asm;resolution:=optional;version=5,org.objectweb.asm.commons;resolution:=optional;version=5,org.apache.xbean.asm5;resolution:=optional;version=5,org.apache.xbean.asm5.original.commons;resolution:=optional,org.apache.xbean.asm5.shade.commons;resolution:=optional;version=5</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java?rev=1596333&r1=1596332&r2=1596333&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
(original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
Tue May 20 17:30:40 2014
@@ -46,7 +46,7 @@ public final class ReflectionUtil {
         } else if (isClassAvailable("org.objectweb.asm.ClassReader")) {
             parameterNamesLoader = new AsmParameterNameLoader();                    
         } else if (isClassAvailable("org.apache.xbean.asm.ClassReader") || isClassAvailable("org.apache.xbean.asm4.ClassReader"))
{
-            throw new RuntimeException("Your xbean-asm-shade is too old, please upgrade to
xbean-asm4-shade");
+            throw new RuntimeException("Your xbean-asm-shade is too old, please upgrade to
xbean-asm5-shade");
         }
     }
     



Mime
View raw message