[Git][java-team/logback][master] Fixed the compatibility with Jetty 9.

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / logback


Commits:
a7fc0435 by Emmanuel Bourg at 2018-12-10T21:22:21Z
Fixed the compatibility with Jetty 9.

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/06-jetty-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+logback (1:1.2.3-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with Jetty 9.4
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 10 Dec 2018 22:22:11 +0100
+
 logback (1:1.2.3-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends:
  libgmavenplus-java,
  libjanino-java (>= 2.6.0),
  libjansi-java,
- libjetty9-java,
+ libjetty9-java (>= 9.4),
  libmail-java,
  libmaven-antrun-plugin-java,
  libmaven-bundle-plugin-java,


=====================================
debian/patches/06-jetty-compatibility.patch
=====================================
@@ -0,0 +1,59 @@
+Description: Fixes the compatibility with Jetty 9.4
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
++++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
+@@ -209,11 +209,6 @@
+         started = false;
+     }
+ 
+-    @Override
+-    public boolean isRunning() {
+-        return started;
+-    }
+-
+     public void setFileName(String fileName) {
+         this.fileName = fileName;
+     }
+@@ -227,26 +222,6 @@
+         return started;
+     }
+ 
+-    @Override
+-    public boolean isStarting() {
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isStopping() {
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isStopped() {
+-        return !started;
+-    }
+-
+-    @Override
+-    public boolean isFailed() {
+-        return false;
+-    }
+-
+     public boolean isQuiet() {
+         return quiet;
+     }
+@@ -310,14 +285,4 @@
+         return fai.getFilterChainDecision(event);
+     }
+ 
+-    @Override
+-    public void addLifeCycleListener(Listener listener) {
+-        // we'll implement this when asked
+-    }
+-
+-    @Override
+-    public void removeLifeCycleListener(Listener listener) {
+-        // we'll implement this when asked
+-    }
+-
+ }


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 02-remove-google-ads.patch
 04-privacy-breach.patch
 05-java11-compatibility.patch
+06-jetty-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/logback/commit/a7fc0435349204acd98e3b5433327679293f5852

-- 
View it on GitLab: https://salsa.debian.org/java-team/logback/commit/a7fc0435349204acd98e3b5433327679293f5852
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181210/1bde0f93/attachment.html>