changeset 11029:379f59b28d10

Merge
author kcr
date Wed, 15 Aug 2018 12:05:06 -0700
parents 834a2d62dea8 f93715d69784
children 9bbbcd7d185f
files .hgtags
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 15 11:56:19 2018 -0700
+++ b/.hgtags	Wed Aug 15 12:05:06 2018 -0700
@@ -506,4 +506,5 @@
 21b47529863d9817c2ece0ce1a397eedd10f57ea 11+20
 3527ff907f43f6f0779a70acd23d4e8defa33734 11+21
 15326b4db60723d8323f2f0ea65e5ebd709075e5 11+22
+812efc1ce8017dcc0c5e150ad91a7e99f25a2d80 12+0
 15770e65250e465e67848f2d1b8016b134e3046c 11+23
--- a/build.properties	Wed Aug 15 11:56:19 2018 -0700
+++ b/build.properties	Wed Aug 15 12:05:06 2018 -0700
@@ -39,7 +39,7 @@
 jfx.release.suffix=-ea
 
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
-jfx.release.major.version=11
+jfx.release.major.version=12
 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 11
-javadoc.header=JavaFX&nbsp;11
+javadoc.title=JavaFX 12
+javadoc.header=JavaFX&nbsp;12
 
 ##############################################################################
 #
--- a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java	Wed Aug 15 11:56:19 2018 -0700
+++ b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java	Wed Aug 15 12:05:06 2018 -0700
@@ -89,7 +89,7 @@
         String version = VersionInfo.getVersion();
         // Need to update major version number when we develop the next
         // major release.
-        assertTrue(version.startsWith("11"));
+        assertTrue(version.startsWith("12"));
         String runtimeVersion = VersionInfo.getRuntimeVersion();
         assertTrue(runtimeVersion.startsWith(version));
     }