Merge 'jdk8u272-ga'

.hgtags

@@ -1005,7 +1005,22 @@ bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06
 908e7985b3393370a417db1254ab4585ea954b2f jdk8u262-b03
 e1a42471eb39cb9340608238cd67b1938f73632e jdk8u262-b04
 ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u262-b05
+ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u272-b00
 2f973e405849e5e5fbe1b95ad1f37dc19cd046bc jdk8u262-b06
 4f5c1e68c85ec157a86505613e1aec3f4528957b jdk8u262-b07
 59b2de0b2c60f7ae444a43c76fc96260351172a3 jdk8u262-b08
 2bab25ddc567a2fe5038cb49cf5586dfb4c32ff2 jdk8u262-b09
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-b10
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-ga
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u265-b00
+6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-b01
+6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-ga
+1bda51d3d528f884afe13b4a810390e3aa2464a8 jdk8u272-b01
+1059e4b7426a1ab9c52ce9aa55daf11d97b13607 jdk8u272-b02
+fbad06cacb73f4ca1701c789f7c1bc3f5c6f08c9 jdk8u272-b03
+a0dd128191fdce8034be8bd4c7a1f47ee2426e6d jdk8u272-b04
+afbc213b114cfc20b07318d4c1b2550211e77682 jdk8u272-b05
+e68b51b4e55a792c78f6f043738e75755571d92d jdk8u272-b06
+fec6ed779ae6ebe1cd2b3a97963026b3104f8ded jdk8u272-b07
+34c6baf214648afedf83625ed18a2650ed280c36 jdk8u272-b08
+7f60c2d9823ea2928db8eee582fbc736bd8d962c jdk8u272-b09

THIRD_PARTY_README

@@ -2240,7 +2240,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to PC/SC Lite v1.8.24,
+%% This notice is provided with respect to PC/SC Lite v1.8.26,
 which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
 
 --- begin of LICENSE ---
@@ -3028,8 +3028,7 @@ included with JRE 8, JDK 8, and OpenJDK 8.
   Apache Commons Math 3.2
   Apache Derby 10.11.1.2
   Apache Jakarta BCEL 5.1 
-  Apache Jakarta Regexp 1.4 
-  Apache Santuario XML Security for Java 1.5.4
+  Apache Santuario XML Security for Java 2.1.1
   Apache Xalan-Java 2.7.2
   Apache Xerces Java 2.10.0 
   Apache XML Resolver 1.1 
@@ -3243,3 +3242,41 @@ included with JRE 8, JDK 8, and OpenJDK 8.
 
 -------------------------------------------------------------------------------
 
+%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
+Interface v2.40,  which may be included with JRE 8, JDK 8, and OpenJDK 8.
+
+--- begin of LICENSE ---
+
+Copyright (c) OASIS Open 2016. All Rights Reserved.
+
+All capitalized terms in the following text have the meanings assigned to them
+in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+full Policy may be found at the OASIS website:
+[http://www.oasis-open.org/policies-guidelines/ipr]
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its
+implementation may be prepared, copied, published, and distributed, in whole or
+in part, without restriction of any kind, provided that the above copyright
+notice and this section are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, including by
+removing the copyright notice or references to OASIS, except as needed for the
+purpose of developing any document or deliverable produced by an OASIS
+Technical Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to translate it
+into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS"
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
+ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
+OF THIS DOCUMENT OR ANY PART THEREOF.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------

common/autoconf/generated-configure.sh

@@ -1857,7 +1857,7 @@ Optional Features:
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
-  --enable-jfr            Enable Java Flight Recorder support [disabled]
+  --disable-jfr           Disable Java Flight Recorder support [enabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
   --disable-zip-debug-info
                           disable zipping of debug-info files [enabled]
@@ -4394,7 +4394,7 @@ VS_SDK_PLATFORM_NAME_2017=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1589212500
+DATE_WHEN_GENERATED=1591143270
 
 ###############################################################################
 #
@@ -19822,27 +19822,35 @@ fi
   #
   # Enable or disable JFR
   #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
-$as_echo_n "checking whether to build jfr... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5
+$as_echo_n "checking whether to build JFR... " >&6; }
   # Check whether --enable-jfr was given.
 if test "${enable_jfr+set}" = set; then :
   enableval=$enable_jfr;
 else
   enable_jfr=auto
 fi
 
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
+      if test "x$enable_jfr" = "xyes"; then
+        as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      if test "x$enable_jfr" = "xyes"; then
+        as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
+    as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
 $as_echo "$ENABLE_JFR" >&6; }

common/autoconf/jdk-options.m4

@@ -437,22 +437,30 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   #
   # Enable or disable JFR
   #
-  AC_MSG_CHECKING([whether to build jfr])
-  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
-      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
+  AC_MSG_CHECKING([whether to build JFR])
+  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
+      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
       [enable_jfr=auto])
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      AC_MSG_ERROR([AIX does not support JFR])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([AIX does not support JFR])
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
+    AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
   fi
   AC_MSG_RESULT([$ENABLE_JFR])
   AC_SUBST(ENABLE_JFR)

dragonwell_version

@@ -19,5 +19,5 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-DRAGONWELL_VERSION=8.4.4
-DRAGONWELL_JDK_UPDATE_VERSION=262
+DRAGONWELL_VERSION=8.5.4
+DRAGONWELL_JDK_UPDATE_VERSION=272

get_source_dragonwell.sh

@@ -105,10 +105,14 @@ for repo in ${subrepos}; do
   # checkout to specific branch
   if [ $BRANCH != "master" ]; then
     cd ${repo}
-    ${GIT} checkout -b ${BRANCH} origin/${BRANCH}
+    ${GIT} checkout origin/${BRANCH} -b ${BRANCH}
     result=$?
     if [ $result  != 0 ]; then
-      error "failed to checkout ${repo} to ${BRANCH}"
+      ${GIT} checkout tags/${BRANCH} -b ${BRANCH}
+      result=$?
+      if [ $result  != 0 ]; then
+        error "failed to checkout ${repo} to ${BRANCH}"
+      fi
     fi
     cd ..
   fi

make/Javadoc.gmk

@@ -221,6 +221,11 @@ JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
 PLATFORM_DOCSDIR = $(DOCSDIR)/platform
 
+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
+JAVADOC_ARCHIVE_ASSEMBLY_DIR :=  $(DOCSTMPDIR)/docs-zip
+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
+
 # The non-core api javadocs need to be able to access the root of the core
 # api directory, so for jdk/api or jre/api to get to the core api/
 # directory we would use this:
@@ -329,6 +334,37 @@ include NON_CORE_PKGS.gmk
 all: docs
 docs: coredocs otherdocs
 
+#
+# Optional target which bundles all generated javadocs into a zip 
+# archive. The dependency on docs is handled in Main.gmk. Incremental 
+# building of docs is currently broken so if you invoke docs-zip after 
+# docs, the docs are always rebuilt.
+#
+
+docs-zip: $(JAVADOC_ARCHIVE)
+
+#
+# Add the core docs as prerequisite to the archive to trigger a rebuild
+# if the core docs were rebuilt. Ideally any doc rebuild should trigger
+# this, but the way prerequisites are currently setup in this file, that
+# is hard to achieve.
+#
+
+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
+	@$(ECHO) $(LOG_INFO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)"
+	$(MKDIR) -p $(JAVADOC_ARCHIVE_DIR)
+	$(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
+	$(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
+	all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html | grep -v old/doclet `; \
+	pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
+	for index_file in $${all_roots} ; do \
+	  target_dir=`dirname $${index_file}`; \
+	  name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
+	  $(LN) -s $${target_dir}  $${name}; \
+	done; \
+	$(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
+	popd ;
+
 #################################################################
 # Production Targets -- USE THESE TARGETS WHEN:
 # a) You're generating docs outside of release engineering's
@@ -1372,4 +1408,4 @@ clean:
 
 #############################################################
 .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
-    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
+    sanitycheckcoredocs $(ALL_OTHER_TARGETS) docs-zip

make/Main.gmk

@@ -161,6 +161,12 @@ docs-only: start-make
 	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
 	@$(call TargetExit)
 
+docs-zip: docs docs-zip-only
+docs-zip-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
+	@$(call TargetExit)
+
 sign-jars: jdk sign-jars-only
 sign-jars-only: start-make
 	@$(call TargetEnter)
@@ -235,6 +241,8 @@ clean-bootcycle-build:
 clean-docs:
 	$(call CleanComponent,docs)
 	$(call CleanComponent,docstemp)
+clean-docs-zip:
+	$(call CleanComponent,bundles/jdk-*-docs.zip)
 clean-test:
 	$(call CleanComponent,testoutput)
 
@@ -246,10 +254,10 @@ reconfigure:
         endif
 	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs docs-zip
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only docs-zip-only
 .PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-docs-zip clean-test clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only
 
 include $(root_dir)/make/Jprt.gmk