diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java index 32f01ddd11..02c97c5b31 100644 --- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java +++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java @@ -17,7 +17,7 @@ package net.i2p.jetty; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.Writer; +//import java.io.Writer; // As of Jetty 9.4.15, RequestLog interface has a Writer subinterface import java.util.ArrayList; import java.util.Locale; import java.util.TimeZone; @@ -81,7 +81,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog private transient OutputStream _fileOut; private transient DateCache _logDateCache; private transient PathMap _ignorePathMap; - private transient Writer _writer; + private transient java.io.Writer _writer; private transient ArrayList _buffers; private transient char[] _copy; @@ -439,7 +439,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog /* ------------------------------------------------------------ */ protected void logExtended(Request request, Response response, - Writer writer) throws IOException + java.io.Writer writer) throws IOException { String referer = request.getHeader("Referer"); if (referer == null) diff --git a/history.txt b/history.txt index 655b37af3e..6f15a288ac 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2019-03-16 zzz + * Fix Debian builds with Jetty 9.4.15 (ticket #2457) + 2019-03-11 zab * Startup: make negative client app delay value mean waiting for router to be RUNNING (ticket #2377) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 25340f779d..421ff4f630 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 15; + public final static long BUILD = 16; /** for example "-test" */ public final static String EXTRA = "-rc";