diff -Nru access-modifier-checker-1.4/access-modifier-annotation/pom.xml access-modifier-checker-1.7/access-modifier-annotation/pom.xml --- access-modifier-checker-1.4/access-modifier-annotation/pom.xml 2013-02-14 01:37:22.000000000 +0000 +++ access-modifier-checker-1.7/access-modifier-annotation/pom.xml 2015-03-23 00:01:01.000000000 +0000 @@ -4,7 +4,7 @@ access-modifier org.kohsuke - 1.4 + 1.7 access-modifier-annotation diff -Nru access-modifier-checker-1.4/access-modifier-checker/pom.xml access-modifier-checker-1.7/access-modifier-checker/pom.xml --- access-modifier-checker-1.4/access-modifier-checker/pom.xml 2013-02-14 01:37:22.000000000 +0000 +++ access-modifier-checker-1.7/access-modifier-checker/pom.xml 2015-03-23 00:01:01.000000000 +0000 @@ -4,7 +4,7 @@ access-modifier org.kohsuke - 1.4 + 1.7 access-modifier-checker maven-plugin @@ -23,9 +23,9 @@ ${project.version} - asm + org.ow2.asm asm-debug-all - 3.2 + 5.0.3 org.apache.maven @@ -44,4 +44,4 @@ true - \ No newline at end of file + diff -Nru access-modifier-checker-1.4/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java access-modifier-checker-1.7/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java --- access-modifier-checker-1.4/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java 2013-02-14 01:37:22.000000000 +0000 +++ access-modifier-checker-1.7/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Checker.java 2015-03-23 00:01:01.000000000 +0000 @@ -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; diff -Nru access-modifier-checker-1.4/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java access-modifier-checker-1.7/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java --- access-modifier-checker-1.4/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java 2013-02-14 01:37:22.000000000 +0000 +++ access-modifier-checker-1.7/access-modifier-checker/src/main/java/org/kohsuke/accmod/impl/Restrictions.java 2015-03-23 00:01:01.000000000 +0000 @@ -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 restrictions = new ArrayList(); private final RestrictedElement target; protected Parser(RestrictedElement target) { + super(Opcodes.ASM5); this.target = target; } diff -Nru access-modifier-checker-1.4/debian/changelog access-modifier-checker-1.7/debian/changelog --- access-modifier-checker-1.4/debian/changelog 2014-09-15 10:48:16.000000000 +0000 +++ access-modifier-checker-1.7/debian/changelog 2016-09-27 21:39:58.000000000 +0000 @@ -1,3 +1,16 @@ +access-modifier-checker (1.7-1) unstable; urgency=medium + + * Team upload. + * New upstream release: + - Removed 01-upgrade-asm.patch (fixed upstream) + * Depend on libasm-java (>= 5.0) instead of libasm4-java + * Build with the DH sequencer instead of CDBS + * Standards-Version updated to 3.9.8 + * Use a secure Vcs-Git URL + * debian/watch: No longer use githubredir.debian.net + + -- Emmanuel Bourg Tue, 27 Sep 2016 23:39:58 +0200 + access-modifier-checker (1.4-2) unstable; urgency=medium * Team upload. diff -Nru access-modifier-checker-1.4/debian/control access-modifier-checker-1.7/debian/control --- access-modifier-checker-1.4/debian/control 2014-09-15 10:02:22.000000000 +0000 +++ access-modifier-checker-1.7/debian/control 2016-09-27 21:36:21.000000000 +0000 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: James Page -Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper +Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 2.0) Build-Depends-Indep: default-jdk-doc, junit (>= 3.8.1), libannotation-indexer-java (>= 1.3), libannotation-indexer-java-doc, - libasm4-java, + libasm-java (>= 5.0), libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-scm-java, @@ -18,8 +18,8 @@ libmetainf-services-java, libmetainf-services-java-doc, libmaven-plugin-tools-java (>= 2.8) -Standards-Version: 3.9.5 -Vcs-Git: git://anonscm.debian.org/pkg-java/access-modifier-checker.git +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/access-modifier-checker.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/access-modifier-checker.git Homepage: https://github.com/kohsuke/access-modifier diff -Nru access-modifier-checker-1.4/debian/copyright access-modifier-checker-1.7/debian/copyright --- access-modifier-checker-1.4/debian/copyright 2014-09-04 10:41:34.000000000 +0000 +++ access-modifier-checker-1.7/debian/copyright 2016-09-27 21:39:52.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/kohsuke/access-modifier Files: * -Copyright: 2010, Kohsuke Kawaguchi +Copyright: 2010-2015, Kohsuke Kawaguchi License: MIT Files: debian/* diff -Nru access-modifier-checker-1.4/debian/maven.publishedRules access-modifier-checker-1.7/debian/maven.publishedRules --- access-modifier-checker-1.4/debian/maven.publishedRules 2014-09-15 10:49:09.000000000 +0000 +++ access-modifier-checker-1.7/debian/maven.publishedRules 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -# Maven published rules - additional rules to publish, to help -# the packaging work of Debian maintainers using mh_make -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ - diff -Nru access-modifier-checker-1.4/debian/maven.rules access-modifier-checker-1.7/debian/maven.rules --- access-modifier-checker-1.4/debian/maven.rules 2014-09-15 10:49:09.000000000 +0000 +++ access-modifier-checker-1.7/debian/maven.rules 2016-09-27 21:36:33.000000000 +0000 @@ -17,5 +17,4 @@ # junit junit jar s/3\\..*/3.x/ junit junit 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 -Nru access-modifier-checker-1.4/debian/patches/01-upgrade-asm.patch access-modifier-checker-1.7/debian/patches/01-upgrade-asm.patch --- access-modifier-checker-1.4/debian/patches/01-upgrade-asm.patch 2014-09-15 10:01:14.000000000 +0000 +++ access-modifier-checker-1.7/debian/patches/01-upgrade-asm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -Description: Upgrade to the latest version of ASM -Author: Emmanuel Bourg -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 restrictions = new ArrayList(); - private final RestrictedElement target; - - protected Parser(RestrictedElement target) { -+ super(Opcodes.ASM5); - this.target = target; - } - diff -Nru access-modifier-checker-1.4/debian/patches/series access-modifier-checker-1.7/debian/patches/series --- access-modifier-checker-1.4/debian/patches/series 2014-09-15 10:00:10.000000000 +0000 +++ access-modifier-checker-1.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -01-upgrade-asm.patch - diff -Nru access-modifier-checker-1.4/debian/rules access-modifier-checker-1.7/debian/rules --- access-modifier-checker-1.4/debian/rules 2014-09-15 10:48:51.000000000 +0000 +++ access-modifier-checker-1.7/debian/rules 2016-09-27 21:22:54.000000000 +0000 @@ -1,11 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate -DEB_MAVEN_BUILD_TARGET := install +%: + dh $@ --buildsystem=maven get-orig-source: uscan --download-current-version --force-download --rename diff -Nru access-modifier-checker-1.4/debian/watch access-modifier-checker-1.7/debian/watch --- access-modifier-checker-1.4/debian/watch 2014-09-04 10:41:34.000000000 +0000 +++ access-modifier-checker-1.7/debian/watch 2016-09-27 21:22:54.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/\.dfsg// \ -http://githubredir.debian.net/github/kohsuke/access-modifier/ access-modifier-(.*).tar.gz +https://github.com/kohsuke/access-modifier/tags .*/access-modifier-(.*).tar.gz diff -Nru access-modifier-checker-1.4/pom.xml access-modifier-checker-1.7/pom.xml --- access-modifier-checker-1.4/pom.xml 2013-02-14 01:37:22.000000000 +0000 +++ access-modifier-checker-1.7/pom.xml 2015-03-23 00:01:01.000000000 +0000 @@ -4,11 +4,11 @@ org.kohsuke pom - 3 + 14 access-modifier - 1.4 + 1.7 Custom access modifier for Java pom @@ -21,51 +21,16 @@ - kohsuke.org - scp://kohsuke.org/home/kohsuke/kohsuke.org/access-modifier/ + github-pages + gitsite:git@github.com/kohsuke/access-modifier.git - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-release-plugin - 2.0 - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.2 - - - - - org.apache.maven.plugins - maven-scm-plugin - 1.3 - - - - - org.jvnet.wagon-svn - wagon-svn - 1.9 - - - - scm:git:git@github.com/kohsuke/${project.artifactId}.git scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git http://${project.artifactId}.kohsuke.org/ + access-modifier-1.7