[jetty8] 04/08: Replaced the dependency on libasm3-java with libasm4-java
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Nov 25 18:29:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jetty8.
commit 44284495c2263835c1efac80f5771f2c41c88dd7
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Nov 25 13:47:35 2015 +0100
Replaced the dependency on libasm3-java with libasm4-java
---
debian/changelog | 4 +-
debian/control | 4 +-
debian/libjetty8-extra-java.links | 4 +-
debian/maven.rules | 5 +-
debian/patches/annotations-find-asm-commons.patch | 2 +-
debian/patches/asm-upgrade.patch | 70 +++++++++++++++++++++++
debian/patches/series | 1 +
7 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 40401d3..43b8429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
jetty8 (8.1.18-2) UNRELEASED; urgency=medium
* Fixed a build failure with maven-debian-helper 2.0
- * Added the missing build depdndency on libasm3-java
+ * Added the missing build dependency on asm
+ * Replaced the dependency on libasm3-java with libasm4-java and fixed
+ the compatibility with servlets containing Java 8 lambda expressions.
* debian/rules: Removed the install/libjetty8-java-doc target
-- Emmanuel Bourg <ebourg at apache.org> Wed, 25 Nov 2015 09:43:59 +0100
diff --git a/debian/control b/debian/control
index 198b481..1e24844 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: ant-optional,
glassfish-jmac-api (>= 1:2.1.1-b31g-2),
javahelper,
junit,
- libasm3-java,
+ libasm4-java,
libbuild-helper-maven-plugin-java,
libgeronimo-jta-1.1-spec-java,
libmail-java,
@@ -57,7 +57,7 @@ Description: Javadoc for the Jetty API
Package: libjetty8-extra-java
Architecture: all
-Depends: libasm3-java,
+Depends: libasm4-java,
libmail-java,
libjakarta-taglibs-standard-java,
libjetty8-java (>= ${source:Version}),
diff --git a/debian/libjetty8-extra-java.links b/debian/libjetty8-extra-java.links
index 52a6f60..3844f33 100644
--- a/debian/libjetty8-extra-java.links
+++ b/debian/libjetty8-extra-java.links
@@ -1,6 +1,6 @@
usr/share/tomcat7/lib/annotations-api.jar usr/share/jetty8/lib/annotations/javax.annotation.jar
-usr/share/java/asm3.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
-usr/share/java/asm3-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
+usr/share/java/asm4.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.jar
+usr/share/java/asm4-commons.jar usr/share/jetty8/lib/annotations/org.objectweb.asm.commons.jar
usr/share/java/javax.mail.jar usr/share/jetty8/lib/jndi/javax.mail.jar
usr/share/java/jsp-api-2.2.jar usr/share/jetty8/lib/jsp/javax.servlet.jsp.jar
usr/share/tomcat7/lib/jasper.jar usr/share/jetty8/lib/jsp/jasper.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index c1d1686..1834214 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,4 @@
-asm asm * 3.x * *
-asm asm-commons * 3.x * *
+s/asm/org.ow2.asm/ asm* * s/.*/4.x/ * *
javax.servlet jstl jar s/.*/1.1/ * *
javax.servlet.jsp jsp-api jar s/.*/2.2/ * *
javax.servlet servlet-api jar s/.*/3.0/ * *
@@ -7,7 +6,7 @@ javax.el el-api jar s/.*/2.2/ * *
junit junit * s/4\..*/4.x/ * *
org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * *
-s/org.eclipse.jetty.orbit/asm/ s/org.objectweb.asm/asm/ jar s/.*/3.x/ * *
+s/org.eclipse.jetty.orbit/org.ow2.asm/ s/org.objectweb.asm/asm/ jar s/.*/4.x/ * *
s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * *
s/org.eclipse.jetty.orbit/javax.security.auth.message/ s/javax.security.auth.message/jmac-api/ jar s/.*/debian/ * *
s/org.eclipse.jetty.orbit/org.apache.geronimo.specs/ s/javax.transaction/geronimo-jta_1.1_spec/ jar s/.*/debian/ * *
diff --git a/debian/patches/annotations-find-asm-commons.patch b/debian/patches/annotations-find-asm-commons.patch
index 8a3eafe..a28a88c 100644
--- a/debian/patches/annotations-find-asm-commons.patch
+++ b/debian/patches/annotations-find-asm-commons.patch
@@ -15,7 +15,7 @@ Subject: annotations-find-asm-commons
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
-+ <version>3.x</version>
++ <version>4.x</version>
+ </dependency>
</dependencies>
</project>
diff --git a/debian/patches/asm-upgrade.patch b/debian/patches/asm-upgrade.patch
new file mode 100644
index 0000000..0ebe1fa
--- /dev/null
+++ b/debian/patches/asm-upgrade.patch
@@ -0,0 +1,70 @@
+Description: Upgrade to ASM 5 and fix the compatibility with Java 8
+Origin: backport, https://github.com/eclipse/jetty.project/commit/f447870.patch
+--- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
++++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
+@@ -38,9 +38,10 @@
+ import org.eclipse.jetty.webapp.JarScanner;
+ import org.objectweb.asm.AnnotationVisitor;
+ import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.FieldVisitor;
+ import org.objectweb.asm.MethodVisitor;
+-import org.objectweb.asm.commons.EmptyVisitor;
++import org.objectweb.asm.Opcodes;
+
+ /**
+ * AnnotationParser
+@@ -280,13 +281,14 @@
+ *
+ * ASM Visitor for Annotations
+ */
+- public class MyAnnotationVisitor implements AnnotationVisitor
++ public class MyAnnotationVisitor extends AnnotationVisitor
+ {
+ List<Value> _annotationValues;
+ String _annotationName;
+
+ public MyAnnotationVisitor (String annotationName, List<Value> values)
+ {
++ super(Opcodes.ASM5);
+ _annotationValues = values;
+ _annotationName = annotationName;
+ }
+@@ -354,7 +356,7 @@
+ *
+ * ASM visitor for a class.
+ */
+- public class MyClassVisitor extends EmptyVisitor
++ public class MyClassVisitor extends ClassVisitor
+ {
+ String _className;
+ int _access;
+@@ -363,6 +365,10 @@
+ String[] _interfaces;
+ int _version;
+
++ public MyClassVisitor()
++ {
++ super(Opcodes.ASM5);
++ }
+
+ public void visit (int version,
+ final int access,
+@@ -429,7 +435,7 @@
+ final String[] exceptions)
+ {
+
+- return new EmptyVisitor ()
++ return new MethodVisitor (Opcodes.ASM5)
+ {
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible)
+ {
+@@ -463,7 +469,7 @@
+ final Object value)
+ {
+
+- return new EmptyVisitor ()
++ return new FieldVisitor (Opcodes.ASM5)
+ {
+ public AnnotationVisitor visitAnnotation(String desc, boolean visible)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index c4e9a09..3c2fefa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ aggregate-doc.patch
adjust-configuration.patch
fix-servletcontext-security-check.patch
initialize-tomcat-jasper.patch
+asm-upgrade.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty8.git
More information about the pkg-java-commits
mailing list