gil pushed to logback (master). "add support for jetty 9.3.0"

[notifications at fedoraproject.org]

>From 7ce69b4ea70fbe873569f31635d4397214d8edc9 Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Fri, 27 Mar 2015 13:10:41 +0100
Subject: add support for jetty 9.3.0


diff --git a/logback-1.1.2-jetty9.3.0.patch b/logback-1.1.2-jetty9.3.0.patch
new file mode 100644
index 0000000..f1db05b
--- /dev/null
+++ b/logback-1.1.2-jetty9.3.0.patch
@@ -0,0 +1,46 @@
+diff -Nru logback-1.1.2/logback-access/pom.xml logback-1.1.2.jetty/logback-access/pom.xml
+--- logback-1.1.2/logback-access/pom.xml	2014-04-02 14:10:03.000000000 +0200
++++ logback-1.1.2.jetty/logback-access/pom.xml	2015-03-27 12:42:41.069669011 +0100
+@@ -59,6 +59,13 @@
+ 
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
++      <artifactId>jetty-util</artifactId>
++      <scope>compile</scope>
++      <optional>true</optional>
++    </dependency>
++
++    <dependency>
++      <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-server</artifactId>
+       <scope>compile</scope>
+       <optional>true</optional>
+diff -Nru logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java logback-1.1.2.jetty/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
+--- logback-1.1.2/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2013-09-07 12:44:46.000000000 +0200
++++ logback-1.1.2.jetty/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java	2015-03-27 12:53:44.091008201 +0100
+@@ -27,6 +27,7 @@
+ import org.eclipse.jetty.server.Request;
+ import org.eclipse.jetty.server.RequestLog;
+ import org.eclipse.jetty.server.Response;
++import org.eclipse.jetty.util.component.LifeCycle;
+ 
+ 
+ import ch.qos.logback.access.joran.JoranConfigurator;
+@@ -293,11 +294,15 @@
+     return fai.getFilterChainDecision(event);
+   }
+ 
+-  public void addLifeCycleListener(Listener listener) {
++  public void addLifeCycleListener(LifeCycle.Listener  listener) {
+     // we'll implement this when asked
+   }
+ 
+-  public void removeLifeCycleListener(Listener listener) {
++  public void removeLifeCycleListener(LifeCycle.Listener  listener) {
++    // we'll implement this when asked
++  }
++  
++  public void log(Request request, int status, long written) {
+     // we'll implement this when asked
+   }
+ 
diff --git a/logback.spec b/logback.spec
index 452b4b6..e13832b 100644
--- a/logback.spec
+++ b/logback.spec
@@ -1,6 +1,6 @@
 Name:           logback
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Java logging library
 License:        LGPLv2 or EPL
 URL:            http://logback.qos.ch/
@@ -9,6 +9,7 @@ Source0:        http://logback.qos.ch/dist/%{name}-%{version}.tar.gz
 Patch0:         %{name}-1.0.10-antrunplugin.patch
 # servlet 3.1 support
 Patch1:         %{name}-1.1.2-servlet.patch
+Patch2:         %{name}-1.1.2-jetty9.3.0.patch
 
 # Java dependencies
 BuildRequires: java-devel >= 1:1.6.0
@@ -21,6 +22,7 @@ BuildRequires: mvn(org.apache.tomcat:tomcat-catalina)
 BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api)
 BuildRequires: mvn(org.codehaus.janino:janino)
 BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util)
 BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
 BuildRequires: mvn(org.fusesource.jansi:jansi)
 BuildRequires: mvn(org.slf4j:slf4j-api)
@@ -117,6 +119,7 @@ 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
+%patch2 -p1
 
 %pom_remove_plugin :maven-source-plugin
 %pom_remove_plugin :findbugs-maven-plugin
@@ -219,6 +222,9 @@ cp -r %{name}-examples/pom.xml %{name}-examples/src %{buildroot}%{_datadir}/%{na
 %{_datadir}/%{name}-%{version}
 
 %changelog
+* Fri Mar 27 2015 gil cattaneo <puntogil at libero.it> 1.1.2-4
+- add support for jetty 9.3.0
+
 * Fri Mar 13 2015 gil cattaneo <puntogil at libero.it> 1.1.2-3
 - add support for servlet 3.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/logback.git/commit/?h=master&id=7ce69b4ea70fbe873569f31635d4397214d8edc9