From b4e2619c3ba4fce54bc4eb35c7ab3a99d6cd7dd8 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 18 Jan 2019 11:35:36 +0000
Subject: [PATCH] Plugins: Fix loading of webapp configuration classes on Jetty
 9.4 by whitelisting them as allowed server classes (ticket #2385)

---
 .../java/src/net/i2p/router/web/WebAppStarter.java           | 5 ++++-
 history.txt                                                  | 4 ++++
 router/java/src/net/i2p/router/RouterVersion.java            | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
index 94ac58d97d..34ab11b665 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java
@@ -139,8 +139,11 @@ public class WebAppStarter {
         if (classNames.length == 0)
             classNames = wac.getDefaultConfigurationClasses();
         String[] newClassNames = new String[classNames.length + 1];
-        for (int j = 0; j < classNames.length; j++)
+        for (int j = 0; j < classNames.length; j++) {
              newClassNames[j] = classNames[j];
+             // fix for Jetty 9.4 ticket #2385
+             wac.prependServerClass("-" + classNames[j]);
+        }
         newClassNames[classNames.length] = WebAppConfiguration.class.getName();
         wac.setConfigurationClasses(newClassNames);
     }
diff --git a/history.txt b/history.txt
index 4901b436f8..b30b47f3e4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
+2019-01-18 zzz
+ * Plugins: Fix loading of webapp configuration classes (ticket #2385)
+
 2019-01-15 zzz
+ * Debian: AppArmor updates (ticket #2319)
  * SusiMail:
    - Fix sending mail with attachments (ticket #2373)
    - Fix deleting attachments from drafts
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 098e16d499..14408f1ed4 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 = 17;
+    public final static long BUILD = 18;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";