Mercurial > hg > release > icedtea7-forest-2.2 > corba

changeset 106:4d8317ea0eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author andrew
date Fri, 07 Aug 2009 02:43:20 +0100
parents 1cb0098b53b2 (current diff) 5182bcc9c60c (diff)
children a0eefb08a314
files
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Aug 06 13:20:34 2009 +0100
+++ b/.hgtags	Fri Aug 07 02:43:20 2009 +0100
@@ -41,3 +41,4 @@
 047dd27fddb607f8135296b3754131f6e13cb8c7 jdk7-b64
 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65
 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66
+a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67
--- a/make/Makefile	Thu Aug 06 13:20:34 2009 +0100
+++ b/make/Makefile	Fri Aug 07 02:43:20 2009 +0100
@@ -110,7 +110,7 @@
 ifdef TARGET_CLASS_VERSION
     TARGET_LEVEL = $(TARGET_CLASS_VERSION)
 else
-    TARGET_LEVEL = 6
+    TARGET_LEVEL = 7
 endif
 
 ifndef TARGET_JAVA
--- a/make/common/shared/Defs-java.gmk	Thu Aug 06 13:20:34 2009 +0100
+++ b/make/common/shared/Defs-java.gmk	Fri Aug 07 02:43:20 2009 +0100
@@ -107,12 +107,12 @@
 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
 JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
 
-# Add the source level (currently all source is 1.5, should this be 1.6?)
-LANGUAGE_VERSION = -source 1.5
+# Add the source level
+LANGUAGE_VERSION = -source 7
 JAVACFLAGS  += $(LANGUAGE_VERSION)
 
-# Add the class version we want (currently this is 5, should it be 6 or even 7?)
-TARGET_CLASS_VERSION = 5
+# Add the class version we want
+TARGET_CLASS_VERSION = 7
 CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
 JAVACFLAGS  += $(CLASS_VERSION)
 JAVACFLAGS  += -encoding ascii