[logback] add support for servlet 3.1

[gil]

commit 15722c804b7e1dcba191c0e6d393f1f184b61142
Author: gil <puntogil at libero.it>
Date:   Fri Mar 13 14:54:50 2015 +0100

    add support for servlet 3.1

 logback-1.1.2-servlet.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 logback.spec                | 11 +++++++++--
 2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/logback-1.1.2-servlet.patch b/logback-1.1.2-servlet.patch
new file mode 100644
index 0000000..408fac1
--- /dev/null
+++ b/logback-1.1.2-servlet.patch
@@ -0,0 +1,40 @@
+diff -Nru logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java logback-1.1.2.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
+--- logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java	2013-09-07 12:44:46.000000000 +0200
++++ logback-1.1.2.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java	2015-03-13 13:55:28.799820693 +0100
+@@ -30,6 +30,18 @@
+     duplicateInputStream(request);
+   }
+ 
++  public void setReadListener(javax.servlet.ReadListener listener) {
++    throw new UnsupportedOperationException("Not implemented yet.");
++  }
++
++  public boolean isReady() {
++    return false;
++  }
++
++  public boolean isFinished() {
++    return false;
++  }
++
+   @Override
+   public int read() throws IOException {
+     return in.read();
+diff -Nru logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java logback-1.1.2.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
+--- logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java	2013-09-07 12:44:46.000000000 +0200
++++ logback-1.1.2.servlet/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java	2015-03-13 13:50:11.893356202 +0100
+@@ -24,6 +24,14 @@
+   final ServletOutputStream underlyingStream;
+   final ByteArrayOutputStream baosCopy;
+ 
++  public void setWriteListener(javax.servlet.WriteListener listener) {
++    throw new UnsupportedOperationException("Not implemented yet.");
++  }
++
++  public boolean isReady() {
++    return false;
++  }
++
+   TeeServletOutputStream(ServletResponse httpServletResponse)
+       throws IOException {
+     // System.out.println("TeeServletOutputStream.constructor() called");
diff --git a/logback.spec b/logback.spec
index 4dbac21..452b4b6 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,12 +1,14 @@
 Name:           logback
 Version:        1.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Java logging library
 License:        LGPLv2 or EPL
 URL:            http://logback.qos.ch/
 Source0:        http://logback.qos.ch/dist/%{name}-%{version}.tar.gz
 # use antrun-plugin instead of gmaven
 Patch0:         %{name}-1.0.10-antrunplugin.patch
+# servlet 3.1 support
+Patch1:         %{name}-1.1.2-servlet.patch
 
 # Java dependencies
 BuildRequires: java-devel >= 1:1.6.0
@@ -113,6 +115,8 @@ find . -name "*.cmd" -delete
 find . -name "*.jar" -delete
 
 %patch0 -p0
+sed -i 's|source="1.5" target="1.5"|source="1.6" target="1.6"|' %{name}-classic/pom.xml
+%patch1 -p1
 
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :findbugs-maven-plugin
@@ -135,7 +139,7 @@ sed -i 's#artifactId>groovy#artifactId>groovy-all#' %{name}-classic/pom.xml
 # force tomcat apis
 sed -i 's#<groupId>javax.servlet#<groupId>org.apache.tomcat#' $(find . -name "pom.xml")
 sed -i 's#<artifactId>servlet-api#<artifactId>tomcat-servlet-api#' $(find . -name "pom.xml")
-sed -i 's#javax.servlet.*;version="2.5"#javax.servlet.*;version="3.0"#' %{name}-access/pom.xml
+sed -i 's#javax.servlet.*;version="2.5"#javax.servlet.*;version="3.1"#' %{name}-access/pom.xml
 sed -i 's#<version>2.5</version>#<version>${tomcat.version}</version>#' pom.xml
 
 sed -i 's#<version>1.2.14</version>#<version>1.2.17</version>#' %{name}-examples/pom.xml
@@ -215,6 +219,9 @@ cp -r %{name}-examples/pom.xml %{name}-examples/src %{buildroot}%{_datadir}/%{na
 %{_datadir}/%{name}-%{version}
 
 %changelog
+* Fri Mar 13 2015 gil cattaneo <puntogil at libero.it> 1.1.2-3
+- add support for servlet 3.1
+
 * Fri Feb 13 2015 gil cattaneo <puntogil at libero.it> 1.1.2-2
 - introduce license macro