From 0a997842212fc5e350f8a923d8646ff3c16969b9 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 13 Oct 2018 09:32:51 +0000
Subject: [PATCH] Build: Add javac.classpath to junit.compileTest targets
 (ticket #2333)

---
 apps/ministreaming/java/build.xml             |  1 +
 apps/streaming/java/build.xml                 |  1 +
 history.txt                                   | 26 ++++++++++++++++++-
 router/java/build.xml                         |  1 +
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index cbef236f91..72102b072e 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -195,6 +195,7 @@
             includeAntRuntime="false"
             destdir="./build/obj" >
             <classpath>
+                <pathelement location="${javac.classpath}" />
                 <pathelement location="../../../core/java/build/i2p.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest.jar" />
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 1b421e2f52..2fee4eae6c 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -62,6 +62,7 @@
             includeAntRuntime="false"
             destdir="./build/obj" >
             <classpath>
+                <pathelement location="${javac.classpath}" />
                 <pathelement location="../../../core/java/build/i2p.jar" />
                 <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
                 <pathelement location="${junit.home}/junit4.jar" />
diff --git a/history.txt b/history.txt
index fd373085e9..4fbbc6428e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,29 @@
+2018-10-13 zzz
+ * Build: Add javac.classpath to junit.compileTest targets (ticket #2333)
+
+2018-10-11 zzz
+ * Console: Remove static Server reference
+
+2018-10-10 zzz
+ * Build: Provide option to prevent Class-Path in manifests (ticket #2317)
+
+2018-10-09 zzz
+ * Console: Sybil tool refactoring
+
+2018-10-08 zzz
+ * Console: Refactor StatSummarizer
+
+2018-10-07 zzz
+ * Build: Fix config with-libtomcat8-java but not
+   with-libjetty9-java (ticket #1934)
+ * Debian: Don't override dh_builddeb (ticket #2329)
+
 2018-10-06 zzz
- * Console: Sort addresses in RIs
+ * Console:
+   - Fix P/X caps on /tunnels
+   - Netdb search fixes (ticket #2326)
+   - Sort addresses in RIs
+   - Split /peers page into tabs (ticket #1934)
 
 * 2018-10-04 0.9.37 released
 
diff --git a/router/java/build.xml b/router/java/build.xml
index c023526ba5..ec824c24f5 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -163,6 +163,7 @@
             includeAntRuntime="true"
             destdir="./build/obj">
             <classpath>
+                <pathelement location="${javac.classpath}" />
                 <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
                 <pathelement location="${hamcrest.home}/hamcrest-integration.jar" />
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca0..282c18b422 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 = 1;
+    public final static long BUILD = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";