8214794: java.specification.version should be only the major version number

Reviewed-by: martin, mchung, bpb
This commit is contained in:
Roger Riggs 2018-12-04 15:22:41 -05:00
parent 4e935d302a
commit f0279fd499
2 changed files with 5 additions and 1 deletions
make/gensrc
src/java.base/share/classes/java/lang

@ -42,6 +42,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
@@VERSION_DATE@@ => $(VERSION_DATE) ; \ @@VERSION_DATE@@ => $(VERSION_DATE) ; \
@@VERSION_CLASSFILE_MAJOR@@ => $(VERSION_CLASSFILE_MAJOR) ; \ @@VERSION_CLASSFILE_MAJOR@@ => $(VERSION_CLASSFILE_MAJOR) ; \
@@VERSION_CLASSFILE_MINOR@@ => $(VERSION_CLASSFILE_MINOR) ; \ @@VERSION_CLASSFILE_MINOR@@ => $(VERSION_CLASSFILE_MINOR) ; \
@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \ @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \
@@VENDOR@@ => $(COMPANY_NAME) ; \ @@VENDOR@@ => $(COMPANY_NAME) ; \
@@VENDOR_URL@@ => $(VENDOR_URL) ; \ @@VENDOR_URL@@ => $(VENDOR_URL) ; \

@ -51,6 +51,9 @@ class VersionProps {
private static final String VERSION_NUMBER = private static final String VERSION_NUMBER =
"@@VERSION_NUMBER@@"; "@@VERSION_NUMBER@@";
private static final String VERSION_SPECIFICATION =
"@@VERSION_SPECIFICATION@@";
private static final String VERSION_BUILD = private static final String VERSION_BUILD =
"@@VERSION_BUILD@@"; "@@VERSION_BUILD@@";
@ -97,7 +100,7 @@ class VersionProps {
props.setProperty("java.class.version", CLASSFILE_MAJOR_MINOR); props.setProperty("java.class.version", CLASSFILE_MAJOR_MINOR);
props.setProperty("java.specification.version", VERSION_NUMBER); props.setProperty("java.specification.version", VERSION_SPECIFICATION);
props.setProperty("java.specification.name", "Java Platform API Specification"); props.setProperty("java.specification.name", "Java Platform API Specification");
props.setProperty("java.specification.vendor", "Oracle Corporation"); props.setProperty("java.specification.vendor", "Oracle Corporation");