From 3cba2870f9c9ab07fd369999d80fe1e28770d53e Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Wed, 20 May 2009 13:45:44 -0700
Subject: [PATCH] 6827026: Change javac source and target default to 7

Reviewed-by: darcy, ohair
---
 jaxp/make/Makefile         | 10 +++++++++-
 jaxp/make/build.properties |  1 +
 jaxp/make/build.xml        |  1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jaxp/make/Makefile b/jaxp/make/Makefile
index e8ea3347b31..e013055c7b1 100644
--- a/jaxp/make/Makefile
+++ b/jaxp/make/Makefile
@@ -77,7 +77,15 @@ else
   ifdef JAVAC_TARGET_ARG
     ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
   endif
-endif
+endif 
+
+ifdef SOURCE_LANGUAGE_VERSION
+  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
+else
+  ifdef JAVAC_SOURCE_ARG 
+    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
+  endif
+endif 
 
 ifdef ALT_BOOTDIR
   ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
diff --git a/jaxp/make/build.properties b/jaxp/make/build.properties
index e02250903d6..2cfd6b578dd 100644
--- a/jaxp/make/build.properties
+++ b/jaxp/make/build.properties
@@ -30,6 +30,7 @@
 # one of the standard user build.properties files (see build.xml)
 
 # options for the <javac> tasks used to compile the tools
+javac.source = 5
 javac.target = 5
 javac.debug = true
 javac.debuglevel = source,lines
diff --git a/jaxp/make/build.xml b/jaxp/make/build.xml
index 6aeb6731d09..414080e847c 100644
--- a/jaxp/make/build.xml
+++ b/jaxp/make/build.xml
@@ -85,6 +85,7 @@
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
              memoryMaximumSize="${javac.memoryMaximumSize}"
+	     source="${javac.source}"
              target="${javac.target}">
          <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
          <compilerarg line="${javac.version.opt}"/>