Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authortbell
Thu, 30 Jul 2009 23:37:25 -0700
changeset 3359 0589e2ed45b3
parent 3358 d4b60a33650f (diff)
parent 3356 72497ffbb7b1 (current diff)
child 3360 bd50f2e84c17
Merge
corba/make/Makefile file | annotate | diff | comparison | revisions
corba/make/common/shared/Defs-java.gmk file | annotate | diff | comparison | revisions 
--- a/corba/make/Makefile	Thu Jul 30 10:58:21 2009 -0700
+++ b/corba/make/Makefile	Thu Jul 30 23:37:25 2009 -0700
@@ -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/corba/make/common/shared/Defs-java.gmk	Thu Jul 30 10:58:21 2009 -0700
+++ b/corba/make/common/shared/Defs-java.gmk	Thu Jul 30 23:37:25 2009 -0700
@@ -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
jdk-sandbox