--- a/langtools/make/gensrc/GensrcCommon.gmk Thu Aug 27 12:59:55 2015 -0700
+++ b/langtools/make/gensrc/GensrcCommon.gmk Mon Aug 31 13:57:43 2015 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@
define SetupVersionProperties
$(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2):
$(MKDIR) -p $$(@D)
- $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
+ $(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \
> $$@
$$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2)
@@ -68,7 +68,7 @@
# Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
# to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
- # Strip away prefix and suffix, leaving for example only:
+ # Strip away prefix and suffix, leaving for example only:
# "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
PROPJAVAS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \
$(SUPPORT_OUTPUTDIR)/gensrc/%, \
--- a/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Thu Aug 27 12:59:55 2015 -0700
+++ b/langtools/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java Mon Aug 31 13:57:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -168,6 +168,7 @@
String specVersion = System.getProperty("java.specification.version");
switch (specVersion) {
+ case "9":
case "1.9":
return RELEASE_9;
case "1.8":
--- a/langtools/test/tools/javac/options/modes/InfoOptsTest.java Thu Aug 27 12:59:55 2015 -0700
+++ b/langtools/test/tools/javac/options/modes/InfoOptsTest.java Mon Aug 31 13:57:43 2015 -0700
@@ -48,7 +48,7 @@
String specVersion = System.getProperty("java.specification.version");
testInfoOpt("-version", "javac", specVersion);
- testInfoOpt("-fullversion", "javac", specVersion, "-b");
+ testInfoOpt("-fullversion", "javac", specVersion, "+");
}
void testInfoOpt(String opt, String... expect) {
--- a/langtools/test/tools/javac/options/modes/SourceTargetTest.java Thu Aug 27 12:59:55 2015 -0700
+++ b/langtools/test/tools/javac/options/modes/SourceTargetTest.java Mon Aug 31 13:57:43 2015 -0700
@@ -45,7 +45,10 @@
@Test
void testSourceTarget() throws IOException {
String v = System.getProperty("java.specification.version");
- String latest = v.substring(v.lastIndexOf(".") + 1);
+ String[] va = v.split("\\.");
+ int major = Integer.parseInt(va[0]);
+ boolean newVersion = major > 8;
+ String latest = (newVersion) ? va[0] : va[1];
String prev = String.valueOf(Integer.valueOf(latest) - 1);
writeFile("C.java", "class C { }");