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

---
 build.xml     | 2 +-
 src/build.xml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 1d93158..5343261 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
         <delete dir="plugin/eepsite/docroot/torrents/" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.14.0" />
+        <property name="release.number" value="0.15.0" />
 
         <!-- make the update xpi2p -->
         <!-- this contains everything except i2ptunnel.config -->
diff --git a/src/build.xml b/src/build.xml
index 02fed68..a3ba8a1 100644
--- a/src/build.xml
+++ b/src/build.xml
@@ -67,13 +67,15 @@
         <javac
             debug="true"
             deprecation="on"
-            source="1.5" target="1.5" 
+            source="${javac.version}" target="${javac.version}" 
             destdir="build/war/WEB-INF/classes"
             srcdir="./build/jspjava"
             includes="**/*.java"
             includeAntRuntime="false"
             classpathref="jspcp"
-            failonerror="true" />
+            failonerror="true" >
+            <compilerarg line="${javac.compilerargs}" />
+        </javac>
 
         <copy file="jsp/WEB-INF/web.xml" tofile="build/web.xml" />
         <loadfile property="jspc.web.fragment" srcfile="build/web-fragment.xml" />