From dd0d7ba6c95b6699ff6b080e45675e00df69ed8e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 14 Aug 2016 15:33:23 +0000
Subject: [PATCH] Pull in override.properties for bootclasspath Bump to java
 1.6

---
 CHANGES.txt   | 6 +++++-
 build.xml     | 1 +
 src/build.xml | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index b85afdd..cc88a2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,10 @@
+0.15.0
+  2015-08-xx
+  Increase default limits, set I2CP tag options
+
 0.14.0
   2015-05-28
-  Remove use of deprecated SimpleScheduler
+  Remove use of deprecated SimpleScheduler (ticket #1523)
   Remove static structures
   Use RandomIterator for efficiency
 
diff --git a/build.xml b/build.xml
index 377e40f..1d93158 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project basedir="." default="all" name="zzzot">
+    <property file="override.properties"/>
    
     <target name="all" depends="clean,plugin" />
 
diff --git a/src/build.xml b/src/build.xml
index 37e3a33..02fed68 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -25,13 +25,14 @@
     </target>
 
     <property name="javac.compilerargs" value="" />
+    <property name="javac.version" value="1.6" />
 
     <target name="compile">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./java" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
             classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/mstreaming.jar:${i2plib}/systray.jar:${jettylib}/org.mortbay.jetty.jar:${jettylib}/jetty-util.jar:${jettylib}/jetty-xml.jar" >