diff options
Diffstat (limited to 'rules/xbean-bootstrap/no-shading.patch')
-rw-r--r-- | rules/xbean-bootstrap/no-shading.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/rules/xbean-bootstrap/no-shading.patch b/rules/xbean-bootstrap/no-shading.patch new file mode 100644 index 0000000..0ad79d7 --- /dev/null +++ b/rules/xbean-bootstrap/no-shading.patch @@ -0,0 +1,32 @@ +diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java +--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java 2014-06-15 00:19:37.188993859 -0400 ++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java 2014-06-15 00:35:25.070408339 -0400 +@@ -43,7 +43,7 @@ + private static ParameterNameLoader parameterNamesLoader; + + static { +- if (isClassAvailable("org.apache.xbean.asm.ClassReader")) { ++ if (isClassAvailable("org.objectweb.asm.ClassReader")) { + parameterNamesLoader = new XbeanAsmParameterNameLoader(); + } else if (isClassAvailable("org.objectweb.asm.ClassReader")) { + parameterNamesLoader = new AsmParameterNameLoader(); +diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java +--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-06-15 00:19:37.188993859 -0400 ++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-06-15 00:35:25.070408339 -0400 +@@ -30,11 +30,11 @@ + import java.util.WeakHashMap; + import java.util.Arrays; + +-import org.apache.xbean.asm.ClassReader; +-import org.apache.xbean.asm.Label; +-import org.apache.xbean.asm.MethodVisitor; +-import org.apache.xbean.asm.Type; +-import org.apache.xbean.asm.commons.EmptyVisitor; ++import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Type; ++import org.objectweb.asm.commons.EmptyVisitor; + + /** + * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the |