From fe391ff29fe377459f8890e719742bced2883b80 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 3 Feb 2014 23:59:48 +0000
Subject: [PATCH] Convert all jars and wars to compile to 1.6 target, except
 for the following which are used by android, to maintain compatibility with
 very old phones, for now:

	addressbook.war
	BOB.jar
	i2p.jar
	i2ptunnel.jar
	mstreaming.jar
	router.jar
	streaming.jar
---
 apps/addressbook/build.xml        | 2 +-
 apps/desktopgui/build.xml         | 2 +-
 apps/i2psnark/java/build.xml      | 2 +-
 apps/i2ptunnel/java/build.xml     | 2 +-
 apps/jetty/build.xml              | 2 +-
 apps/routerconsole/java/build.xml | 4 ++--
 apps/sam/java/build.xml           | 4 ++--
 apps/susidns/src/build.xml        | 4 ++--
 apps/susimail/build.xml           | 2 +-
 apps/systray/java/build.xml       | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index beff280f8..719924bcd 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -37,7 +37,7 @@
         </target>
 
 	<target name="compile" depends="init, depend">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+		<javac debug="true" deprecation="on" source="1.6" target="1.6" 
                        includeAntRuntime="false"
                        srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index 296280aba..59f2b8ed2 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -27,7 +27,7 @@
 	</target>
 
 	<target name="compile" depends="init">
-		<javac debug="true" deprecation="on" source="1.5" target="1.5" 
+		<javac debug="true" deprecation="on" source="1.6" target="1.6" 
                        includeAntRuntime="false"
                        srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index d6a851427..225c9f377 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -36,7 +36,7 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="1.6" target="1.6" 
             destdir="./build/obj" 
             includeAntRuntime="false"
             classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 14ca2f3c5..e095af29d 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -238,7 +238,7 @@
             <arg value="-webapp" />
             <arg value="../jsp/" />
         </java>
-        <javac debug="true" deprecation="on" source="1.5" target="1.5" 
+        <javac debug="true" deprecation="on" source="1.6" target="1.6" 
                includeAntRuntime="false"
                destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 3974b8566..5e9072825 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -227,7 +227,7 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./java/src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="1.6" target="1.6" 
             destdir="./build/obj" 
             includeAntRuntime="false"
             classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 9753bff68..fd8fe3c29 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -52,7 +52,7 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="1.6" target="1.6" 
             includeAntRuntime="false"
             destdir="./build/obj">
             <compilerarg line="${javac.compilerargs}" />
@@ -342,7 +342,7 @@
             <arg value="../jsp/" />
         </java>
         
-        <javac debug="true" deprecation="on" source="1.5" target="1.5" 
+        <javac debug="true" deprecation="on" source="1.6" target="1.6" 
                encoding="UTF-8"
                includeAntRuntime="false"
                destdir="../jsp/WEB-INF/classes/" 
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 076c2e453..ee12a5704 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -30,7 +30,7 @@
         <mkdir dir="./build/obj" />
         <javac 
             srcdir="./src" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="1.6" target="1.6" 
             includeAntRuntime="false"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
@@ -41,7 +41,7 @@
     <target name="compileTest" depends="compile">
         <javac 
             srcdir="./test" 
-            debug="true" deprecation="on" source="1.5" target="1.5" 
+            debug="true" deprecation="on" source="1.6" target="1.6" 
             includeAntRuntime="false"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index ed71e2638..b7afaa5d7 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -29,7 +29,7 @@
 
  	<target name="compile">
 		<mkdir dir="${bin}" />
-		<javac debug="true" deprecation="on" source="1.5" target="1.5"
+		<javac debug="true" deprecation="on" source="1.6" target="1.6"
 			includeAntRuntime="false"
  			classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" >
 			<compilerarg line="${javac.compilerargs}" />
@@ -52,7 +52,7 @@
             <arg value="-webapp" />
             <arg value="./jsp" />
         </java>
-        <javac debug="true" deprecation="on" source="1.5" target="1.5" 
+        <javac debug="true" deprecation="on" source="1.6" target="1.6" 
                includeAntRuntime="false"
                destdir="${bin}" srcdir="${tmp}" includes="**/*.java" classpathref="cp">
 		<compilerarg line="${javac.compilerargs}" />
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index de05643fb..e99e64567 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -17,7 +17,7 @@
         <mkdir dir="./src/WEB-INF/classes" />
         <javac 
             srcdir="./src/src"
-            debug="true" deprecation="off" source="1.5" target="1.5" 
+            debug="true" deprecation="off" source="1.6" target="1.6" 
             includeAntRuntime="false"
             destdir="./src/WEB-INF/classes">
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index eeec39230..eb5e01a03 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -13,8 +13,8 @@
             srcdir="./src"
             debug="true"
             deprecation="on"
-            source="1.5"
-            target="1.5"
+            source="1.6"
+            target="1.6"
             destdir="./build/obj"
             includeAntRuntime="false"
             includes="**/*.java"