[access-modifier-checker] 06/08: Removed 01-upgrade-asm.patch (fixed upstream)

[Emmanuel Bourg]

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 cad1f291c5fc9f9677ce1fe3dbe3c9afffc33824
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 27 23:24:33 2016 +0200

    Removed 01-upgrade-asm.patch (fixed upstream)
---
 debian/changelog                    |  4 +-
 debian/patches/01-upgrade-asm.patch | 88 -------------------------------------
 debian/patches/series               |  2 -
 3 files changed, 3 insertions(+), 91 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee646b4..330e9b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-access-modifier-checker (1.4-3) UNRELEASED; urgency=medium
+access-modifier-checker (1.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release:
+    - Removed 01-upgrade-asm.patch (fixed upstream)
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
diff --git a/debian/patches/01-upgrade-asm.patch b/debian/patches/01-upgrade-asm.patch
deleted file mode 100644
index 04d218a..0000000
--- a/debian/patches/01-upgrade-asm.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Description: Upgrade to the latest version of ASM
-Author: Emmanuel Bourg <ebourg at apache.org>
-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
deleted file mode 100644
index 3c641d6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-upgrade-asm.patch
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/access-modifier-checker.git