This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository access-modifier-checker.
commit 6a8030f1edee6800c4ffb29ce22d5420bb37c176 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 15 12:48:01 2014 +0200 Depend on libasm4-java instead of libasm3-java --- debian/changelog | 1 + debian/control | 2 +- debian/maven.rules | 2 +- debian/patches/01-upgrade-asm.patch | 88 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + 5 files changed, 93 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c24da4..8798a1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ access-modifier-checker (1.4-2) UNRELEASED; urgency=medium * Team upload. + * Depend on libasm4-java instead of libasm3-java * debian/control: - Standards-Version updated to 3.9.5 (no changes) - Use canonical URLs for the Vcs-* fields diff --git a/debian/control b/debian/control index 35efa73..6568513 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends-Indep: junit (>= 3.8.1), libannotation-indexer-java (>= 1.3), libannotation-indexer-java-doc, - libasm3-java, + libasm4-java, libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-scm-java, diff --git a/debian/maven.rules b/debian/maven.rules index a0e6867..355d819 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,5 +17,5 @@ # junit junit jar s/3\\..*/3.x/ junit junit jar s/3\..*/3.x/ * * -asm asm-debug-all jar s/3\..*/3.x/ * * +s/asm/org.ow2.asm/ s/asm-debug-all/asm-all/ jar s/.*/4.x/ * * s/org.jvnet.hudson/org.jenkins-ci/ annotation-indexer * s/.*/debian/ * * diff --git a/debian/patches/01-upgrade-asm.patch b/debian/patches/01-upgrade-asm.patch new file mode 100644 index 0000000..04d218a --- /dev/null +++ b/debian/patches/01-upgrade-asm.patch @@ -0,0 +1,88 @@ +Description: Upgrade to the latest version of ASM +Author: Emmanuel Bourg <[email protected]> +Bug: https://github.com/kohsuke/access-modifier/pull/2 +--- a/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java ++++ b/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java +@@ -28,12 +28,12 @@ + import org.kohsuke.accmod.impl.Restrictions.Parser; + import org.objectweb.asm.AnnotationVisitor; + import org.objectweb.asm.ClassReader; ++import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.FieldVisitor; + import org.objectweb.asm.Label; + import org.objectweb.asm.MethodVisitor; + import org.objectweb.asm.Opcodes; + import org.objectweb.asm.Type; +-import org.objectweb.asm.commons.EmptyVisitor; + + import java.io.BufferedReader; + import java.io.File; +@@ -138,7 +138,7 @@ + } + + try { +- new ClassReader(is).accept(new EmptyVisitor() { ++ new ClassReader(is).accept(new ClassVisitor(Opcodes.ASM5) { + private String className; + + @Override +@@ -153,7 +153,7 @@ + + @Override + public FieldVisitor visitField(int access, final String name, String desc, String signature, Object value) { +- return new EmptyVisitor() { ++ return new FieldVisitor(Opcodes.ASM5) { + @Override + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + return onAnnotationFor(className+'.'+name,desc); +@@ -163,7 +163,7 @@ + + @Override + public MethodVisitor visitMethod(int access, final String methodName, final String methodDesc, String signature, String[] exceptions) { +- return new EmptyVisitor() { ++ return new MethodVisitor(Opcodes.ASM5) { + @Override + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + return onAnnotationFor(className+'.'+methodName+methodDesc,desc); +@@ -221,7 +221,7 @@ + FileInputStream in = new FileInputStream(clazz); + try { + ClassReader cr = new ClassReader(in); +- cr.accept(new EmptyVisitor() { ++ cr.accept(new ClassVisitor(Opcodes.ASM5) { + private String className; + private String methodName,methodDesc; + private int line; +@@ -243,7 +243,7 @@ + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { + this.methodName = name; + this.methodDesc = desc; +- return new EmptyVisitor() { ++ return new MethodVisitor(Opcodes.ASM5) { + @Override + public void visitLineNumber(int _line, Label start) { + line = _line; +--- a/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java ++++ b/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java +@@ -25,6 +25,7 @@ + + import org.kohsuke.accmod.AccessRestriction; + import org.objectweb.asm.AnnotationVisitor; ++import org.objectweb.asm.Opcodes; + import org.objectweb.asm.Type; + + import java.util.ArrayList; +@@ -83,11 +84,12 @@ + public String toString() { return "NONE"; } + }); + +- abstract static class Parser implements AnnotationVisitor { ++ abstract static class Parser extends AnnotationVisitor { + private List<Type> restrictions = new ArrayList<Type>(); + private final RestrictedElement target; + + protected Parser(RestrictedElement target) { ++ super(Opcodes.ASM5); + this.target = target; + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..3c641d6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +01-upgrade-asm.patch + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/access-modifier-checker.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
