[sisu-guice] 01/01: patch for #738579
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Tue Feb 11 16:06:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a commit to branch master
in repository sisu-guice.
commit 401ba3247cf62051a18726729f3b8771e52d3544
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date: Tue Feb 11 16:06:32 2014 +0000
patch for #738579
---
debian/control | 1 +
debian/maven.rules | 4 +-
debian/patches/asm3_compatible.patch | 190 +++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 194 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 6e8ae3e..160c2c2 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
Build-Depends-Indep: default-jdk-doc,
glassfish-javaee,
libaopalliance-java,
+ libasm3-java,
libatinject-jsr330-api-java,
libatinject-jsr330-api-java-doc,
libcglib-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 2594d7b..422b95a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,7 +2,6 @@
com.google.guava guava bundle s/.*/debian/ * *
com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
javax.servlet servlet-api jar s/.*/2.5/ * *
-org.ow2.asm asm jar s/.*/4.1/ * *
org.sonatype.sisu sisu-guice jar s/.*/debian/ * *
org.sonatype.sisu.inject guice-assistedinject jar s/.*/debian/ * *
org.sonatype.sisu.inject guice-extensions pom s/.*/debian/ * *
@@ -17,8 +16,9 @@ org.sonatype.sisu.inject guice-spring jar s/.*/debian/ * *
org.sonatype.sisu.inject guice-struts2 jar s/.*/debian/ * *
org.sonatype.sisu.inject guice-throwingproviders jar s/.*/debian/ * *
s/easymock/org.easymock/ easymock * s/.*/debian/ * *
-org.ow2.asm * * s/4\..*/4.x/ * *
+asm * * s/3\..*/3.x/ * *
org.springframework * * s/3\..*/3.x/ * *
s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
+s/org.ow2.asm/asm asm jar s/.*/3.3.2/ * *
s/org.sonatype.sisu/com.google.guava/ s/sisu-guava/guava/ jar s/.*/debian/ * *
diff --git a/debian/patches/asm3_compatible.patch b/debian/patches/asm3_compatible.patch
new file mode 100644
index 0000000..8dfab41
--- /dev/null
+++ b/debian/patches/asm3_compatible.patch
@@ -0,0 +1,190 @@
+Description: Changed to older revision of the class to support asm-3
+Author: Eugene Zhukov <jevgeni.zh at gmail.com>
+Last-Update: 2014-02-11
+
+--- sisu-guice-3.1.9+dfsg.orig/core/src/com/google/inject/internal/util/LineNumbers.java
++++ sisu-guice-3.1.9+dfsg/core/src/com/google/inject/internal/util/LineNumbers.java
+@@ -22,6 +22,7 @@ import com.google.common.base.Preconditi
+ import com.google.common.collect.Maps;
+
+ 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;
+@@ -122,16 +123,12 @@ final class LineNumbers {
+ end[NO_AOP]*/
+ }
+
+- private class LineNumberReader extends ClassVisitor {
++ private class LineNumberReader implements ClassVisitor, MethodVisitor, AnnotationVisitor {
+
+ 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;
+@@ -144,7 +141,7 @@ final class LineNumbers {
+ }
+ pendingMethod = name + desc;
+ line = -1;
+- return new LineNumberMethodVisitor();
++ return this;
+ }
+
+ public void visitSource(String source, String debug) {
+@@ -163,61 +160,113 @@ final class LineNumbers {
+ }
+ }
+
++ 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 new LineNumberAnnotationVisitor();
++ return this;
++ }
++
++ public AnnotationVisitor visitAnnotation(String name, String desc) {
++ return this;
++ }
++
++ public AnnotationVisitor visitAnnotationDefault() {
++ return this;
+ }
+
+ public AnnotationVisitor visitParameterAnnotation(int parameter,
+ String desc, boolean visible) {
+- return new LineNumberAnnotationVisitor();
++ return this;
+ }
+
+- class LineNumberMethodVisitor extends MethodVisitor {
+- LineNumberMethodVisitor() {
+- super(Opcodes.ASM4);
+- }
++ public AnnotationVisitor visitArray(String name) {
++ return this;
++ }
+
+- public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+- return new LineNumberAnnotationVisitor();
+- }
++ public void visitEnum(String name, String desc, String value) {
++ }
+
+- public AnnotationVisitor visitAnnotationDefault() {
+- return new LineNumberAnnotationVisitor();
+- }
++ public void visit(String name, Object value) {
++ }
+
+- 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 visitCode() {
++ }
+
+- public void visitLineNumber(int line, Label start) {
+- LineNumberReader.this.visitLineNumber(line, start);
+- }
++ public void visitFrame(int type, int nLocal, Object[] local, int nStack,
++ Object[] stack) {
+ }
+
+- class LineNumberAnnotationVisitor extends AnnotationVisitor {
+- LineNumberAnnotationVisitor() {
+- super(Opcodes.ASM4);
+- }
+- public AnnotationVisitor visitAnnotation(String name, String desc) {
+- return this;
+- }
+- public AnnotationVisitor visitArray(String name) {
+- return this;
+- }
+- public void visitLocalVariable(String name, String desc, String signature,
+- Label start, Label end, int index) {
+- }
++ public void visitIincInsn(int var, int increment) {
++ }
++
++ public void visitInsn(int opcode) {
++ }
++
++ public void visitIntInsn(int opcode, int operand) {
++ }
++
++ public void visitJumpInsn(int opcode, Label label) {
++ }
++
++ public void visitLabel(Label label) {
++ }
++
++ 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 6cd49be..7435659 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
allow_maven2.diff
modules.diff
+asm3_compatible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git
More information about the pkg-java-commits
mailing list