From 6c61fd5d6090f98ae30ec88edb288c604dcc16f5 Mon Sep 17 00:00:00 2001
From: tobi42 <devnull@localhost>
Date: Mon, 17 Aug 2009 09:23:03 +0000
Subject: [PATCH] BF 2838832
 (https://sourceforge.net/tracker/?func=detail&atid=879332&aid=2838832&group_id=176962)

Adding attribute "target=1.5" to all javac invocations that don't have such an attribute yet as recommended by http://ant.apache.org/manual/CoreTasks/javac.html.
---
 JasperReportsWebApp/build.xml | 2 +-
 base/build.xml                | 2 +-
 client/build.xml              | 2 +-
 extend/build.xml              | 2 +-
 install/build.xml             | 2 +-
 looks/build.xml               | 2 +-
 serverApps/build.xml          | 1 +
 serverRoot/build.xml          | 1 +
 tools/build.xml               | 2 +-
 webCM/build.xml               | 1 +
 zkwebui/build.xml             | 3 ++-
 11 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/JasperReportsWebApp/build.xml b/JasperReportsWebApp/build.xml
index 8bf13304d8..3f70251643 100644
--- a/JasperReportsWebApp/build.xml
+++ b/JasperReportsWebApp/build.xml
@@ -27,7 +27,7 @@
   <target name="compile">
   	<echo>------ Compiling webApp</echo>
   	<mkdir dir="${build.dir}"/>
-    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
   </target>
diff --git a/base/build.xml b/base/build.xml
index 066d476849..1aec966937 100644
--- a/base/build.xml
+++ b/base/build.xml
@@ -52,7 +52,7 @@
   
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
+    <javac target="1.5" fork="true" destdir="${build.dir}" deprecation="on" debug="on" memoryinitialsize="512m" memorymaximumsize="512m">
       <src path="${src}"/>
       <src path="${looksSrc}"/>
       <src path="../glassfishfacet/src"/>
diff --git a/client/build.xml b/client/build.xml
index efbf72895b..d50ec51b7f 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -63,7 +63,7 @@
   <!-- =========================================== -->
   <target name="clientCompile" depends="clientMakedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/extend/build.xml b/extend/build.xml
index f037debc2e..5dbb8a95b5 100644
--- a/extend/build.xml
+++ b/extend/build.xml
@@ -47,7 +47,7 @@
   
   <target name="compile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/install/build.xml b/install/build.xml
index 21bb8e7641..1157488548 100644
--- a/install/build.xml
+++ b/install/build.xml
@@ -61,7 +61,7 @@
   <!-- ======================================================= -->
   <target name="installCompile" depends="installInit">
 	<!-- compile the java code from ${src} into ${build.dir} -->
-	<javac srcdir="${src}" destdir="${compile.dir}" deprecation="on" debug="on">
+	<javac target="1.5" srcdir="${src}" destdir="${compile.dir}" deprecation="on" debug="on">
 	  <classpath refid="project.class.path"/>
 	</javac>
 	<!-- copy all image & sound files from src to the build directory -->
diff --git a/looks/build.xml b/looks/build.xml
index dd9d4b7cf9..1e468f3ecd 100644
--- a/looks/build.xml
+++ b/looks/build.xml
@@ -46,7 +46,7 @@
 
   <target name="looksCompile" depends="makedir">
     <!-- compile the java code from ${src} into ${build.dir} -->
-    <javac srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+    <javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
       <classpath refid="project.class.path"/>
     </javac>
     <!-- copy all image & sound files from src to the build directory -->
diff --git a/serverApps/build.xml b/serverApps/build.xml
index 0e52185bf9..88917a6a24 100644
--- a/serverApps/build.xml
+++ b/serverApps/build.xml
@@ -51,6 +51,7 @@
     </path>
   	
     <javac
+      target="1.5" 
 	  destdir="${build.war.dir}"
 	  debug="on"
 	  deprecation="off"
diff --git a/serverRoot/build.xml b/serverRoot/build.xml
index 26db5d1726..b6a84908c2 100644
--- a/serverRoot/build.xml
+++ b/serverRoot/build.xml
@@ -62,6 +62,7 @@
 
     <!--	Compile all -->
     <javac
+      target="1.5" 
 	  destdir="${build.classes.dir}"
 	  debug="on"
 	  deprecation="off"
diff --git a/tools/build.xml b/tools/build.xml
index caa29baa29..eb199dbab4 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -67,7 +67,7 @@
 	<!-- ============================================= -->
 	<target name="toolsCompile" depends="toolsInit" unless="jars.uptodate">
 		<!-- compile the java code from ${src} into ${build.dir}S -->
-		<javac srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
+		<javac target="1.5" srcdir="${src}" destdir="${build.dir}" deprecation="on" debug="on">
 			<classpath refid="project.class.path" />
 		</javac>
 		<!-- copy all image & sound files from src to the build directory -->
diff --git a/webCM/build.xml b/webCM/build.xml
index b8f2ce3b05..813745233c 100644
--- a/webCM/build.xml
+++ b/webCM/build.xml
@@ -47,6 +47,7 @@
     </path>
   	
     <javac
+      target="1.5" 
 	  destdir="${build.war.dir}"
 	  debug="on"
 	  deprecation="off"
diff --git a/zkwebui/build.xml b/zkwebui/build.xml
index 9030851aef..fb5ed365d6 100644
--- a/zkwebui/build.xml
+++ b/zkwebui/build.xml
@@ -45,7 +45,8 @@
 
 	<target name="compile" depends="clean" description="Compile Java sources">
 	    <mkdir dir="${classes.dir}"/>
-	    <javac srcdir="WEB-INF/src"
+	    <javac target="1.5" 
+	    	   srcdir="WEB-INF/src"
 	           destdir="${classes.dir}"
 	           debug="${compile.debug}"
 	     	   deprecation="${compile.deprecation}"