[jhighlight] 01/02: Transition to the Servlet API 3.1

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jhighlight.

commit bc612c5028b6bc0c170fa3197c3990ec61df4e2e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 30 19:02:40 2016 +0200

    Transition to the Servlet API 3.1
---
 debian/changelog                                  |  1 +
 debian/control                                    |  2 +-
 debian/maven.rules                                |  3 ---
 debian/patches/02-servlet-3.1-compatibility.patch | 19 +++++++++++++++++++
 debian/patches/series                             |  1 +
 debian/rules                                      |  2 +-
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index feec50a..0512e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 jhighlight (1.0-2) UNRELEASED; urgency=medium
 
+  * Transition to the Servlet API 3.1
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
   * Fixed the Lintian warnings related to debian/copyright
diff --git a/debian/control b/debian/control
index e139e2a..41d35b1 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: ant,
                debhelper (>= 9),
                default-jdk,
                jflex,
-               libservlet3.0-java,
+               libservlet3.1-java,
                maven-repo-helper
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jhighlight.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 38cd82a..e6cd605 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,2 @@
 
 com.uwyn jhighlight jar s/.*/debian/ * *
-s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * *
-s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
diff --git a/debian/patches/02-servlet-3.1-compatibility.patch b/debian/patches/02-servlet-3.1-compatibility.patch
new file mode 100644
index 0000000..68efaa5
--- /dev/null
+++ b/debian/patches/02-servlet-3.1-compatibility.patch
@@ -0,0 +1,19 @@
+Description: Fixes the compatibility with the Servlet API 3.1
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/com/uwyn/jhighlight/servlet/HighlightFilter.java
++++ b/src/com/uwyn/jhighlight/servlet/HighlightFilter.java
+@@ -232,5 +232,13 @@
+ 		{
+ 			return mOutput.toByteArray();
+ 		}
++
++		public boolean isReady() {
++			return true;
++		}
++
++		public void setWriteListener(WriteListener writeListener) {
++		}
++
+ 	}
+ }
diff --git a/debian/patches/series b/debian/patches/series
index acd00d2..470ccda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-generate-highlighter.patch
+02-servlet-3.1-compatibility.patch
diff --git a/debian/rules b/debian/rules
index 459a6d9..f4b390f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 
 override_dh_auto_build:
 	mkdir -p lib
-	ln -s /usr/share/java/servlet-api-3.0.jar lib/servlet.jar
+	ln -s /usr/share/java/servlet-api-3.1.jar lib/servlet.jar
 	dh_auto_build
 
 override_dh_auto_clean:

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