From d5c8f8e63c19d863647df12433d037bd6afa20df Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Fri, 6 Feb 2026 09:33:24 -0500
Subject: [PATCH] Debian: Resolute/trixie javadoc build fix

fixes javadoc build fail and stray symlink
---
 build.xml                                         | 2 ++
 debian-alt/jammy/i2p-router.links                 | 1 -
 debian-alt/questing/i2p-router.links              | 1 -
 debian/i2p-router.links                           | 1 -
 history.txt                                       | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 2d5f5bbe8..e6d3ed674 100644
--- a/build.xml
+++ b/build.xml
@@ -959,6 +959,8 @@
                 <pathelement location="core/java/build/libintl.jar" />
                 <pathelement location="core/java/build/gnu-getopt.jar" />
                 <pathelement location="core/java/build/json-simple.jar" />
+                <pathelement location="apps/jetty/jettylib/jetty-ee.jar" />
+                <pathelement location="apps/jetty/jettylib/slf4j2-api.jar" />
             </classpath>
             <!-- These variables are stored in build.properties.
                   End-users can override by creating the file override.properties -->
diff --git a/debian-alt/jammy/i2p-router.links b/debian-alt/jammy/i2p-router.links
index 949c7e19b..507b1bced 100644
--- a/debian-alt/jammy/i2p-router.links
+++ b/debian-alt/jammy/i2p-router.links
@@ -12,7 +12,6 @@ usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 # comment out if not building with libjetty12-java
 # ubuntu: in resolute
 # debian: in trixie sid
-#usr/share/java/jetty12-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
 #usr/share/java/jetty12-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
 #usr/share/java/jetty12-ee.jar usr/share/i2p/lib/jetty-ee.jar
 #usr/share/java/jetty12-http.jar usr/share/i2p/lib/jetty-http.jar
diff --git a/debian-alt/questing/i2p-router.links b/debian-alt/questing/i2p-router.links
index 949c7e19b..507b1bced 100644
--- a/debian-alt/questing/i2p-router.links
+++ b/debian-alt/questing/i2p-router.links
@@ -12,7 +12,6 @@ usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 # comment out if not building with libjetty12-java
 # ubuntu: in resolute
 # debian: in trixie sid
-#usr/share/java/jetty12-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
 #usr/share/java/jetty12-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
 #usr/share/java/jetty12-ee.jar usr/share/i2p/lib/jetty-ee.jar
 #usr/share/java/jetty12-http.jar usr/share/i2p/lib/jetty-http.jar
diff --git a/debian/i2p-router.links b/debian/i2p-router.links
index d4b103e7d..e35cd2c5e 100644
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -12,7 +12,6 @@ usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
 # comment out if not building with libjetty12-java
 # ubuntu: resolute
 # debian: in trixie sid
-usr/share/java/jetty12-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
 usr/share/java/jetty12-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
 usr/share/java/jetty12-ee.jar usr/share/i2p/lib/jetty-ee.jar
 usr/share/java/jetty12-http.jar usr/share/i2p/lib/jetty-http.jar
diff --git a/history.txt b/history.txt
index 1c8511204..c8a9f5d45 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2026-02-06 zzz
+ * Debian: Resolute/trixie fixes
+
 2026-02-05 zzz
  * Debian: Package fixes
  * NetDB: Tweak RI drop probabilities
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index ebb07d7f3..9b24d19fb 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -20,7 +20,7 @@ public class RouterVersion {
     public final static String VERSION = CoreVersion.VERSION;
     /** for example: "beta", "alpha", "rc" */
     public final static String QUALIFIER = "-rc";
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + QUALIFIER + EXTRA;