# HG changeset patch
# User duke
# Date 1499287742 -7200
# Node ID 639b8b612ce8bb29ce28579cacd306ecceed6fc5
# Parent  015723e366209e43e4ac688c9bf09f8f5e65d611# Parent  aa491a7d76c1c2e5c6e4fbecde83fc48ece91b98
Merge

diff -r 015723e36620 -r 639b8b612ce8 .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Feb 09 18:15:37 2017 +0000
+++ b/.hgtags-top-repo	Wed Jul 05 22:49:02 2017 +0200
@@ -396,5 +396,7 @@
 71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
 ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152
 816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
+8d22611ffb6540bc1ace64a00c048c8b82d8c69a jdk-10+0
 8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
 688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155
+783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156
diff -r 015723e36620 -r 639b8b612ce8 .jcheck/conf
--- a/.jcheck/conf	Thu Feb 09 18:15:37 2017 +0000
+++ b/.jcheck/conf	Wed Jul 05 22:49:02 2017 +0200
@@ -1,1 +1,1 @@
-project=jdk9
+project=jdk10
diff -r 015723e36620 -r 639b8b612ce8 common/autoconf/version-numbers
--- a/common/autoconf/version-numbers	Thu Feb 09 18:15:37 2017 +0000
+++ b/common/autoconf/version-numbers	Wed Jul 05 22:49:02 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -25,7 +25,7 @@
 
 # Default version numbers to use unless overridden by configure
 
-DEFAULT_VERSION_MAJOR=9
+DEFAULT_VERSION_MAJOR=10
 DEFAULT_VERSION_MINOR=0
 DEFAULT_VERSION_SECURITY=0
 DEFAULT_VERSION_PATCH=0
diff -r 015723e36620 -r 639b8b612ce8 common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js	Thu Feb 09 18:15:37 2017 +0000
+++ b/common/conf/jib-profiles.js	Wed Jul 05 22:49:02 2017 +0200
@@ -1080,7 +1080,7 @@
         + "." + (minor != null ? minor : version_numbers.get("DEFAULT_VERSION_MINOR"))
         + "." + (security != null ? security :  version_numbers.get("DEFAULT_VERSION_SECURITY"))
         + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"));
-    while (version.match(".*\.0$")) {
+    while (version.match(".*\\.0$")) {
         version = version.substring(0, version.length - 2);
     }
     return version;
diff -r 015723e36620 -r 639b8b612ce8 make/common/SetupJavaCompilers.gmk
--- a/make/common/SetupJavaCompilers.gmk	Thu Feb 09 18:15:37 2017 +0000
+++ b/make/common/SetupJavaCompilers.gmk	Wed Jul 05 22:49:02 2017 +0200
@@ -69,7 +69,7 @@
 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
     JVM := $(JAVA_JAVAC), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -source 9 -target 9 \
+    FLAGS := -source 10 -target 10 \
         -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
@@ -79,7 +79,7 @@
 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
     JVM := $(JAVA_JAVAC), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := -source 9 -target 9 \
+    FLAGS := -source 10 -target 10 \
         -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))