[groovy] 01/01: Transition to the Servlet API 3.1 (Closes: #801018, #801031)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jun 20 22:28:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit 056ce6bc2f2b53232e7f9d0d23067f7060235551
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 21 00:28:00 2016 +0200
Transition to the Servlet API 3.1 (Closes: #801018, #801031)
---
debian/changelog | 7 ++++++
debian/control | 4 ++--
debian/groovy.links | 4 ++--
debian/maven.rules | 6 +++++-
debian/patches/07_servlet_api_compatibility.patch | 26 +++++++++++++++++++++++
debian/patches/series | 1 +
debian/poms/groovy-all.pom | 8 +++----
debian/poms/groovy-servlet.pom | 8 +++----
8 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0bc1883..1b0560c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+groovy (2.4.6-3) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Transition to the Servlet API 3.1 (Closes: #801018, #801031)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 20 Jun 2016 23:44:02 +0200
+
groovy (2.4.6-2) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 5ed8afc..8f1cc0f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: ant,
libjarjar-java (>= 1.4+svn142-4~),
libjline2-java,
libqdox-java,
- libservlet2.5-java,
+ libservlet3.1-java,
libxstream-java,
locales-all | language-pack-en,
maven-repo-helper,
@@ -45,7 +45,7 @@ Depends: antlr,
libjansi-java,
libjline2-java,
libqdox-java,
- libservlet2.5-java,
+ libservlet3.1-java,
libxstream-java,
${misc:Depends}
Recommends: ant,
diff --git a/debian/groovy.links b/debian/groovy.links
index 610be20..2a519ac 100644
--- a/debian/groovy.links
+++ b/debian/groovy.links
@@ -22,10 +22,10 @@
/usr/share/java/jansi.jar /usr/share/groovy/lib/jansi.jar
/usr/share/java/jcommander.jar /usr/share/groovy/lib/jcommander.jar
/usr/share/java/jline2.jar /usr/share/groovy/lib/jline2.jar
-/usr/share/java/jsp-api-2.1.jar /usr/share/groovy/lib/jsp-api-2.1.jar
+/usr/share/java/jsp-api-2.3.jar /usr/share/groovy/lib/jsp-api-2.3.jar
/usr/share/java/jsr166y.jar /usr/share/groovy/lib/jsr166y.jar
/usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar
/usr/share/java/qdox.jar /usr/share/groovy/lib/qdox.jar
-/usr/share/java/servlet-api-2.5.jar /usr/share/groovy/lib/servlet-api-2.5.jar
+/usr/share/java/servlet-api-3.1.jar /usr/share/groovy/lib/servlet-api-3.1.jar
/usr/share/java/testng.jar /usr/share/groovy/lib/testng.jar
/usr/share/java/xstream.jar /usr/share/groovy/lib/xstream.jar
diff --git a/debian/maven.rules b/debian/maven.rules
index 502cdb4..0354345 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,7 +1,11 @@
junit junit jar s/3\..*/3.x/ * *
junit junit jar s/4\..*/4.x/ * *
org.testng testng jar s/.*/6.x/ * *
-s/javax\.servlet/javax.servlet.jsp/ jsp-api jar s/.*/debian/ * *
+javax.el javax.el-api * s/.*/3.0/ * *
+javax.servlet javax.servlet-api * s/.*/3.1/ * *
+javax.servlet.jsp javax.servlet.jsp-api * s/.*/2.3/ * *
+javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
+s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ * s/.*/2.3/ * *
antlr antlr * s/.*/2.x/ * *
jline jline * s/.*/2.x/ * *
com.beust jcommander * s/.*/1.x/ * *
diff --git a/debian/patches/07_servlet_api_compatibility.patch b/debian/patches/07_servlet_api_compatibility.patch
new file mode 100644
index 0000000..2d1d5eb
--- /dev/null
+++ b/debian/patches/07_servlet_api_compatibility.patch
@@ -0,0 +1,26 @@
+Description: Fixes the compatibility with the latest version of the Servlet API in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
++++ b/subprojects/groovy-servlet/src/main/java/groovy/servlet/ServletBinding.java
+@@ -152,6 +152,20 @@
+ public void write(byte[] b, int off, int len) throws IOException {
+ getResponseStream().write(b, off, len);
+ }
++ public void setWriteListener(javax.servlet.WriteListener listener) {
++ try {
++ getResponseStream().setWriteListener(listener);
++ } catch (IOException e) {
++ throw new RuntimeException(e);
++ }
++ }
++ public boolean isReady() {
++ try {
++ return getResponseStream().isReady();
++ } catch (IOException e) {
++ throw new RuntimeException(e);
++ }
++ }
+ };
+ }
+ private PrintWriter getResponseWriter() {
diff --git a/debian/patches/series b/debian/patches/series
index 670787c..0794852 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_ignore_bintray.diff
05_buildscripts_dependencies.diff
06_ignore_documentation_publication.diff
+07_servlet_api_compatibility.patch
diff --git a/debian/poms/groovy-all.pom b/debian/poms/groovy-all.pom
index 629cf64..1609df1 100644
--- a/debian/poms/groovy-all.pom
+++ b/debian/poms/groovy-all.pom
@@ -649,15 +649,15 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.3</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
diff --git a/debian/poms/groovy-servlet.pom b/debian/poms/groovy-servlet.pom
index 6548412..f032af2 100644
--- a/debian/poms/groovy-servlet.pom
+++ b/debian/poms/groovy-servlet.pom
@@ -587,14 +587,14 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <artifactId>javax.jsp-api</artifactId>
+ <version>2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git
More information about the pkg-java-commits
mailing list