changeset 10760:efac496a39cc

Merge
author kcr
date Thu, 21 Dec 2017 14:42:35 -0800
parents c56facad487c d8061da7b425
children cd2e46a780b0
files
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 20 17:45:33 2017 -0800
+++ b/.hgtags	Thu Dec 21 14:42:35 2017 -0800
@@ -473,4 +473,5 @@
 3932162186a7b4c53945256818eb7723d1b6a71e jdk-10+34
 90773bfb2a58cce7c1aede30cc47f28cb9c53fe6 jdk-10+35
 674513271a88e51bcd2fb598634519d5f5f46270 jdk-10+36
+afed83541a56745884906842049658b84f1c2650 jdk-11+0
 afed83541a56745884906842049658b84f1c2650 jdk-10+37
--- a/build.properties	Wed Dec 20 17:45:33 2017 -0800
+++ b/build.properties	Thu Dec 21 14:42:35 2017 -0800
@@ -39,7 +39,7 @@
 jfx.release.suffix=-ea
 
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
-jfx.release.major.version=10
+jfx.release.major.version=11
 jfx.release.minor.version=0
 jfx.release.security.version=0
 jfx.release.patch.version=0
@@ -56,8 +56,8 @@
 
 javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2018, Oracle and/or its affiliates. All rights reserved.</small>
 
-javadoc.title=JavaFX 10
-javadoc.header=JavaFX&nbsp;10
+javadoc.title=JavaFX 11
+javadoc.header=JavaFX&nbsp;11
 
 ##############################################################################
 #
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java	Wed Dec 20 17:45:33 2017 -0800
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java	Thu Dec 21 14:42:35 2017 -0800
@@ -89,7 +89,7 @@
         String version = VersionInfo.getVersion();
         // Need to update major version number when we develop the next
         // major release.
-        assertTrue(version.startsWith("10"));
+        assertTrue(version.startsWith("11"));
         String runtimeVersion = VersionInfo.getRuntimeVersion();
         assertTrue(runtimeVersion.startsWith(version));
     }