From f85d03085bc3cb69822b55d68b2c584055db4651 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 6 Jan 2016 17:57:06 +0000
Subject: [PATCH] Build: Remove big geoip files from release again

---
 build.xml                                         |  9 ++++++---
 history.txt                                       | 11 +++++++++++
 router/java/src/net/i2p/router/RouterVersion.java |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 1561fdd9da..40b1ed2fa2 100644
--- a/build.xml
+++ b/build.xml
@@ -1616,6 +1616,11 @@
         <ant dir="router/java/" target="jarTest" />
         <copy file="core/java/build/i2ptest.jar" todir="build" />
         <copy file="router/java/build/routertest.jar" todir="build" />
+        <!-- broken -->
+      <!--
+        <ant dir="apps/ministreaming/java/" target="junit.compileTest" />
+        <ant dir="apps/streaming/java/" target="junit.compileTest" />
+       -->
     </target>
     <target name="prepTest" depends="prepupdate, buildTest">
         <!-- overwrite i2p.jar and router.jar with the test versions -->
@@ -1793,11 +1798,9 @@
          since preppkg puts too much stuff in pkg-temp -->
 <!--
     <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
--->
     <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
-<!--
-    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
 -->
+    <target name="release" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer-nowindows, delete-nonwindows, installer-windows">
         <echo message="New version number is ${release.number}" />
         <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
         <copy file="i2pinstall_${full.version}.jar" tofile="i2pinstall_${release.number}.jar" />
diff --git a/history.txt b/history.txt
index f340136d14..2e3ca8d295 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,14 @@
+2016-01-06 zzz
+ * Build: Remove big geoip files from release again
+ * Console: Properly register listen hosts with PortMapper
+ * DataHelper: Optimize checks in storeProps()
+ * I2PTunnel: Fixup console links in error pages if console is
+           on a non-standard host or port, or on https
+ * Jetty: Change default source logging from b64 to b32.
+   To change back to b64, add the following to the RequestLogImpl
+   section of jetty.xml: <Set name="b64">true</Set>
+ * PortMapper: Add method to convert wildcard host to actual host
+
 2015-12-21 zzz
  * SSU: Hand all messages pending after establishment to the
    outbound queue at once, for efficiency.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 80cfb9c849..5b1ba79e39 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 = 18;
+    public final static long BUILD = 19;
 
     /** for example "-test" */
     public final static String EXTRA = "";