This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guice.
commit 06c7cc3b1fa9905ac43d2565af30813381eb197a Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 15 15:21:24 2014 +0200 Depend on libasm4-java and libcglib3-java instead of libasm3-java and libcglib-java --- debian/changelog | 2 + debian/control | 8 +- debian/maven.rules | 2 +- debian/patches/01_fix_build.diff | 4 +- debian/patches/05_upgrade-asm-and-cglib.patch | 176 ++++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 186 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index c212875..d182ec3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ guice (3.0-5) UNRELEASED; urgency=medium * Team upload. + * Depend on libasm4-java instead of libasm3-java + * Depend on libcglib3-java instead of libcglib-java * Switch to debhelper level 9 -- Emmanuel Bourg <[email protected]> Wed, 03 Sep 2014 00:44:13 +0200 diff --git a/debian/control b/debian/control index ece6ef7..e89f136 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,9 @@ Build-Depends: ant, default-jdk-doc, javahelper (>= 0.32), libaopalliance-java, - libasm3-java, + libasm4-java, libatinject-jsr330-api-java, - libcglib-java, + libcglib3-java, libjarjar-java, maven-debian-helper Standards-Version: 3.9.5 @@ -23,9 +23,9 @@ Homepage: http://code.google.com/p/google-guice/ Package: libguice-java Architecture: all Depends: libaopalliance-java, - libasm3-java, + libasm4-java, libatinject-jsr330-api-java, - libcglib-java, + libcglib3-java, ${misc:Depends} Description: lightweight dependency injection framework for Java 5 and above Guice provides support for dependency injection using annotations to diff --git a/debian/maven.rules b/debian/maven.rules index fa2a86d..2a6531e 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1 +1 @@ -s/org.sonatype.sisu.inject/cglib/ cglib * s/.*/debian/ * * +s/org.sonatype.sisu.inject/cglib/ cglib * s/.*/3.x/ * * diff --git a/debian/patches/01_fix_build.diff b/debian/patches/01_fix_build.diff index ecadd49..76d96aa 100644 --- a/debian/patches/01_fix_build.diff +++ b/debian/patches/01_fix_build.diff @@ -15,8 +15,8 @@ Last-Update: 2011-09-06 + <fileset dir="${debian.lib.dir}"> + <include name="atinject-jsr330-api.jar"/> + <include name="aopalliance.jar"/> -+ <include name="asm3.jar"/> -+ <include name="cglib.jar"/> ++ <include name="asm4.jar"/> ++ <include name="cglib3.jar"/> + </fileset> </path> diff --git a/debian/patches/05_upgrade-asm-and-cglib.patch b/debian/patches/05_upgrade-asm-and-cglib.patch new file mode 100644 index 0000000..b7a9bfd --- /dev/null +++ b/debian/patches/05_upgrade-asm-and-cglib.patch @@ -0,0 +1,176 @@ +Description: Upgrade to ASM 4 and CGLIB 3 +Origin: backport, https://github.com/google/guice/commit/2303007 +--- a/core/src/com/google/inject/internal/util/LineNumbers.java ++++ b/core/src/com/google/inject/internal/util/LineNumbers.java +@@ -26,7 +26,6 @@ + import java.lang.reflect.Method; + import java.util.Map; + import org.objectweb.asm.AnnotationVisitor; +-import org.objectweb.asm.Attribute; + import org.objectweb.asm.ClassReader; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.FieldVisitor; +@@ -119,12 +118,16 @@ + end[NO_AOP]*/ + } + +- private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor { ++ private class LineNumberReader extends ClassVisitor { + + private int line = -1; + private String pendingMethod; + private String name; + ++ LineNumberReader() { ++ super(Opcodes.ASM4); ++ } ++ + public void visit(int version, int access, String name, String signature, + String superName, String[] interfaces) { + this.name = name; +@@ -137,7 +140,7 @@ + } + pendingMethod = name + desc; + line = -1; +- return this; ++ return new LineNumberMethodVisitor(); + } + + public void visitSource(String source, String debug) { +@@ -156,113 +159,61 @@ + } + } + +- public void visitFieldInsn(int opcode, String owner, String name, +- String desc) { +- if (opcode == Opcodes.PUTFIELD && this.name.equals(owner) +- && !lines.containsKey(name) && line != -1) { +- lines.put(name, line); +- } +- } +- +- public void visitEnd() { +- } +- +- public void visitInnerClass(String name, String outerName, String innerName, +- int access) { +- } +- +- public void visitOuterClass(String owner, String name, String desc) { +- } +- +- public void visitAttribute(Attribute attr) { +- } +- + public FieldVisitor visitField(int access, String name, String desc, + String signature, Object value) { + return null; + } + + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { +- return this; +- } +- +- public AnnotationVisitor visitAnnotation(String name, String desc) { +- return this; +- } +- +- public AnnotationVisitor visitAnnotationDefault() { +- return this; ++ return new LineNumberAnnotationVisitor(); + } + + public AnnotationVisitor visitParameterAnnotation(int parameter, + String desc, boolean visible) { +- return this; ++ return new LineNumberAnnotationVisitor(); + } + +- public AnnotationVisitor visitArray(String name) { +- return this; ++ class LineNumberMethodVisitor extends MethodVisitor { ++ LineNumberMethodVisitor() { ++ super(Opcodes.ASM4); + } + +- public void visitEnum(String name, String desc, String value) { ++ public AnnotationVisitor visitAnnotation(String desc, boolean visible) { ++ return new LineNumberAnnotationVisitor(); + } + +- public void visit(String name, Object value) { ++ public AnnotationVisitor visitAnnotationDefault() { ++ return new LineNumberAnnotationVisitor(); + } + +- public void visitCode() { ++ public void visitFieldInsn(int opcode, String owner, String name, ++ String desc) { ++ if (opcode == Opcodes.PUTFIELD && LineNumberReader.this.name.equals(owner) ++ && !lines.containsKey(name) && line != -1) { ++ lines.put(name, line); + } +- +- public void visitFrame(int type, int nLocal, Object[] local, int nStack, +- Object[] stack) { + } + +- public void visitIincInsn(int var, int increment) { ++ public void visitLineNumber(int line, Label start) { ++ LineNumberReader.this.visitLineNumber(line, start); + } +- +- public void visitInsn(int opcode) { + } + +- public void visitIntInsn(int opcode, int operand) { ++ class LineNumberAnnotationVisitor extends AnnotationVisitor { ++ LineNumberAnnotationVisitor() { ++ super(Opcodes.ASM4); + } +- +- public void visitJumpInsn(int opcode, Label label) { ++ public AnnotationVisitor visitAnnotation(String name, String desc) { ++ return this; + } +- +- public void visitLabel(Label label) { ++ public AnnotationVisitor visitArray(String name) { ++ return this; + } +- +- public void visitLdcInsn(Object cst) { +- } +- + public void visitLocalVariable(String name, String desc, String signature, + Label start, Label end, int index) { + } + +- public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) { +- } +- +- public void visitMaxs(int maxStack, int maxLocals) { +- } +- +- public void visitMethodInsn(int opcode, String owner, String name, +- String desc) { + } + +- public void visitMultiANewArrayInsn(String desc, int dims) { +- } +- +- public void visitTableSwitchInsn(int min, int max, Label dflt, +- Label[] labels) { +- } +- +- public void visitTryCatchBlock(Label start, Label end, Label handler, +- String type) { +- } +- +- public void visitTypeInsn(int opcode, String desc) { +- } +- +- public void visitVarInsn(int opcode, int var) { +- } + } + } diff --git a/debian/patches/series b/debian/patches/series index 0789487..926d08a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02_link_javadocs.diff 03_extensions-assistedinject.diff 04_java8-compatibility.diff +05_upgrade-asm-and-cglib.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guice.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
