--- a/.hgtags Thu Jun 06 15:46:36 2019 +0300
+++ b/.hgtags Fri Jun 07 09:38:40 2019 -0700
@@ -561,3 +561,4 @@
f2f11d7f7f4e7128f8aba6ffa576cfa76fbf7d1a jdk-13+21
181986c5476468bc2dd4532af49599003ee8af37 jdk-13+22
b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23
+7e2238451585029680f126ccbb46d01f2ff5607f jdk-13+24
--- a/make/CreateBuildJdkCopy.gmk Thu Jun 06 15:46:36 2019 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 2015, 2019, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include Modules.gmk
-
-MODULES_TO_COPY := $(sort \
- $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
- $(call FindTransitiveDepsForModule, $m) $m))
-
-################################################################################
-# Copy the modules needed to run jlink and jmod. Use bulk copy instead of
-# SetupCopyFiles since there are so many files.
-
-COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
-
-$(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
- $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
- $(call LogInfo, Copying java modules to buildjdk: $(MODULES_TO_COPY))
- $(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
- $(MKDIR) -p $(BUILDJDK_OUTPUTDIR)/jdk/modules
- $(foreach m, $(MODULES_TO_COPY), \
- $(CP) -R $(JDK_OUTPUTDIR)/modules/$m \
- $(BUILDJDK_OUTPUTDIR)/jdk/modules/ $(NEWLINE))
- $(TOUCH) $@
-
-TARGETS += $(COPY_CLASSES_TARGET)
-
-################################################################################
-
-$(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
- SRC := $(OUTPUTDIR), \
- DEST := $(BUILDJDK_OUTPUTDIR), \
- FILES := $(call FindFiles, $(wildcard \
- $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
-))
-
-TARGETS += $(COPY_SUPPORT_HEADERS)
-
-################################################################################
-
-$(eval $(call SetupCopyFiles, COPY_JDK_LIB_FILES, \
- SRC := $(OUTPUTDIR), \
- DEST := $(BUILDJDK_OUTPUTDIR), \
- FILES := $(JDK_OUTPUTDIR)/lib/tzdb.dat, \
-))
-
-TARGETS += $(COPY_JDK_LIB_FILES)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: default all
--- a/make/ExplodedImageOptimize.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/ExplodedImageOptimize.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -37,7 +37,7 @@
ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
$(eval $(call SetupExecute, optimize_image, \
- INFO := Optimizing the exploded image, \
+ WARN := Optimizing the exploded image, \
DEPS := $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES), \
OUTPUT_DIR := $(JDK_OUTPUTDIR), \
COMMAND := $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR), \
--- a/make/GenerateLinkOptData.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/GenerateLinkOptData.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -67,6 +67,7 @@
$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
-Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
+ -Duser.language=en -Duser.country=US \
-cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
build.tools.classlist.HelloClasslist \
2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
--- a/make/Main.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/Main.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -66,30 +66,26 @@
################################################################################
# Interim/build tools targets, compiling tools used during the build
-# When creating a BUILDJDK, the buildtools and interim targets have already
-# been built and should not be built again.
-ifneq ($(CREATING_BUILDJDK), true)
- buildtools-langtools:
+buildtools-langtools:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
- interim-langtools:
+interim-langtools:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
- interim-rmic:
+interim-rmic:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
- interim-cldrconverter:
+interim-cldrconverter:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
- buildtools-jdk:
+buildtools-jdk:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
- buildtools-modules:
+buildtools-modules:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
- buildtools-hotspot:
+buildtools-hotspot:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
-endif
ALL_TARGETS += buildtools-langtools interim-langtools \
interim-rmic interim-cldrconverter buildtools-jdk buildtools-modules \
@@ -106,43 +102,39 @@
################################################################################
# Gensrc targets, generating source before java compilation can be done
#
-# When creating a BUILDJDK, the java targets have already been built and copied
-# into the buildjdk so no need to generate sources.
-ifneq ($(CREATING_BUILDJDK), true)
- $(eval $(call DeclareRecipesForPhase, GENSRC, \
- TARGET_SUFFIX := gensrc-src, \
- FILE_PREFIX := Gensrc, \
- MAKE_SUBDIR := gensrc, \
- CHECK_MODULES := $(ALL_MODULES), \
- ))
+$(eval $(call DeclareRecipesForPhase, GENSRC, \
+ TARGET_SUFFIX := gensrc-src, \
+ FILE_PREFIX := Gensrc, \
+ MAKE_SUBDIR := gensrc, \
+ CHECK_MODULES := $(ALL_MODULES), \
+))
- $(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
+$(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
- LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
- INTERIM_LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, \
- $(INTERIM_LANGTOOLS_BASE_MODULES)), $(GENSRC_TARGETS))
- HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
- JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
- $(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
+LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
+INTERIM_LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, \
+ $(INTERIM_LANGTOOLS_BASE_MODULES)), $(GENSRC_TARGETS))
+HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
+JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
+ $(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
- GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
- GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
- $(GENSRC_MODULEINFO_MODULES))
+GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
+GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
+ $(GENSRC_MODULEINFO_MODULES))
- GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
- GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
- $(addsuffix -gensrc, $(GENSRC_MODULES)))
+GENSRC_MODULES := $(GENSRC_MODULEINFO_MODULES)
+GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
+ $(addsuffix -gensrc, $(GENSRC_MODULES)))
- define DeclareModuleInfoRecipe
- $1-gensrc-moduleinfo:
+define DeclareModuleInfoRecipe
+ $1-gensrc-moduleinfo:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-f GensrcModuleInfo.gmk MODULE=$1)
- $1-gensrc: $1-gensrc-moduleinfo
- endef
+ $1-gensrc: $1-gensrc-moduleinfo
+endef
- $(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
-endif
+$(foreach m, $(GENSRC_MODULEINFO_MODULES), $(eval $(call DeclareModuleInfoRecipe,$m)))
ALL_TARGETS += $(GENSRC_TARGETS)
@@ -358,7 +350,7 @@
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
$(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
+$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
- JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
+ LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
else
$(call LogWarn, Boot cycle build disabled when cross compiling)
endif
@@ -455,15 +447,18 @@
java.base-copy jdk.jdeps-launchers
endif
-create-buildjdk-copy:
- +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
+BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
+ $(call FindTransitiveDepsForModule, $m) $m))
create-buildjdk-interim-image:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
$@-helper \
SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
HOTSPOT_SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
- CREATING_BUILDJDK=true)
+ CREATING_BUILDJDK=true \
+ LOG_PREFIX="[buildjdk] " \
+ JAVA_MODULES="$(BUILDJDK_MODULES)" \
+ )
ALL_TARGETS += create-buildjdk-copy create-buildjdk-interim-image
@@ -695,7 +690,7 @@
# The demos are currently linking to libjvm and libjava, just like all other
# jdk libs, even though they don't need to. To avoid warnings, make sure they
# aren't built until after libjava and libjvm are available to link to.
- demos-jdk: java.base-libs exploded-image-optimize
+ demos-jdk: java.base-libs exploded-image
test-image-demos-jdk: demos-jdk
# Declare dependency from <module>-java to <module>-gensrc
@@ -711,11 +706,7 @@
# Declare dependencies from <module>-lib to <module>-java
# Skip modules that do not have java source.
- # When creating a BUILDJDK, the java compilation has already been done by the
- # normal build and copied in.
- ifneq ($(CREATING_BUILDJDK), true)
- $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
- endif
+ $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs: $m-java))
# Declare dependencies from all other <module>-lib to java.base-lib
$(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
@@ -753,7 +744,7 @@
# Declare dependencies between jmod targets.
# java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
- # When creating a BUILDJDK, we don't need to add hashes to java.base, thus
+ # When creating the BUILDJDK, we don't need to add hashes to java.base, thus
# we don't need to depend on all other jmods
ifneq ($(CREATING_BUILDJDK), true)
java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
@@ -766,11 +757,7 @@
java.base-jmod: $(JVM_MAIN_TARGETS)
# Declare dependencies from <module>-jmod to all other module targets
- # When creating a BUILDJDK, the java compilation has already been done by the
- # normal build and copied in.
- ifneq ($(CREATING_BUILDJDK), true)
- $(foreach m, $(JAVA_MODULES), $(eval $m_JMOD_DEPS += $m-java))
- endif
+ $(foreach m, $(JAVA_MODULES), $(eval $m_JMOD_DEPS += $m-java))
$(foreach m, $(GENDATA_MODULES), $(eval $m_JMOD_DEPS += $m-gendata))
$(foreach m, $(RMIC_MODULES), $(eval $m_JMOD_DEPS += $m-rmic))
$(foreach m, $(LIBS_MODULES), $(eval $m_JMOD_DEPS += $m-libs))
@@ -804,30 +791,28 @@
# a normal build we run it from the exploded image, but when cross compiling
# it's run from the buildjdk, which is either created at build time or user
# supplied.
- #
- # For the exploded image to be runnable, all java modules and
- # jdk.jlink-launchers need to be built. We also need to copy jvm.cfg (done
- # in java.base-copy) and tzdb.dat (done in java.base-gendata) to the
- # appropriate location otherwise jimage, jlink and jmod won't start. This
- # also applies when creating the buildjdk.
- DEFAULT_JMOD_DEPS += java.base-libs java.base-copy java.base-gendata \
- jdk.jlink-launchers
- # When cross compiling and buildjdk is to be created, depend on creating the
- # buildjdk instead of the default dependencies.
ifeq ($(CREATE_BUILDJDK), true)
- # Avoid calling create-buildjdk from within a create-buildjdk call.
ifneq ($(CREATING_BUILDJDK), true)
+ # When cross compiling and buildjdk is to be created, simply depend on
+ # creating the buildjdk.
$(JMOD_TARGETS): create-buildjdk
buildtools-modules: create-buildjdk
else
- # While actually creating the buildjdk, the default deps applies.
- $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS)
+ # While actually creating the buildjdk, we need to list the bare
+ # minimum dependencies needed before running jmod, to avoid building
+ # more than necessary. This includes:
+ # * all java modules
+ # * jdk.jlink-launchers
+ # * copy jvm.cfg (done in java.base-copy)
+ # * tzdb.dat (done in java.base-gendata)
+ # Without all of these jimage, jlink and jmod won't start.
+ $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): java.base-libs java.base-copy \
+ java.base-gendata jdk.jlink-launchers java
endif
else
- # The normal non cross compilation case uses the default deps.
- # To avoid races with the optimize target, that also needs to happen first.
- $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): $(DEFAULT_JMOD_DEPS) \
- exploded-image-optimize
+ # The normal non cross compilation case uses needs to wait for the full
+ # exploded-image to avoid a race with the optimize target.
+ $(JMOD_TARGETS) $(INTERIM_JMOD_TARGETS): exploded-image
endif
# All modules include the main license files from java.base.
@@ -915,14 +900,9 @@
$(foreach t, $(filter-out test-make%, $(ALL_TEST_TARGETS)), $(eval $t: jdk-image test-image))
$(foreach t, $(ALL_EXPLODED_TEST_TARGETS), $(eval $t: exploded-image test-image))
- create-buildjdk-copy: jdk.jlink-java java.base-gendata \
- $(addsuffix -java, $(INTERIM_IMAGE_MODULES))
-
- create-buildjdk-interim-image: create-buildjdk-copy
-
interim-image: $(INTERIM_JMOD_TARGETS)
- build-test-lib: exploded-image-optimize
+ build-test-lib: exploded-image
build-test-failure-handler: interim-langtools
@@ -933,7 +913,7 @@
build-test-jdk-jtreg-native: buildtools-jdk java.base-libs
- build-test-hotspot-jtreg-graal: exploded-image-optimize
+ build-test-hotspot-jtreg-graal: exploded-image
test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
@@ -1025,7 +1005,7 @@
exploded-image: exploded-image-optimize
endif
-create-buildjdk: create-buildjdk-copy create-buildjdk-interim-image
+create-buildjdk: create-buildjdk-interim-image
docs-jdk-api: docs-jdk-api-javadoc
docs-javase-api: docs-javase-api-javadoc
--- a/make/ToolsJdk.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/ToolsJdk.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -73,6 +73,9 @@
TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
build.tools.makejavasecurity.MakeJavaSecurity
+TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+ build.tools.generatecacerts.GenerateCacerts
+
TOOL_GENERATEEMOJIDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
build.tools.generateemojidata.GenerateEmojiData
--- a/make/autoconf/buildjdk-spec.gmk.in Thu Jun 06 15:46:36 2019 +0300
+++ b/make/autoconf/buildjdk-spec.gmk.in Fri Jun 07 09:38:40 2019 -0700
@@ -32,6 +32,9 @@
CC := @BUILD_CC@
CXX := @BUILD_CXX@
+# Ideally this should be probed by configure but that is tricky to implement,
+# and this should work in most cases.
+CPP := @BUILD_CC@ -E
LD := @BUILD_LD@
LDCXX := @BUILD_LDCXX@
AS := @BUILD_AS@
@@ -44,6 +47,7 @@
# These directories should not be moved to BUILDJDK_OUTPUTDIR
HOTSPOT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
+BUILDTOOLS_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(BUILDTOOLS_OUTPUTDIR))
SUPPORT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
JDK_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
IMAGES_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
@@ -77,6 +81,8 @@
FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
+INTERIM_LANGTOOLS_ARGS := $(subst $(OUTPUTDIR),$(BUILDJDK_OUTPUTDIR),$(INTERIM_LANGTOOLS_ARGS))
+
# The compiler for the build platform is likely not warning compatible with the official
# compiler.
WARNINGS_AS_ERRORS := false
--- a/make/common/MakeBase.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/common/MakeBase.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -160,25 +160,26 @@
SHELL = $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(SHELL_NO_RECURSE) -x
endif
+ # The LOG_PREFIX is set for sub recursive calls like buildjdk and bootcycle.
# The warn level can never be turned off
- LogWarn = $$(info $$(strip $$1))
+ LogWarn = $$(info $(LOG_PREFIX)$$(strip $$1))
LOG_WARN :=
ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),)
- LogInfo = $$(info $$(strip $$1))
+ LogInfo = $$(info $(LOG_PREFIX)$$(strip $$1))
LOG_INFO :=
else
LogInfo =
LOG_INFO := > /dev/null
endif
ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
- LogDebug = $$(info $$(strip $$1))
+ LogDebug = $$(info $(LOG_PREFIX)$$(strip $$1))
LOG_DEBUG :=
else
LogDebug =
LOG_DEBUG := > /dev/null
endif
ifneq ($$(findstring $$(LOG_LEVEL), trace),)
- LogTrace = $$(info $$(strip $$1))
+ LogTrace = $$(info $(LOG_PREFIX)$$(strip $$1))
LOG_TRACE :=
else
LogTrace =
--- a/make/common/NativeCompilation.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/common/NativeCompilation.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -800,13 +800,13 @@
# This is a rough heuristic and may not always print accurate information.
$$($1_BUILD_INFO): $$($1_SRCS) $$($1_COMPILE_VARDEPS_FILE)
ifeq ($$(wildcard $$($1_TARGET)), )
- $(ECHO) 'Creating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) from $$(words \
- $$(filter-out %.vardeps, $$?)) file(s)'
+ $$(call LogWarn, Creating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) from $$(words \
+ $$(filter-out %.vardeps, $$?)) file(s))
else
- $(ECHO) $$(strip 'Updating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET))' \
+ $$(call LogWarn, $$(strip Updating $$(subst $$(OUTPUTDIR)/,,$$($1_TARGET)) \
$$(if $$(filter-out %.vardeps, $$?), \
- 'due to $$(words $$(filter-out %.vardeps, $$?)) file(s)', \
- $$(if $$(filter %.vardeps, $$?), 'due to makefile changes')))
+ due to $$(words $$(filter-out %.vardeps, $$?)) file(s), \
+ $$(if $$(filter %.vardeps, $$?), due to makefile changes))))
endif
$(TOUCH) $$@
--- a/make/copy/Copy-java.base.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/copy/Copy-java.base.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
@@ -162,17 +162,17 @@
################################################################################
-ifeq ($(CACERTS_FILE), )
- CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
-endif
-
+# CACERTS_FILE is optionally set in configure to override the default cacerts
+# which is otherwise generated in Gendata-java.base.gmk
CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
$(CACERTS_DST): $(CACERTS_FILE)
$(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%, %, $@))
$(call install-file)
-TARGETS += $(CACERTS_DST)
+ifneq ($(CACERTS_FILE), )
+ TARGETS += $(CACERTS_DST)
+endif
################################################################################
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/README Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,10 @@
+Each file in this directory (except for this README) contains a CA certificate in PEM format. It can be generated with
+
+keytool -J-Duser.timezone=GMT -printcert -file ca.cert | sed -n '1,4p;8,10p'
+keytool -printcert -file ca.cert -rfc
+
+Please note the textual part before the "-----BEGIN CERTIFICATE-----" line is just a suggestion and not arbitrary.
+
+After any change in this directory, please remember to update the content of `test/jdk/sun/security/lib/cacerts/VerifyCACerts.java` as well.
+
+All changes to this directory need to be approved by the Security group.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/actalisauthenticationrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: CN=Actalis Authentication Root CA, O=Actalis S.p.A./03358520967, L=Milan, C=IT
+Issuer: CN=Actalis Authentication Root CA, O=Actalis S.p.A./03358520967, L=Milan, C=IT
+Serial number: 570a119742c4e3cc
+Valid from: Thu Sep 22 11:22:02 GMT 2011 until: Sun Sep 22 11:22:02 GMT 2030
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/addtrustclass1ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:38:31 GMT 2000 until: Sat May 30 10:38:31 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/addtrustexternalca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust External CA Root, OU=AddTrust External TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:48:38 GMT 2000 until: Sat May 30 10:48:38 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/addtrustqualifiedca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust Qualified CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:44:50 GMT 2000 until: Sat May 30 10:44:50 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/affirmtrustcommercialca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: CN=AffirmTrust Commercial, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Commercial, O=AffirmTrust, C=US
+Serial number: 7777062726a9b17c
+Valid from: Fri Jan 29 14:06:06 GMT 2010 until: Tue Dec 31 14:06:06 GMT 2030
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/affirmtrustnetworkingca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: CN=AffirmTrust Networking, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Networking, O=AffirmTrust, C=US
+Serial number: 7c4f04391cd4992d
+Valid from: Fri Jan 29 14:08:24 GMT 2010 until: Tue Dec 31 14:08:24 GMT 2030
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/affirmtrustpremiumca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=AffirmTrust Premium, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Premium, O=AffirmTrust, C=US
+Serial number: 6d8c1446b1a60aee
+Valid from: Fri Jan 29 14:10:36 GMT 2010 until: Mon Dec 31 14:10:36 GMT 2040
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/affirmtrustpremiumeccca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,20 @@
+Owner: CN=AffirmTrust Premium ECC, O=AffirmTrust, C=US
+Issuer: CN=AffirmTrust Premium ECC, O=AffirmTrust, C=US
+Serial number: 7497258ac73f7a54
+Valid from: Fri Jan 29 14:20:24 GMT 2010 until: Mon Dec 31 14:20:24 GMT 2040
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/baltimorecybertrustca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
+Issuer: CN=Baltimore CyberTrust Root, OU=CyberTrust, O=Baltimore, C=IE
+Serial number: 20000b9
+Valid from: Fri May 12 18:46:00 GMT 2000 until: Mon May 12 23:59:00 GMT 2025
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/buypassclass2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=Buypass Class 2 Root CA, O=Buypass AS-983163327, C=NO
+Issuer: CN=Buypass Class 2 Root CA, O=Buypass AS-983163327, C=NO
+Serial number: 2
+Valid from: Tue Oct 26 08:38:03 GMT 2010 until: Fri Oct 26 08:38:03 GMT 2040
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/buypassclass3ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=Buypass Class 3 Root CA, O=Buypass AS-983163327, C=NO
+Issuer: CN=Buypass Class 3 Root CA, O=Buypass AS-983163327, C=NO
+Serial number: 2
+Valid from: Tue Oct 26 08:28:58 GMT 2010 until: Fri Oct 26 08:28:58 GMT 2040
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/camerfirmachambersca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,49 @@
+Owner: CN=Chambers of Commerce Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Issuer: CN=Chambers of Commerce Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Serial number: a3da427ea4b1aeda
+Valid from: Fri Aug 01 12:29:50 GMT 2008 until: Sat Jul 31 12:29:50 GMT 2038
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/camerfirmachamberscommerceca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,35 @@
+Owner: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
+Issuer: CN=Chambers of Commerce Root, OU=http://www.chambersign.org, O=AC Camerfirma SA CIF A82743287, C=EU
+Serial number: 0
+Valid from: Tue Sep 30 16:13:43 GMT 2003 until: Wed Sep 30 16:13:44 GMT 2037
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/camerfirmachambersignca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,48 @@
+Owner: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Issuer: CN=Global Chambersign Root - 2008, O=AC Camerfirma S.A., SERIALNUMBER=A82743287, L=Madrid (see current address at www.camerfirma.com/address), C=EU
+Serial number: c9cdd3e9d57d23ce
+Valid from: Fri Aug 01 12:31:40 GMT 2008 until: Sat Jul 31 12:31:40 GMT 2038
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/certumca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,26 @@
+Owner: CN=Certum CA, O=Unizeto Sp. z o.o., C=PL
+Issuer: CN=Certum CA, O=Unizeto Sp. z o.o., C=PL
+Serial number: 10020
+Valid from: Tue Jun 11 10:46:39 GMT 2002 until: Fri Jun 11 10:46:39 GMT 2027
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/certumtrustednetworkca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL
+Issuer: CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL
+Serial number: 444c0
+Valid from: Wed Oct 22 12:07:37 GMT 2008 until: Mon Dec 31 12:07:37 GMT 2029
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/chunghwaepkirootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: OU=ePKI Root Certification Authority, O="Chunghwa Telecom Co., Ltd.", C=TW
+Issuer: OU=ePKI Root Certification Authority, O="Chunghwa Telecom Co., Ltd.", C=TW
+Serial number: 15c8bd65475cafb897005ee406d2bc9d
+Valid from: Mon Dec 20 02:31:27 GMT 2004 until: Wed Dec 20 02:31:27 GMT 2034
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/comodoaaaca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 1
+Valid from: Thu Jan 01 00:00:00 GMT 2004 until: Sun Dec 31 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/comodoeccca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,23 @@
+Owner: CN=COMODO ECC Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=COMODO ECC Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 1f47afaa62007050544c019e9b63992a
+Valid from: Thu Mar 06 00:00:00 GMT 2008 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/comodorsaca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,41 @@
+Owner: CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Issuer: CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, ST=Greater Manchester, C=GB
+Serial number: 4caaf9cadb636fe01ff74ed85b03869d
+Valid from: Tue Jan 19 00:00:00 GMT 2010 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
+hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
+BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
+EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
+6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
+pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
+9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
+/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
+Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
++pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
+qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
+SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
+u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
+Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
+crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
+/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
+wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
+4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
+2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
+FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
+CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
+boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
+jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
+S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
+QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
+0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
+NVOFBkpdn627G190
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertassuredidg2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=DigiCert Assured ID Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Assured ID Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: b931c3ad63967ea6723bfc3af9af44b
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
+n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
+biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
+EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
+bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
+YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
+BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
+QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
+0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
+lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
+B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
+ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertassuredidg3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,22 @@
+Owner: CN=DigiCert Assured ID Root G3, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Assured ID Root G3, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: ba15afa1ddfa0b54944afcd24a06cec
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg
+RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf
+Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q
+RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD
+AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY
+JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv
+6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertassuredidrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=DigiCert Assured ID Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Assured ID Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: ce7e0e517d846fe8fe560fc1bf03039
+Valid from: Fri Nov 10 00:00:00 GMT 2006 until: Mon Nov 10 00:00:00 GMT 2031
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertglobalrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=DigiCert Global Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Global Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: 83be056904246b1a1756ac95991c74a
+Valid from: Fri Nov 10 00:00:00 GMT 2006 until: Mon Nov 10 00:00:00 GMT 2031
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertglobalrootg2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=DigiCert Global Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Global Root G2, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: 33af1e6a711a9a0bb2864b11d09fae5
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
+MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
+2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
+1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
+q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
+tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
+vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
+5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
+1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
+NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
+Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
+8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
+pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicertglobalrootg3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,22 @@
+Owner: CN=DigiCert Global Root G3, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Global Root G3, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: 55556bcf25ea43535c3a40fd5ab4572
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw
+CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
+ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe
+Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw
+EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x
+IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF
+K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG
+fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO
+Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd
+BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx
+AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/
+oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8
+sycX
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicerthighassuranceevrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: 2ac5c266a0b409b8f0b79f2ae462577
+Valid from: Fri Nov 10 00:00:00 GMT 2006 until: Mon Nov 10 00:00:00 GMT 2031
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/digicerttrustedrootg4 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,39 @@
+Owner: CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US
+Issuer: CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US
+Serial number: 59b1b579e8e2132e23907bda777755c
+Valid from: Thu Aug 01 12:00:00 GMT 2013 until: Fri Jan 15 12:00:00 GMT 2038
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
+RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
+Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
+ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
+xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
+ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
+DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
+jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
+CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
+EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
+fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
+uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
+chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
+9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
+SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
++SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
+fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
+sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
+cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
+0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
+4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
+r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
+/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
+gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/dtrustclass3ca2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=D-TRUST Root Class 3 CA 2 2009, O=D-Trust GmbH, C=DE
+Issuer: CN=D-TRUST Root Class 3 CA 2 2009, O=D-Trust GmbH, C=DE
+Serial number: 983f3
+Valid from: Thu Nov 05 08:35:58 GMT 2009 until: Mon Nov 05 08:35:58 GMT 2029
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/dtrustclass3ca2ev Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=D-TRUST Root Class 3 CA 2 EV 2009, O=D-Trust GmbH, C=DE
+Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009, O=D-Trust GmbH, C=DE
+Serial number: 983f4
+Valid from: Thu Nov 05 08:50:46 GMT 2009 until: Mon Nov 05 08:50:46 GMT 2029
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/entrust2048ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net
+Issuer: CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net
+Serial number: 3863def8
+Valid from: Fri Dec 24 17:50:51 GMT 1999 until: Tue Jul 24 14:15:12 GMT 2029
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/entrustevca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,34 @@
+Owner: CN=Entrust Root Certification Authority, OU="(c) 2006 Entrust, Inc.", OU=www.entrust.net/CPS is incorporated by reference, O="Entrust, Inc.", C=US
+Issuer: CN=Entrust Root Certification Authority, OU="(c) 2006 Entrust, Inc.", OU=www.entrust.net/CPS is incorporated by reference, O="Entrust, Inc.", C=US
+Serial number: 456b5054
+Valid from: Mon Nov 27 20:23:42 GMT 2006 until: Fri Nov 27 20:53:42 GMT 2026
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/entrustrootcaec1 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,25 @@
+Owner: CN=Entrust Root Certification Authority - EC1, OU="(c) 2012 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Issuer: CN=Entrust Root Certification Authority - EC1, OU="(c) 2012 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Serial number: a68b79290000000050d091f9
+Valid from: Tue Dec 18 15:25:36 GMT 2012 until: Fri Dec 18 15:55:36 GMT 2037
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
+A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
+d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
+dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
+RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
+MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
+VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
+L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
+Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
+A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
+ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
+Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
+R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
+hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/entrustrootcag2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=Entrust Root Certification Authority - G2, OU="(c) 2009 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Issuer: CN=Entrust Root Certification Authority - G2, OU="(c) 2009 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Serial number: 4a538c28
+Valid from: Tue Jul 07 17:25:54 GMT 2009 until: Sat Dec 07 17:55:54 GMT 2030
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
+cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
+IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
+dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
+NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
+dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
+dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
+aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
+RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
+cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
+wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
+U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
+jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
+BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
+jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
+1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
+nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
+VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/geotrustglobalca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
+Issuer: CN=GeoTrust Global CA, O=GeoTrust Inc., C=US
+Serial number: 23456
+Valid from: Tue May 21 04:00:00 GMT 2002 until: Sat May 21 04:00:00 GMT 2022
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/geotrustprimaryca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US
+Issuer: CN=GeoTrust Primary Certification Authority, O=GeoTrust Inc., C=US
+Serial number: 18acb56afd69b6153a636cafdafac4a1
+Valid from: Mon Nov 27 00:00:00 GMT 2006 until: Wed Jul 16 23:59:59 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/geotrustprimarycag2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,24 @@
+Owner: CN=GeoTrust Primary Certification Authority - G2, OU=(c) 2007 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US
+Issuer: CN=GeoTrust Primary Certification Authority - G2, OU=(c) 2007 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US
+Serial number: 3cb2f4480a00e2feeb243b5e603ec36b
+Valid from: Mon Nov 05 00:00:00 GMT 2007 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/geotrustprimarycag3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US
+Issuer: CN=GeoTrust Primary Certification Authority - G3, OU=(c) 2008 GeoTrust Inc. - For authorized use only, O=GeoTrust Inc., C=US
+Serial number: 15ac6e9419b2794b41f627a9c3180f1f
+Valid from: Wed Apr 02 00:00:00 GMT 2008 until: Tue Dec 01 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/geotrustuniversalca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=GeoTrust Universal CA, O=GeoTrust Inc., C=US
+Issuer: CN=GeoTrust Universal CA, O=GeoTrust Inc., C=US
+Serial number: 1
+Valid from: Thu Mar 04 05:00:00 GMT 2004 until: Sun Mar 04 05:00:00 GMT 2029
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsignca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE
+Issuer: CN=GlobalSign Root CA, OU=Root CA, O=GlobalSign nv-sa, C=BE
+Serial number: 40000000001154b5ac394
+Valid from: Tue Sep 01 12:00:00 GMT 1998 until: Fri Jan 28 12:00:00 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsigneccrootcar4 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,20 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign ECC Root CA - R4
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign ECC Root CA - R4
+Serial number: 2a38a41c960a04de42b228a50be8349802
+Valid from: Tue Nov 13 00:00:00 GMT 2012 until: Tue Jan 19 03:14:07 GMT 2038
+Signature algorithm name: SHA256withECDSA
+Subject Public Key Algorithm: 256-bit EC (secp256r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprlOQcJ
+FspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61F
+uOJAf/sKbvu+M8k8o4TVMAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGX
+kPoUVy0D7O48027KqGx2vKLeuwIgJ6iFJzWbVsaj8kfSt24bAgAXqmemFZHe+pTs
+ewv4n4Q=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsigneccrootcar5 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,21 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign ECC Root CA - R5
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign ECC Root CA - R5
+Serial number: 605949e0262ebb55f90a778a71f94ad86c
+Valid from: Tue Nov 13 00:00:00 GMT 2012 until: Tue Jan 19 03:14:07 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk
+MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH
+bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
+DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
+QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc
+8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke
+hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI
+KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
+515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO
+xwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsignr2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R2
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R2
+Serial number: 400000000010f8626e60d
+Valid from: Fri Dec 15 08:00:00 GMT 2006 until: Wed Dec 15 08:00:00 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsignr3ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3
+Serial number: 4000000000121585308a2
+Valid from: Wed Mar 18 10:00:00 GMT 2009 until: Sun Mar 18 10:00:00 GMT 2029
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/globalsignrootcar6 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,39 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R6
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R6
+Serial number: 45e6bb038333c3856548e6ff4551
+Valid from: Wed Dec 10 00:00:00 GMT 2014 until: Sun Dec 10 00:00:00 GMT 2034
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg
+MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx
+MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET
+MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI
+xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k
+ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD
+aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw
+LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw
+1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX
+k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2
+SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h
+bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n
+WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY
+rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce
+MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu
+bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt
+Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61
+55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj
+vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf
+cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz
+oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp
+nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs
+pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v
+JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
+8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4
+5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/godaddyclass2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: OU=Go Daddy Class 2 Certification Authority, O="The Go Daddy Group, Inc.", C=US
+Issuer: OU=Go Daddy Class 2 Certification Authority, O="The Go Daddy Group, Inc.", C=US
+Serial number: 0
+Valid from: Tue Jun 29 17:06:20 GMT 2004 until: Thu Jun 29 17:06:20 GMT 2034
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/godaddyrootg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.", L=Scottsdale, ST=Arizona, C=US
+Issuer: CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.", L=Scottsdale, ST=Arizona, C=US
+Serial number: 0
+Valid from: Tue Sep 01 00:00:00 GMT 2009 until: Thu Dec 31 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/identrustcommercial Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US
+Issuer: CN=IdenTrust Commercial Root CA 1, O=IdenTrust, C=US
+Serial number: a0142800000014523c844b500000002
+Valid from: Thu Jan 16 18:12:23 GMT 2014 until: Mon Jan 16 18:12:23 GMT 2034
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
+VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
+MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
+JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
+3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
++ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
+S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
+bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
+T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
+vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
+Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
+dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
+c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
+l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
+iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
+ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
+LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
+nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
++wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
+W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
+AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
+l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
+4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
+mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
+7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/identrustdstx3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: CN=DST Root CA X3, O=Digital Signature Trust Co.
+Issuer: CN=DST Root CA X3, O=Digital Signature Trust Co.
+Serial number: 44afb080d6a327ba893039862ef8406b
+Valid from: Sat Sep 30 21:12:19 GMT 2000 until: Thu Sep 30 14:01:15 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/identrustpublicca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=IdenTrust Public Sector Root CA 1, O=IdenTrust, C=US
+Issuer: CN=IdenTrust Public Sector Root CA 1, O=IdenTrust, C=US
+Serial number: a0142800000014523cf467c00000002
+Valid from: Thu Jan 16 17:53:32 GMT 2014 until: Mon Jan 16 17:53:32 GMT 2034
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu
+VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN
+MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0
+MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7
+ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy
+RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS
+bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF
+/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R
+3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw
+EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy
+9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V
+GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ
+2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV
+WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD
+W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN
+AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV
+DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9
+TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G
+lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW
+mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df
+WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5
++bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ
+tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA
+GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
+8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/keynectisrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=KEYNECTIS ROOT CA, OU=ROOT, O=KEYNECTIS, C=FR
+Issuer: CN=KEYNECTIS ROOT CA, OU=ROOT, O=KEYNECTIS, C=FR
+Serial number: 1121bc276c5547af584eefd4ced629b2a285
+Valid from: Tue May 26 00:00:00 GMT 2009 until: Tue May 26 00:00:00 GMT 2020
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgISESG8J2xVR69YTu/UztYpsqKFMA0GCSqGSIb3DQEBCwUA
+MEwxCzAJBgNVBAYTAkZSMRIwEAYDVQQKEwlLRVlORUNUSVMxDTALBgNVBAsTBFJP
+T1QxGjAYBgNVBAMTEUtFWU5FQ1RJUyBST09UIENBMB4XDTA5MDUyNjAwMDAwMFoX
+DTIwMDUyNjAwMDAwMFowTDELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUtFWU5FQ1RJ
+UzENMAsGA1UECxMEUk9PVDEaMBgGA1UEAxMRS0VZTkVDVElTIFJPT1QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG/bMXhaGtJhuVaTUhPaSI+t7b
+YDZAF2nCFGP7uNnCdBU3LpzQIM1pjYQyooVMFLSb8iWzVCqDPy2+D/M7ZNH/oFDv
+d087TuE/C2SFmrpYftLDYtNkJaLUspc8d11jKjOS/M2CDZtUlYf1teuMzVvRyjAv
+yYhGtc0NEbQYj+7RoT5dFegoz9/DkJtszNEMRXezOuuKkB3pr2RqiXupPUN0+uRn
+IqH73E3E9WLJyiW0yYBgM6nde6ACv5YlCl7JXyl7tBeBi22BGdDZg1wFj0FpGmlD
+gJ+or+DpjJGLJyuiJmDND/KkowKDjhiBwheKQxX5bfMdEKRanERhIyF62PvRAgMB
+AAGjgcAwgb0wEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwVwYD
+VR0fBFAwTjBMoEqgSIZGaHR0cDovL3RydXN0Y2VudGVyLWNybC5jZXJ0aWZpY2F0
+Mi5jb20vS2V5bmVjdGlzL0tFWU5FQ1RJU19ST09UX0NBLmNybDAdBgNVHQ4EFgQU
+77cjl9CokX+mz6YhwDSfzHdB4dAwHwYDVR0jBBgwFoAU77cjl9CokX+mz6YhwDSf
+zHdB4dAwDQYJKoZIhvcNAQELBQADggEBABoxaZlCwuVAhaKfksNj1I8hOagZIf56
+/MNNQPMr6EusW0xZk8bcfguvfF+VhWu9x2+6wb74xjpnS5PGBWk+JC3wG5HGPj/s
+QhiTbAMkim75IGcrfG2rNMkqIjMN132P7tI2ZELINZpuGWHLjWfwaKfQJAXmwxe6
+Ra58Q7WAeANNIHMF/EMQnTVpQnWUJYIrpjuQGN7Bqa/zLZW/lafPGJfhWeKirxoW
+YQ33E3FTkzf9PK8AHWyLFK9Gloy2UnzMLU7N4elLCu6a/nqY5ym6G9ocutxrzQQO
+JkCp63M8/lCoESdVvduOS+9PGO0V/72GmGbumiVxNGxQ8bJRy2adTSk=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/letsencryptisrgx1 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=ISRG Root X1, O=Internet Security Research Group, C=US
+Issuer: CN=ISRG Root X1, O=Internet Security Research Group, C=US
+Serial number: 8210cfb0d240e3594463e0bb63828b00
+Valid from: Thu Jun 04 11:04:38 GMT 2015 until: Mon Jun 04 11:04:38 GMT 2035
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/luxtrustglobalrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=LuxTrust Global Root, O=LuxTrust s.a., C=LU
+Issuer: CN=LuxTrust Global Root, O=LuxTrust s.a., C=LU
+Serial number: bb8
+Valid from: Thu Mar 17 09:51:37 GMT 2011 until: Wed Mar 17 09:51:37 GMT 2021
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDZDCCAkygAwIBAgICC7gwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCTFUx
+FjAUBgNVBAoTDUx1eFRydXN0IHMuYS4xHTAbBgNVBAMTFEx1eFRydXN0IEdsb2Jh
+bCBSb290MB4XDTExMDMxNzA5NTEzN1oXDTIxMDMxNzA5NTEzN1owRDELMAkGA1UE
+BhMCTFUxFjAUBgNVBAoTDUx1eFRydXN0IHMuYS4xHTAbBgNVBAMTFEx1eFRydXN0
+IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsn+n
+QPAiygz267Hxyw6VV0B1r6A/Ps7sqjJX5hmxZ0OYWmt8s7j6eJyqpoSyYBuAQc5j
+zR8XCJmk9e8+EsdMsFeaXHhAePxFjdqRZ9w6Ubltc+a3OY52OrQfBfVpVfmTz3iI
+Sr6qm9d7R1tGBEyCFqY19vx039a0r9jitScRdFmiwmYsaArhmIiIPIoFdRTjuK7z
+CISbasE/MRivJ6VLm6T9eTHemD0OYcqHmMH4ijCc+j4z1aXEAwfh95Z0GAAnOCfR
+K6qq4UFFi2/xJcLcopeVx0IUM115hCNq52XAV6DYXaljAeew5Ivo+MVjuOVsdJA9
+x3f8K7p56aTGEnin/wIDAQABo2AwXjAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAfBgNVHSMEGDAWgBQXFYWJCS8kh28/HRvk8pZ5g0gTzjAdBgNVHQ4EFgQU
+FxWFiQkvJIdvPx0b5PKWeYNIE84wDQYJKoZIhvcNAQELBQADggEBAFrwHNDUUM9B
+fua4nX3DcNBeNv9ujnov3kgR1TQuPLdFwlQlp+HBHjeDtpSutkVIA+qVvuucarQ3
+XB8u02uCgUNbCj8RVWOs+nwIAjegPDkEM/6XMshS5dklTbDG7mgfcKpzzlcD3H0K
+DTPy0lrfCmw7zBFRlxqkIaKFNQLXgCLShLL4wKpov9XrqsMLq6F8K/f1O4fhVFfs
+BSTveUJO84ton+Ruy4KZycwq3FPCH3CDqyEPVrRI/98HIrOM+R2mBN8tAza53W/+
+MYhm/2xtRDSvCHc+JtJy9LtHVpM8mGPhM7uZI5K1g3noHZ9nrWLWidb2/CfeMifL
+hNp3hSGhEiE=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,41 @@
+Owner: CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM
+Serial number: 3ab6508b
+Valid from: Mon Mar 19 18:33:33 GMT 2001 until: Wed Mar 17 18:33:33 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca1g3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM
+Serial number: 78585f2ead2c194be3370735341328b596d46593
+Valid from: Thu Jan 12 17:27:44 GMT 2012 until: Sun Jan 12 17:27:44 GMT 2042
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00
+MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV
+wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe
+rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341
+68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh
+4Pw5qlPafX7PGglTvF0FBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp
+UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o
+abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc
+3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G
+KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt
+hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO
+Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt
+zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD
+ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2
+cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN
+qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5
+YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv
+b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2
+8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k
+NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj
+ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp
+q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt
+nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: CN=QuoVadis Root CA 2, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root CA 2, O=QuoVadis Limited, C=BM
+Serial number: 509
+Valid from: Fri Nov 24 18:27:00 GMT 2006 until: Mon Nov 24 18:23:33 GMT 2031
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca2g3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=QuoVadis Root CA 2 G3, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root CA 2 G3, O=QuoVadis Limited, C=BM
+Serial number: 445734245b81899b35f2ceb82b3b5ba726f07528
+Valid from: Thu Jan 12 18:59:32 GMT 2012 until: Sun Jan 12 18:59:32 GMT 2042
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
+MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
+qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
+n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
+c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
+o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
+IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
+IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
+8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
+vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
+7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
+cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
+ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
+roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
+W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
+lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
++V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
+csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
+dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
+KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
+HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
+WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,45 @@
+Owner: CN=QuoVadis Root CA 3, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root CA 3, O=QuoVadis Limited, C=BM
+Serial number: 5c6
+Valid from: Fri Nov 24 19:11:23 GMT 2006 until: Mon Nov 24 19:06:44 GMT 2031
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/quovadisrootca3g3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,38 @@
+Owner: CN=QuoVadis Root CA 3 G3, O=QuoVadis Limited, C=BM
+Issuer: CN=QuoVadis Root CA 3 G3, O=QuoVadis Limited, C=BM
+Serial number: 2ef59b0228a7db7affd5a3a9eebd03a0cf126a1d
+Valid from: Thu Jan 12 20:26:32 GMT 2012 until: Sun Jan 12 20:26:32 GMT 2042
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
+BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00
+MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR
+/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu
+FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR
+U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c
+ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR
+FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k
+A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw
+eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl
+sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp
+VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q
+A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+
+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD
+ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI
+FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv
+oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg
+u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP
+0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf
+3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl
+8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+
+DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
+PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
+ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/secomscrootca1 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+Issuer: OU=Security Communication RootCA1, O=SECOM Trust.net, C=JP
+Serial number: 0
+Valid from: Tue Sep 30 04:20:49 GMT 2003 until: Sat Sep 30 04:20:49 GMT 2023
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/secomscrootca2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: OU=Security Communication RootCA2, O="SECOM Trust Systems CO.,LTD.", C=JP
+Issuer: OU=Security Communication RootCA2, O="SECOM Trust Systems CO.,LTD.", C=JP
+Serial number: 0
+Valid from: Fri May 29 05:00:39 GMT 2009 until: Tue May 29 05:00:39 GMT 2029
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/securetrustca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,29 @@
+Owner: CN=SecureTrust CA, O=SecureTrust Corporation, C=US
+Issuer: CN=SecureTrust CA, O=SecureTrust Corporation, C=US
+Serial number: cf08e5c0816a5ad427ff0eb271859d0
+Valid from: Tue Nov 07 19:31:18 GMT 2006 until: Mon Dec 31 19:40:55 GMT 2029
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/soneraclass2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,26 @@
+Owner: CN=Sonera Class2 CA, O=Sonera, C=FI
+Issuer: CN=Sonera Class2 CA, O=Sonera, C=FI
+Serial number: 1d
+Valid from: Fri Apr 06 07:29:40 GMT 2001 until: Tue Apr 06 07:29:40 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/starfieldclass2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: OU=Starfield Class 2 Certification Authority, O="Starfield Technologies, Inc.", C=US
+Issuer: OU=Starfield Class 2 Certification Authority, O="Starfield Technologies, Inc.", C=US
+Serial number: 0
+Valid from: Tue Jun 29 17:39:16 GMT 2004 until: Thu Jun 29 17:39:16 GMT 2034
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/starfieldrootg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=Starfield Root Certificate Authority - G2, O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
+Issuer: CN=Starfield Root Certificate Authority - G2, O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
+Serial number: 0
+Valid from: Tue Sep 01 00:00:00 GMT 2009 until: Thu Dec 31 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/starfieldservicesrootg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: CN=Starfield Services Root Certificate Authority - G2, O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
+Issuer: CN=Starfield Services Root Certificate Authority - G2, O="Starfield Technologies, Inc.", L=Scottsdale, ST=Arizona, C=US
+Serial number: 0
+Valid from: Tue Sep 01 00:00:00 GMT 2009 until: Thu Dec 31 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/swisssigngoldg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: CN=SwissSign Gold CA - G2, O=SwissSign AG, C=CH
+Issuer: CN=SwissSign Gold CA - G2, O=SwissSign AG, C=CH
+Serial number: bb401c43f55e4fb0
+Valid from: Wed Oct 25 08:30:35 GMT 2006 until: Sat Oct 25 08:30:35 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/swisssignplatinumg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: CN=SwissSign Platinum CA - G2, O=SwissSign AG, C=CH
+Issuer: CN=SwissSign Platinum CA - G2, O=SwissSign AG, C=CH
+Serial number: 4eb200670c035d4f
+Valid from: Wed Oct 25 08:36:00 GMT 2006 until: Sat Oct 25 08:36:00 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
+IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
+WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
+ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
+IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
+IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
+6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
+jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
+izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
++zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
+zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
+pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
+KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
+ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
+AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
+ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
+IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
+A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
+uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
+jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
+u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
+YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
+puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
+icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
+DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
+kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
+Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/swisssignsilverg2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,40 @@
+Owner: CN=SwissSign Silver CA - G2, O=SwissSign AG, C=CH
+Issuer: CN=SwissSign Silver CA - G2, O=SwissSign AG, C=CH
+Serial number: 4f1bd42f54bb2f4b
+Valid from: Wed Oct 25 08:32:46 GMT 2006 until: Sat Oct 25 08:32:46 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/teliasonerarootcav1 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,37 @@
+Owner: CN=TeliaSonera Root CA v1, O=TeliaSonera
+Issuer: CN=TeliaSonera Root CA v1, O=TeliaSonera
+Serial number: 95be16a0f72e46f17b398272fa8bcd96
+Valid from: Thu Oct 18 12:00:50 GMT 2007 until: Mon Oct 18 12:00:50 GMT 2032
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
+NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
+b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
+VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
+VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
+7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
+Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
+/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
+81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
+dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
+Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
+sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
+pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
+slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
+arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
+VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
+9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
+dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
+TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
+Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
+Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
+OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
+vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
+t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
+HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
+SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/thawtepremiumserverca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+Owner: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Issuer: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Serial number: 36122296c5e338a520a1d25f4cd70954
+Valid from: Thu Aug 01 00:00:00 GMT 1996 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
+zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
+d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
+cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
+gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
+CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
+BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
+YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
+ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
+ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
+CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
+IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
+WuFg3GQjPEIuTQ==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/thawteprimaryrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US
+Issuer: CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US
+Serial number: 344ed55720d5edec49f42fce37db2b6d
+Valid from: Fri Nov 17 00:00:00 GMT 2006 until: Wed Jul 16 23:59:59 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/thawteprimaryrootcag2 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,23 @@
+Owner: CN=thawte Primary Root CA - G2, OU="(c) 2007 thawte, Inc. - For authorized use only", O="thawte, Inc.", C=US
+Issuer: CN=thawte Primary Root CA - G2, OU="(c) 2007 thawte, Inc. - For authorized use only", O="thawte, Inc.", C=US
+Serial number: 35fc265cd9844fc93d263d579baed756
+Valid from: Mon Nov 05 00:00:00 GMT 2007 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/thawteprimaryrootcag3 Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US
+Issuer: CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US
+Serial number: 600197b746a7eab4b49ad64b2ff790fb
+Valid from: Wed Apr 02 00:00:00 GMT 2008 until: Tue Dec 01 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/ttelesecglobalrootclass2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=T-TeleSec GlobalRoot Class 2, OU=T-Systems Trust Center, O=T-Systems Enterprise Services GmbH, C=DE
+Issuer: CN=T-TeleSec GlobalRoot Class 2, OU=T-Systems Trust Center, O=T-Systems Enterprise Services GmbH, C=DE
+Serial number: 1
+Valid from: Wed Oct 01 10:40:14 GMT 2008 until: Sat Oct 01 23:59:59 GMT 2033
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd
+AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC
+FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi
+1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq
+jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ
+wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/
+WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy
+NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC
+uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw
+IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6
+g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP
+BSeOE6Fuwg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/ttelesecglobalrootclass3ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,30 @@
+Owner: CN=T-TeleSec GlobalRoot Class 3, OU=T-Systems Trust Center, O=T-Systems Enterprise Services GmbH, C=DE
+Issuer: CN=T-TeleSec GlobalRoot Class 3, OU=T-Systems Trust Center, O=T-Systems Enterprise Services GmbH, C=DE
+Serial number: 1
+Valid from: Wed Oct 01 10:29:56 GMT 2008 until: Sat Oct 01 23:59:59 GMT 2033
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/usertrusteccca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,23 @@
+Owner: CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
+Issuer: CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
+Serial number: 5c8b99c55a94c5d27156decd8980cc26
+Valid from: Mon Feb 01 00:00:00 GMT 2010 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
+eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
+JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
+MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
+VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
+I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
+o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
+A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
+zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
+RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/usertrustrsaca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,41 @@
+Owner: CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
+Issuer: CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US
+Serial number: 1fd6d30fca3ca51a81bbc640e35032d
+Valid from: Mon Feb 01 00:00:00 GMT 2010 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
+iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
+cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
+BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
+MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
+3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
+tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
+Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
+VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
+79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
+c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
+Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
+c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
+UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
+Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
+A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
+Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
+VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
+ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
+8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
+iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
+Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
+XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
+qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
+VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
+L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
+jjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/utnuserfirstobjectca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,33 @@
+Owner: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US
+Issuer: CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, ST=UT, C=US
+Serial number: 44be0c8b500024b411d3362de0b35f1b
+Valid from: Fri Jul 09 18:31:20 GMT 1999 until: Tue Jul 09 18:40:36 GMT 2019
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB
+lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt
+T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc
+BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3
+dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP
+HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO
+KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo
+5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+
+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb
+kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC
+AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
+L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV
+HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN
+AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw
+NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB
+mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU
+4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5
+81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR
+Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass2g2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: b92f60cc889fa17a4609b85b706c8aaf
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass3ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,21 @@
+Owner: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Issuer: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Serial number: 3c9131cb1ff6d01b0e9ab8d044bf12be
+Valid from: Mon Jan 29 00:00:00 GMT 1996 until: Wed Aug 02 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass3g2ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: 7dd9fe07cfa81eb7107967fba78934c6
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass3g3ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,31 @@
+Owner: CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3, OU="(c) 1999 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Serial number: 9b7e0649a33e62b9d5ee90487129ef57
+Valid from: Fri Oct 01 00:00:00 GMT 1999 until: Wed Jul 16 23:59:59 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass3g4ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,28 @@
+Owner: CN=VeriSign Class 3 Public Primary Certification Authority - G4, OU="(c) 2007 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4, OU="(c) 2007 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Serial number: 2f80fe238c0e220f486712289187acb3
+Valid from: Mon Nov 05 00:00:00 GMT 2007 until: Mon Jan 18 23:59:59 GMT 2038
+Signature algorithm name: SHA384withECDSA
+Subject Public Key Algorithm: 384-bit EC (secp384r1) key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignclass3g5ca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,35 @@
+Owner: CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5, OU="(c) 2006 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Serial number: 18dad19e267de8bb4a2158cdcc6b3b4a
+Valid from: Wed Nov 08 00:00:00 GMT 2006 until: Wed Jul 16 23:59:59 GMT 2036
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisigntsaca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,24 @@
+Owner: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Issuer: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Serial number: 67c8e1e8e3be1cbdfc913b8ea6238749
+Valid from: Wed Jan 01 00:00:00 GMT 1997 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICsDCCAhmgAwIBAgIQZ8jh6OO+HL38kTuOpiOHSTANBgkqhkiG9w0BAQUFADCB
+izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxML
+RHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENl
+cnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcN
+OTcwMTAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTAT
+BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV
+BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNV
+BAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+MIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u
+6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522
+FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAS+mqF4EF+3kKMZ/F
+QfRWVKvpwuWXjhj+kckMPiZkyaFMJ2SnvQGTVXFuF0853BvcSTUQOSP/ypvIz2Y/
+3Ewa1IEGQlIf4SaxFhe65nByMUToTo1b5NP50OOPJWQx5yr4GIg2GlLFDUE1G2m3
+JvUXzMEZXkt8XOKDgJH6L/uatxY=
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/verisignuniversalrootca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,35 @@
+Owner: CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Issuer: CN=VeriSign Universal Root Certification Authority, OU="(c) 2008 VeriSign, Inc. - For authorized use only", OU=VeriSign Trust Network, O="VeriSign, Inc.", C=US
+Serial number: 401ac46421b31321030ebbe4121ac51d
+Valid from: Wed Apr 02 00:00:00 GMT 2008 until: Tue Dec 01 23:59:59 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/cacerts/xrampglobalca Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+Owner: CN=XRamp Global Certification Authority, O=XRamp Security Services Inc, OU=www.xrampsecurity.com, C=US
+Issuer: CN=XRamp Global Certification Authority, O=XRamp Security Services Inc, OU=www.xrampsecurity.com, C=US
+Serial number: 50946cec18ead59c4dd597ef758fa0ad
+Valid from: Mon Nov 01 17:14:04 GMT 2004 until: Mon Jan 01 05:37:19 GMT 2035
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
--- a/make/data/docs-resources/index.html Thu Jun 06 15:46:36 2019 +0300
+++ b/make/data/docs-resources/index.html Fri Jun 07 09:38:40 2019 -0700
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html>
<!--
Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/make/gendata/Gendata-java.base.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/gendata/Gendata-java.base.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@@ -63,6 +63,20 @@
################################################################################
+GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
+GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
+
+$(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)
+ $(call LogInfo, Generating cacerts)
+ $(call MakeTargetDir)
+ $(TOOL_GENERATECACERTS) $(GENDATA_CACERTS_SRC) $@
+
+ifeq ($(CACERTS_FILE), )
+ TARGETS += $(GENDATA_CACERTS)
+endif
+
+################################################################################
+
GENDATA_JAVA_SECURITY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.security
GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
@@ -74,9 +88,9 @@
# RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
-$(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
+$(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS_JDK) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
$(call LogInfo, Generating java.security)
- $(call MakeDir, $(@D))
+ $(call MakeTargetDir)
$(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \
$(OPENJDK_TARGET_CPU_ARCH) $(CRYPTO.POLICY) $(RESTRICTED_PKGS_SRC)
--- a/make/gendata/GendataBlacklistedCerts.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/gendata/GendataBlacklistedCerts.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -28,7 +28,7 @@
GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
-$(GENDATA_BLACKLISTED_CERTS): $(BUILD_TOOLS) $(GENDATA_BLACKLISTED_CERTS_SRC)
+$(GENDATA_BLACKLISTED_CERTS): $(BUILD_TOOLS_JDK) $(GENDATA_BLACKLISTED_CERTS_SRC)
$(call LogInfo, Generating blacklisted certs)
$(call MakeDir, $(@D))
($(CAT) $(GENDATA_BLACKLISTED_CERTS_SRC) | $(TOOL_BLACKLISTED_CERTS) > $@) || exit 1
--- a/make/gendata/GendataBreakIterator.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/gendata/GendataBreakIterator.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -84,7 +84,7 @@
$(BIFILES): $(BASE_DATA_PKG_DIR)/_the.bifiles
$(BASE_DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += $(BREAK_ITERATOR_BOOTCLASSPATH)
-$(BASE_DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) \
+$(BASE_DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS_JDK) $(UNICODEDATA) \
$(BUILD_BREAKITERATOR_BASE) $(BUILD_BREAKITERATOR_LD)
$(call LogInfo, Generating BreakIteratorData)
$(call MakeDir, $(@D))
@@ -96,7 +96,7 @@
$(BIFILES_TH): $(LD_DATA_PKG_DIR)/_the.bifiles_th
$(LD_DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += $(BREAK_ITERATOR_BOOTCLASSPATH)
-$(LD_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) \
+$(LD_DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS_JDK) $(UNICODEDATA) \
$(BUILD_BREAKITERATOR_BASE) $(BUILD_BREAKITERATOR_LD)
$(call LogInfo, Generating BreakIteratorData_th)
$(RM) $(BIFILES_TH)
--- a/make/gendata/GendataPublicSuffixList.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/gendata/GendataPublicSuffixList.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -28,7 +28,7 @@
GENDATA_PUBLICSUFFIXLIST_SRC += $(TOPDIR)/make/data/publicsuffixlist/public_suffix_list.dat
GENDATA_PUBLICSUFFIXLIST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/public_suffix_list.dat
-$(GENDATA_PUBLICSUFFIXLIST): $(GENDATA_PUBLICSUFFIXLIST_SRC) $(BUILD_TOOLS)
+$(GENDATA_PUBLICSUFFIXLIST): $(GENDATA_PUBLICSUFFIXLIST_SRC) $(BUILD_TOOLS_JDK)
$(call LogInfo, Generating public suffix list)
$(call MakeDir, $(@D))
$(RM) $@
--- a/make/gensrc/GensrcMisc.gmk Thu Jun 06 15:46:36 2019 +0300
+++ b/make/gensrc/GensrcMisc.gmk Fri Jun 07 09:38:40 2019 -0700
@@ -70,13 +70,15 @@
# preprocessor.
define generate-preproc-src
$(call MakeDir, $(@D))
- ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
- $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
- 2> >($(GREP) -v '^$(<F)$$' >&2) \
- | $(NAWK) '/@@START_HERE@@/,0' \
- | $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
- -e 's/PREFIX_//' -e 's/^#.*//' \
- ) > $@
+ $(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_$(@F), \
+ ( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
+ $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
+ 2> >($(GREP) -v '^$(<F)$$' >&2) \
+ | $(NAWK) '/@@START_HERE@@/,0' \
+ | $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \
+ -e 's/PREFIX_//' -e 's/^#.*//' \
+ ) > $@ \
+ )
endef
GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/jdk/src/classes/build/tools/generatecacerts/GenerateCacerts.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.generatecacerts;
+
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.security.cert.CertificateFactory;
+
+/**
+ * Generate cacerts
+ * args[0]: Full path string to the directory that contains CA certs
+ * args[1]: Full path string to the generated cacerts
+ */
+public class GenerateCacerts {
+ public static void main(String[] args) throws Exception {
+ KeyStore ks = KeyStore.getInstance("JKS");
+ ks.load(null, null);
+ CertificateFactory cf = CertificateFactory.getInstance("X509");
+ Files.list(Path.of(args[0]))
+ .filter(p -> !p.getFileName().toString().equals("README"))
+ .forEach(p -> {
+ try {
+ String alias = p.getFileName().toString() + " [jdk]";
+ try (InputStream fis = Files.newInputStream(p)) {
+ ks.setCertificateEntry(alias, cf.generateCertificate(fis));
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ try (FileOutputStream fos = new FileOutputStream(args[1])) {
+ ks.store(fos, "changeit".toCharArray());
+ }
+ }
+}
--- a/src/hotspot/cpu/s390/globals_s390.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/cpu/s390/globals_s390.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -54,7 +54,7 @@
#define DEFAULT_STACK_RED_PAGES (1)
// Java_java_net_SocketOutputStream_socketWrite0() uses a 64k buffer on the
// stack. To pass stack overflow tests we need 20 shadow pages.
-#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+2))
+#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+4))
#define DEFAULT_STACK_RESERVED_PAGES (1)
#define MIN_STACK_YELLOW_PAGES DEFAULT_STACK_YELLOW_PAGES
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -361,8 +361,7 @@
void LIR_Assembler::clinit_barrier(ciMethod* method) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
- assert(method->holder()->is_being_initialized() || method->holder()->is_initialized(),
- "initialization should have been started");
+ assert(!method->holder()->is_not_initialized(), "initialization should have been started");
Label L_skip_barrier;
Register klass = rscratch1;
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -4602,13 +4602,14 @@
bind(L_fallthrough);
}
-
void MacroAssembler::clinit_barrier(Register klass, Register thread, Label* L_fast_path, Label* L_slow_path) {
assert(L_fast_path != NULL || L_slow_path != NULL, "at least one is required");
Label L_fallthrough;
if (L_fast_path == NULL) {
L_fast_path = &L_fallthrough;
+ } else if (L_slow_path == NULL) {
+ L_slow_path = &L_fallthrough;
}
// Fast path check: class is fully initialized
@@ -4617,13 +4618,15 @@
// Fast path check: current thread is initializer thread
cmpptr(thread, Address(klass, InstanceKlass::init_thread_offset()));
- if (L_slow_path != NULL) {
- jcc(Assembler::notEqual, *L_slow_path);
- } else {
+ if (L_slow_path == &L_fallthrough) {
jcc(Assembler::equal, *L_fast_path);
- }
-
- bind(L_fallthrough);
+ bind(*L_slow_path);
+ } else if (L_fast_path == &L_fallthrough) {
+ jcc(Assembler::notEqual, *L_slow_path);
+ bind(*L_fast_path);
+ } else {
+ Unimplemented();
+ }
}
void MacroAssembler::cmov32(Condition cc, Register dst, Address src) {
--- a/src/hotspot/cpu/x86/x86_64.ad Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/cpu/x86/x86_64.ad Fri Jun 07 09:38:40 2019 -0700
@@ -876,8 +876,7 @@
if (C->clinit_barrier_on_entry()) {
assert(VM_Version::supports_fast_class_init_checks(), "sanity");
- assert(C->method()->holder()->is_being_initialized() || C->method()->holder()->is_initialized(),
- "initialization should have been started");
+ assert(!C->method()->holder()->is_not_initialized(), "initialization should have been started");
Label L_skip_barrier;
Register klass = rscratch1;
--- a/src/hotspot/os/aix/os_aix.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/os/aix/os_aix.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1206,8 +1206,15 @@
}
// Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
void os::die() {
- ::abort();
+ if (TestUnresponsiveErrorHandler && !CreateCoredumpOnCrash) {
+ // For TimeoutInErrorHandlingTest.java, we just kill the VM
+ // and don't take the time to generate a core file.
+ os::signal_raise(SIGKILL);
+ } else {
+ ::abort();
+ }
}
intx os::current_thread_id() {
@@ -1320,16 +1327,21 @@
// RTLD_LAZY is currently not implemented. The dl is loaded immediately with all its dependants.
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
+ Events::log(NULL, "Loaded shared library %s", filename);
// Reload dll cache. Don't do this in signal handling.
LoadedLibraries::reload();
return result;
} else {
// error analysis when dlopen fails
- const char* const error_report = ::dlerror();
- if (error_report && ebuf && ebuflen > 0) {
+ const char* error_report = ::dlerror();
+ if (error_report == NULL) {
+ error_report = "dlerror returned no error description";
+ }
+ if (ebuf != NULL && ebuflen > 0) {
snprintf(ebuf, ebuflen - 1, "%s, LIBPATH=%s, LD_LIBRARY_PATH=%s : %s",
filename, ::getenv("LIBPATH"), ::getenv("LD_LIBRARY_PATH"), error_report);
}
+ Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
}
return NULL;
}
--- a/src/hotspot/os/bsd/os_bsd.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/os/bsd/os_bsd.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1073,9 +1073,16 @@
}
// Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
void os::die() {
- // _exit() on BsdThreads only kills current thread
- ::abort();
+ if (TestUnresponsiveErrorHandler && !CreateCoredumpOnCrash) {
+ // For TimeoutInErrorHandlingTest.java, we just kill the VM
+ // and don't take the time to generate a core file.
+ os::signal_raise(SIGKILL);
+ } else {
+ // _exit() on BsdThreads only kills current thread
+ ::abort();
+ }
}
// Information of current thread in variety of formats
@@ -1258,13 +1265,21 @@
#else
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
+ Events::log(NULL, "Loaded shared library %s", filename);
// Successful loading
return result;
}
- // Read system error message into ebuf
- ::strncpy(ebuf, ::dlerror(), ebuflen-1);
- ebuf[ebuflen-1]='\0';
+ const char* error_report = ::dlerror();
+ if (error_report == NULL) {
+ error_report = "dlerror returned no error description";
+ }
+ if (ebuf != NULL && ebuflen > 0) {
+ // Read system error message into ebuf
+ ::strncpy(ebuf, error_report, ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+ }
+ Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
return NULL;
#endif // STATIC_BUILD
@@ -1276,16 +1291,24 @@
#else
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
+ Events::log(NULL, "Loaded shared library %s", filename);
// Successful loading
return result;
}
Elf32_Ehdr elf_head;
- // Read system error message into ebuf
- // It may or may not be overwritten below
- ::strncpy(ebuf, ::dlerror(), ebuflen-1);
- ebuf[ebuflen-1]='\0';
+ const char* const error_report = ::dlerror();
+ if (error_report == NULL) {
+ error_report = "dlerror returned no error description";
+ }
+ if (ebuf != NULL && ebuflen > 0) {
+ // Read system error message into ebuf
+ ::strncpy(ebuf, error_report, ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+ }
+ Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+
int diag_msg_max_length=ebuflen-strlen(ebuf);
char* diag_msg_buf=ebuf+strlen(ebuf);
--- a/src/hotspot/os/linux/os_linux.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/os/linux/os_linux.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1461,8 +1461,15 @@
}
// Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
void os::die() {
- ::abort();
+ if (TestUnresponsiveErrorHandler && !CreateCoredumpOnCrash) {
+ // For TimeoutInErrorHandlingTest.java, we just kill the VM
+ // and don't take the time to generate a core file.
+ os::signal_raise(SIGKILL);
+ } else {
+ ::abort();
+ }
}
// thread_id is kernel thread id (similar to Solaris LWP id)
@@ -1874,8 +1881,17 @@
int ebuflen) {
void * result = ::dlopen(filename, RTLD_LAZY);
if (result == NULL) {
- ::strncpy(ebuf, ::dlerror(), ebuflen - 1);
- ebuf[ebuflen-1] = '\0';
+ const char* error_report = ::dlerror();
+ if (error_report == NULL) {
+ error_report = "dlerror returned no error description";
+ }
+ if (ebuf != NULL && ebuflen > 0) {
+ ::strncpy(ebuf, error_report, ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+ }
+ Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+ } else {
+ Events::log(NULL, "Loaded shared library %s", filename);
}
return result;
}
--- a/src/hotspot/os/solaris/os_solaris.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/os/solaris/os_solaris.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1334,8 +1334,15 @@
}
// Die immediately, no exit hook, no abort hook, no cleanup.
+// Dump a core file, if possible, for debugging.
void os::die() {
- ::abort(); // dump core (for debugging)
+ if (TestUnresponsiveErrorHandler && !CreateCoredumpOnCrash) {
+ // For TimeoutInErrorHandlingTest.java, we just kill the VM
+ // and don't take the time to generate a core file.
+ os::signal_raise(SIGKILL);
+ } else {
+ ::abort();
+ }
}
// DLL functions
@@ -1521,15 +1528,22 @@
void * result= ::dlopen(filename, RTLD_LAZY);
if (result != NULL) {
// Successful loading
+ Events::log(NULL, "Loaded shared library %s", filename);
return result;
}
Elf32_Ehdr elf_head;
-
- // Read system error message into ebuf
- // It may or may not be overwritten below
- ::strncpy(ebuf, ::dlerror(), ebuflen-1);
- ebuf[ebuflen-1]='\0';
+ const char* error_report = ::dlerror();
+ if (error_report == NULL) {
+ error_report = "dlerror returned no error description";
+ }
+ if (ebuf != NULL && ebuflen > 0) {
+ ::strncpy(ebuf, error_report, ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+ }
+
+ Events::log(NULL, "Loading shared library %s failed, %s", filename, error_report);
+
int diag_msg_max_length=ebuflen-strlen(ebuf);
char* diag_msg_buf=ebuf+strlen(ebuf);
--- a/src/hotspot/os/windows/os_windows.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/os/windows/os_windows.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1367,12 +1367,18 @@
void * os::dll_load(const char *name, char *ebuf, int ebuflen) {
void * result = LoadLibrary(name);
if (result != NULL) {
+ Events::log(NULL, "Loaded shared library %s", name);
// Recalculate pdb search path if a DLL was loaded successfully.
SymbolEngine::recalc_search_path();
return result;
}
-
DWORD errcode = GetLastError();
+ // Read system error message into ebuf
+ // It may or may not be overwritten below (in the for loop and just above)
+ lasterror(ebuf, (size_t) ebuflen);
+ ebuf[ebuflen - 1] = '\0';
+ Events::log(NULL, "Loading shared library %s failed, error code %lu", name, errcode);
+
if (errcode == ERROR_MOD_NOT_FOUND) {
strncpy(ebuf, "Can't find dependent libraries", ebuflen - 1);
ebuf[ebuflen - 1] = '\0';
@@ -1384,11 +1390,6 @@
// for an architecture other than Hotspot is running in
// - then print to buffer "DLL was built for a different architecture"
// else call os::lasterror to obtain system error message
-
- // Read system error message into ebuf
- // It may or may not be overwritten below (in the for loop and just above)
- lasterror(ebuf, (size_t) ebuflen);
- ebuf[ebuflen - 1] = '\0';
int fd = ::open(name, O_RDONLY | O_BINARY, 0);
if (fd < 0) {
return NULL;
--- a/src/hotspot/share/ci/ciEnv.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/ci/ciEnv.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -44,6 +44,7 @@
#include "gc/shared/collectedHeap.inline.hpp"
#include "interpreter/linkResolver.hpp"
#include "jfr/jfrEvents.hpp"
+#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
@@ -991,6 +992,11 @@
record_failure("DTrace flags change invalidated dependencies");
}
+ if (!failing() && target->needs_clinit_barrier() &&
+ target->holder()->is_in_error_state()) {
+ record_failure("method holder is in error state");
+ }
+
if (!failing()) {
if (log() != NULL) {
// Log the dependencies which this compilation declares.
@@ -1071,25 +1077,23 @@
old->make_not_used();
}
}
- if (TraceNMethodInstalls) {
+
+ LogTarget(Info, nmethod, install) lt;
+ if (lt.is_enabled()) {
ResourceMark rm;
char *method_name = method->name_and_sig_as_C_string();
- ttyLocker ttyl;
- tty->print_cr("Installing method (%d) %s ",
- task()->comp_level(),
- method_name);
+ lt.print("Installing method (%d) %s ",
+ task()->comp_level(), method_name);
}
// Allow the code to be executed
method->set_code(method, nm);
} else {
- if (TraceNMethodInstalls) {
+ LogTarget(Info, nmethod, install) lt;
+ if (lt.is_enabled()) {
ResourceMark rm;
char *method_name = method->name_and_sig_as_C_string();
- ttyLocker ttyl;
- tty->print_cr("Installing osr method (%d) %s @ %d",
- task()->comp_level(),
- method_name,
- entry_bci);
+ lt.print("Installing osr method (%d) %s @ %d",
+ task()->comp_level(), method_name, entry_bci);
}
method->method_holder()->add_osr_nmethod(nm);
}
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -120,6 +120,10 @@
update_if_shared(InstanceKlass::fully_initialized);
return _init_state == InstanceKlass::fully_initialized;
}
+ bool is_not_initialized() {
+ update_if_shared(InstanceKlass::fully_initialized);
+ return _init_state < InstanceKlass::being_initialized;
+ }
// Is this klass being initialized?
bool is_being_initialized() {
update_if_shared(InstanceKlass::being_initialized);
@@ -130,6 +134,11 @@
update_if_shared(InstanceKlass::linked);
return _init_state >= InstanceKlass::linked;
}
+ // Is this klass in error state?
+ bool is_in_error_state() {
+ update_if_shared(InstanceKlass::initialization_error);
+ return _init_state == InstanceKlass::initialization_error;
+ }
// General klass information.
ciFlags flags() {
--- a/src/hotspot/share/ci/ciMethod.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/ci/ciMethod.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -462,6 +462,27 @@
// ------------------------------------------------------------------
+// ciMethod::check_overflow
+//
+// Check whether the profile counter is overflowed and adjust if true.
+// For invoke* it will turn negative values into max_jint,
+// and for checkcast/aastore/instanceof turn positive values into min_jint.
+int ciMethod::check_overflow(int c, Bytecodes::Code code) {
+ switch (code) {
+ case Bytecodes::_aastore: // fall-through
+ case Bytecodes::_checkcast: // fall-through
+ case Bytecodes::_instanceof: {
+ return (c > 0 ? min_jint : c); // always non-positive
+ }
+ default: {
+ assert(Bytecodes::is_invoke(code), "%s", Bytecodes::name(code));
+ return (c < 0 ? max_jint : c); // always non-negative
+ }
+ }
+}
+
+
+// ------------------------------------------------------------------
// ciMethod::call_profile_at_bci
//
// Get the ciCallProfile for the invocation of this method.
@@ -473,7 +494,7 @@
ciProfileData* data = method_data()->bci_to_data(bci);
if (data != NULL && data->is_CounterData()) {
// Every profiled call site has a counter.
- int count = data->as_CounterData()->count();
+ int count = check_overflow(data->as_CounterData()->count(), java_code_at_bci(bci));
if (!data->is_ReceiverTypeData()) {
result._receiver_count[0] = 0; // that's a definite zero
@@ -502,9 +523,9 @@
for (uint i = 0; i < call->row_limit(); i++) {
ciKlass* receiver = call->receiver(i);
if (receiver == NULL) continue;
- int rcount = call->receiver_count(i) + epsilon;
+ int rcount = saturated_add(call->receiver_count(i), epsilon);
if (rcount == 0) rcount = 1; // Should be valid value
- receivers_count_total += rcount;
+ receivers_count_total = saturated_add(receivers_count_total, rcount);
// Add the receiver to result data.
result.add_receiver(receiver, rcount);
// If we extend profiling to record methods,
@@ -534,7 +555,7 @@
// do nothing. Otherwise, increase count to be the sum of all
// receiver's counts.
if (count >= 0) {
- count += receivers_count_total;
+ count = saturated_add(count, receivers_count_total);
}
}
result._count = count;
@@ -1111,7 +1132,7 @@
} else {
_is_c2_compilable = false;
}
- get_Method()->set_not_compilable(env->comp_level(), true, reason);
+ get_Method()->set_not_compilable(reason, env->comp_level());
}
// ------------------------------------------------------------------
--- a/src/hotspot/share/ci/ciMethod.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/ci/ciMethod.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -126,6 +126,9 @@
void assert_virtual_call_type_ok(int bci);
void assert_call_type_ok(int bci);
+ // Check and update the profile counter in case of overflow
+ static int check_overflow(int c, Bytecodes::Code code);
+
public:
void check_is_loaded() const { assert(is_loaded(), "not loaded"); }
--- a/src/hotspot/share/classfile/classLoaderData.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/classfile/classLoaderData.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -30,6 +30,7 @@
#include "memory/metaspace.hpp"
#include "oops/oopHandle.hpp"
#include "oops/weakHandle.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutex.hpp"
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
@@ -159,7 +160,7 @@
JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
void set_next(ClassLoaderData* next) { _next = next; }
- ClassLoaderData* next() const { return _next; }
+ ClassLoaderData* next() const { return Atomic::load(&_next); }
ClassLoaderData(Handle h_class_loader, bool is_unsafe_anonymous);
~ClassLoaderData();
--- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -38,6 +38,7 @@
#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/mutex.hpp"
+#include "runtime/orderAccess.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/safepointVerifiers.hpp"
#include "utilities/growableArray.hpp"
@@ -48,8 +49,17 @@
volatile size_t ClassLoaderDataGraph::_num_instance_classes = 0;
void ClassLoaderDataGraph::clear_claimed_marks() {
- assert_locked_or_safepoint_weak(ClassLoaderDataGraph_lock);
- for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
+ // The claimed marks of the CLDs in the ClassLoaderDataGraph are cleared
+ // outside a safepoint and without locking the ClassLoaderDataGraph_lock.
+ // This is required to avoid a deadlock between concurrent GC threads and safepointing.
+ //
+ // We need to make sure that the CLD contents are fully visible to the
+ // reader thread. This is accomplished by acquire/release of the _head,
+ // and is sufficient.
+ //
+ // Any ClassLoaderData added after or during walking the list are prepended to
+ // _head. Their claim mark need not be handled here.
+ for (ClassLoaderData* cld = OrderAccess::load_acquire(&_head); cld != NULL; cld = cld->next()) {
cld->clear_claim();
}
}
@@ -169,7 +179,7 @@
}
// GC root of class loader data created.
-ClassLoaderData* ClassLoaderDataGraph::_head = NULL;
+ClassLoaderData* volatile ClassLoaderDataGraph::_head = NULL;
ClassLoaderData* ClassLoaderDataGraph::_unloading = NULL;
ClassLoaderData* ClassLoaderDataGraph::_saved_unloading = NULL;
ClassLoaderData* ClassLoaderDataGraph::_saved_head = NULL;
@@ -205,7 +215,7 @@
// First install the new CLD to the Graph.
cld->set_next(_head);
- _head = cld;
+ OrderAccess::release_store(&_head, cld);
// Next associate with the class_loader.
if (!is_unsafe_anonymous) {
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -41,7 +41,7 @@
friend class VMStructs;
private:
// All CLDs (except the null CLD) can be reached by walking _head->_next->...
- static ClassLoaderData* _head;
+ static ClassLoaderData* volatile _head;
static ClassLoaderData* _unloading;
// CMS support.
static ClassLoaderData* _saved_head;
--- a/src/hotspot/share/classfile/javaClasses.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/classfile/javaClasses.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -198,7 +198,7 @@
#if INCLUDE_CDS
void java_lang_String::serialize_offsets(SerializeClosure* f) {
STRING_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
- f->do_u4((u4*)&initialized);
+ f->do_bool(&initialized);
}
#endif
@@ -1566,7 +1566,7 @@
#if INCLUDE_CDS
void java_lang_Class::serialize_offsets(SerializeClosure* f) {
- f->do_u4((u4*)&offsets_computed);
+ f->do_bool(&offsets_computed);
f->do_u4((u4*)&_init_lock_offset);
CLASS_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
--- a/src/hotspot/share/compiler/compileBroker.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/compiler/compileBroker.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -187,7 +187,7 @@
class CompilationLog : public StringEventLog {
public:
- CompilationLog() : StringEventLog("Compilation events") {
+ CompilationLog() : StringEventLog("Compilation events", "jit") {
}
void log_compile(JavaThread* thread, CompileTask* task) {
@@ -1242,7 +1242,7 @@
if (HAS_PENDING_EXCEPTION) {
// In case of an exception looking up the method, we just forget
// about it. The interpreter will kick-in and throw the exception.
- method->set_not_compilable(); // implies is_not_osr_compilable()
+ method->set_not_compilable("NativeLookup::lookup failed"); // implies is_not_osr_compilable()
CLEAR_PENDING_EXCEPTION;
return NULL;
}
@@ -1370,7 +1370,7 @@
AbstractCompiler *comp = compiler(comp_level);
if (is_native &&
(!CICompileNatives || comp == NULL || !comp->supports_native())) {
- method->set_not_compilable_quietly(comp_level);
+ method->set_not_compilable_quietly("native methods not supported", comp_level);
return true;
}
@@ -1378,7 +1378,7 @@
// Some compilers may not support on stack replacement.
if (is_osr &&
(!CICompileOSR || comp == NULL || !comp->supports_osr())) {
- method->set_not_osr_compilable(comp_level);
+ method->set_not_osr_compilable("OSR not supported", comp_level);
return true;
}
@@ -1395,7 +1395,7 @@
method->print_short_name(tty);
tty->cr();
}
- method->set_not_compilable(comp_level, !quietly, "excluded by CompileCommand");
+ method->set_not_compilable("excluded by CompileCommand", comp_level, !quietly);
}
return false;
@@ -1428,7 +1428,7 @@
}
// Method was not in the appropriate compilation range.
- method->set_not_compilable_quietly();
+ method->set_not_compilable_quietly("Not in requested compile id range");
return 0;
#else
// CICountOSR is a develop flag and set to 'false' by default. In a product built,
@@ -2195,15 +2195,15 @@
switch (compilable) {
case ciEnv::MethodCompilable_never:
if (is_osr)
- method->set_not_osr_compilable_quietly();
+ method->set_not_osr_compilable_quietly("MethodCompilable_never");
else
- method->set_not_compilable_quietly();
+ method->set_not_compilable_quietly("MethodCompilable_never");
break;
case ciEnv::MethodCompilable_not_at_tier:
if (is_osr)
- method->set_not_osr_compilable_quietly(task_level);
+ method->set_not_osr_compilable_quietly("MethodCompilable_not_at_tier", task_level);
else
- method->set_not_compilable_quietly(task_level);
+ method->set_not_compilable_quietly("MethodCompilable_not_at_tier", task_level);
break;
}
--- a/src/hotspot/share/compiler/compileTask.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/compiler/compileTask.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -416,9 +416,7 @@
log->end_elem();
log->clear_identities(); // next task will have different CI
log->tail("task");
- if (log->unflushed_count() > 2000) {
- log->flush();
- }
+ log->flush();
log->mark_file_end();
}
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -268,7 +268,6 @@
{
G1ConcPhase p(G1ConcurrentPhase::CLEAR_CLAIMED_MARKS, this);
- MutexLocker ml(ClassLoaderDataGraph_lock);
ClassLoaderDataGraph::clear_claimed_marks();
}
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -73,7 +73,7 @@
void log_heap(CollectedHeap* heap, bool before);
public:
- GCHeapLog() : EventLogBase<GCMessage>("GC Heap History") {}
+ GCHeapLog() : EventLogBase<GCMessage>("GC Heap History", "gc") {}
void log_heap_before(CollectedHeap* heap) {
log_heap(heap, true);
--- a/src/hotspot/share/gc/shared/gcArguments.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shared/gcArguments.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -191,6 +191,10 @@
}
}
+ if (FLAG_IS_DEFAULT(SoftMaxHeapSize)) {
+ FLAG_SET_ERGO(SoftMaxHeapSize, MaxHeapSize);
+ }
+
FLAG_SET_ERGO(MinHeapDeltaBytes, align_up(MinHeapDeltaBytes, SpaceAlignment));
DEBUG_ONLY(assert_flags();)
--- a/src/hotspot/share/gc/shared/gc_globals.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -721,6 +721,10 @@
"Maximum heap size (in bytes)") \
constraint(MaxHeapSizeConstraintFunc,AfterErgo) \
\
+ manageable(size_t, SoftMaxHeapSize, 0, \
+ "Soft limit for maximum heap size (in bytes)") \
+ constraint(SoftMaxHeapSizeConstraintFunc,AfterMemoryInit) \
+ \
product(size_t, OldSize, ScaleForWordSize(4*M), \
"Initial tenured generation size (in bytes)") \
range(0, max_uintx) \
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -332,6 +332,15 @@
return status;
}
+JVMFlag::Error SoftMaxHeapSizeConstraintFunc(size_t value, bool verbose) {
+ if (value > MaxHeapSize) {
+ JVMFlag::printError(verbose, "SoftMaxHeapSize must be less than or equal to the maximum heap size\n");
+ return JVMFlag::VIOLATES_CONSTRAINT;
+ }
+
+ return JVMFlag::SUCCESS;
+}
+
JVMFlag::Error HeapBaseMinAddressConstraintFunc(size_t value, bool verbose) {
// If an overflow happened in Arguments::set_heap_size(), MaxHeapSize will have too large a value.
// Check for this by ensuring that MaxHeapSize plus the requested min base address still fit within max_uintx.
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -61,6 +61,7 @@
JVMFlag::Error InitialBootClassLoaderMetaspaceSizeConstraintFunc(size_t value, bool verbose);
JVMFlag::Error InitialHeapSizeConstraintFunc(size_t value, bool verbose);
JVMFlag::Error MaxHeapSizeConstraintFunc(size_t value, bool verbose);
+JVMFlag::Error SoftMaxHeapSizeConstraintFunc(size_t value, bool verbose);
JVMFlag::Error HeapBaseMinAddressConstraintFunc(size_t value, bool verbose);
JVMFlag::Error NewSizeConstraintFunc(size_t value, bool verbose);
JVMFlag::Error MinTLABSizeConstraintFunc(size_t value, bool verbose);
--- a/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahArguments.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -67,12 +67,34 @@
FLAG_SET_DEFAULT(UseNUMAInterleaving, true);
}
- FLAG_SET_DEFAULT(ParallelGCThreads,
- WorkerPolicy::parallel_worker_threads());
+ // Set up default number of concurrent threads. We want to have cycles complete fast
+ // enough, but we also do not want to steal too much CPU from the concurrently running
+ // application. Using 1/4 of available threads for concurrent GC seems a good
+ // compromise here.
+ if (FLAG_IS_DEFAULT(ConcGCThreads)) {
+ FLAG_SET_DEFAULT(ConcGCThreads, MAX2(1, os::processor_count() / 4));
+ }
+
+ if (ConcGCThreads == 0) {
+ vm_exit_during_initialization("Shenandoah expects ConcGCThreads > 0, check -XX:ConcGCThreads=#");
+ }
- if (FLAG_IS_DEFAULT(ConcGCThreads)) {
- uint conc_threads = MAX2((uint) 1, ParallelGCThreads);
- FLAG_SET_DEFAULT(ConcGCThreads, conc_threads);
+ // Set up default number of parallel threads. We want to have decent pauses performance
+ // which would use parallel threads, but we also do not want to do too many threads
+ // that will overwhelm the OS scheduler. Using 1/2 of available threads seems to be a fair
+ // compromise here. Due to implementation constraints, it should not be lower than
+ // the number of concurrent threads.
+ if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
+ FLAG_SET_DEFAULT(ParallelGCThreads, MAX2(1, os::processor_count() / 2));
+ }
+
+ if (ParallelGCThreads == 0) {
+ vm_exit_during_initialization("Shenandoah expects ParallelGCThreads > 0, check -XX:ParallelGCThreads=#");
+ }
+
+ if (ParallelGCThreads < ConcGCThreads) {
+ warning("Shenandoah expects ConcGCThreads <= ParallelGCThreads, adjusting ParallelGCThreads automatically");
+ FLAG_SET_DEFAULT(ParallelGCThreads, ConcGCThreads);
}
if (FLAG_IS_DEFAULT(ParallelRefProcEnabled)) {
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -292,7 +292,7 @@
ShenandoahGCPhase phase(root_phase);
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@@ -302,7 +302,7 @@
ShenandoahUpdateRootsTask update_roots(&root_updater);
_heap->workers()->run_task(&update_roots);
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
@@ -331,8 +331,14 @@
void ShenandoahConcurrentMark::update_thread_roots(ShenandoahPhaseTimings::Phase root_phase) {
WorkGang* workers = _heap->workers();
bool is_par = workers->active_workers() > 1;
+#if COMPILER2_OR_JVMCI
+ DerivedPointerTable::clear();
+#endif
ShenandoahUpdateThreadRootsTask task(is_par, root_phase);
workers->run_task(&task);
+#if COMPILER2_OR_JVMCI
+ DerivedPointerTable::update_pointers();
+#endif
}
void ShenandoahConcurrentMark::initialize(uint workers) {
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -253,9 +253,12 @@
ShouldNotReachHere();
}
- // Note: Only when concurrently updating references can obj become NULL here.
- // It happens when a mutator thread beats us by writing another value. In that
- // case we don't need to do anything else.
+ // Note: Only when concurrently updating references can obj be different
+ // (that is, really different, not just different from-/to-space copies of the same)
+ // from the one we originally loaded. Mutator thread can beat us by writing something
+ // else into the location. In that case, we would mark through that updated value,
+ // on the off-chance it is not handled by other means (e.g. via SATB). However,
+ // if that write was NULL, we don't need to do anything else.
if (UPDATE_REFS != CONCURRENT || !CompressedOops::is_null(obj)) {
shenandoah_assert_not_forwarded(p, obj);
shenandoah_assert_not_in_cset_except(p, obj, heap->cancelled_gc());
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1067,7 +1067,7 @@
};
void ShenandoahHeap::evacuate_and_update_roots() {
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
assert(ShenandoahSafepoint::is_at_shenandoah_safepoint(), "Only iterate roots while world is stopped");
@@ -1078,7 +1078,7 @@
workers()->run_task(&roots_task);
}
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -690,8 +690,8 @@
template <class T>
inline oop update_with_forwarded_not_null(T* p, oop obj);
- inline oop atomic_compare_exchange_oop(oop n, narrowOop* addr, oop c);
- inline oop atomic_compare_exchange_oop(oop n, oop* addr, oop c);
+ static inline oop cas_oop(oop n, narrowOop* addr, oop c);
+ static inline oop cas_oop(oop n, oop* addr, oop c);
void trash_humongous_region_at(ShenandoahHeapRegion *r);
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -116,7 +116,7 @@
if (oopDesc::equals_raw(forwarded_oop, heap_oop)) {
forwarded_oop = evacuate_object(heap_oop, Thread::current());
}
- oop prev = atomic_compare_exchange_oop(forwarded_oop, p, heap_oop);
+ oop prev = cas_oop(forwarded_oop, p, heap_oop);
if (oopDesc::equals_raw(prev, heap_oop)) {
return forwarded_oop;
} else {
@@ -129,11 +129,11 @@
}
}
-inline oop ShenandoahHeap::atomic_compare_exchange_oop(oop n, oop* addr, oop c) {
+inline oop ShenandoahHeap::cas_oop(oop n, oop* addr, oop c) {
return (oop) Atomic::cmpxchg(n, addr, c);
}
-inline oop ShenandoahHeap::atomic_compare_exchange_oop(oop n, narrowOop* addr, oop c) {
+inline oop ShenandoahHeap::cas_oop(oop n, narrowOop* addr, oop c) {
narrowOop cmp = CompressedOops::encode(c);
narrowOop val = CompressedOops::encode(n);
return CompressedOops::decode((narrowOop) Atomic::cmpxchg(val, addr, cmp));
@@ -152,24 +152,29 @@
}
shenandoah_assert_forwarded_except(p, heap_oop, is_full_gc_in_progress() || is_degenerated_gc_in_progress());
+ shenandoah_assert_not_forwarded(p, forwarded_oop);
shenandoah_assert_not_in_cset_except(p, forwarded_oop, cancelled_gc());
// If this fails, another thread wrote to p before us, it will be logged in SATB and the
// reference be updated later.
- oop result = atomic_compare_exchange_oop(forwarded_oop, p, heap_oop);
+ oop witness = cas_oop(forwarded_oop, p, heap_oop);
- if (oopDesc::equals_raw(result, heap_oop)) { // CAS successful.
- return forwarded_oop;
+ if (!oopDesc::equals_raw(witness, heap_oop)) {
+ // CAS failed, someone had beat us to it. Normally, we would return the failure witness,
+ // because that would be the proper write of to-space object, enforced by strong barriers.
+ // However, there is a corner case with arraycopy. It can happen that a Java thread
+ // beats us with an arraycopy, which first copies the array, which potentially contains
+ // from-space refs, and only afterwards updates all from-space refs to to-space refs,
+ // which leaves a short window where the new array elements can be from-space.
+ // In this case, we can just resolve the result again. As we resolve, we need to consider
+ // the contended write might have been NULL.
+ oop result = ShenandoahBarrierSet::resolve_forwarded(witness);
+ shenandoah_assert_not_forwarded_except(p, result, (result == NULL));
+ shenandoah_assert_not_in_cset_except(p, result, (result == NULL) || cancelled_gc());
+ return result;
} else {
- // Note: we used to assert the following here. This doesn't work because sometimes, during
- // marking/updating-refs, it can happen that a Java thread beats us with an arraycopy,
- // which first copies the array, which potentially contains from-space refs, and only afterwards
- // updates all from-space refs to to-space refs, which leaves a short window where the new array
- // elements can be from-space.
- // assert(CompressedOops::is_null(result) ||
- // oopDesc::equals_raw(result, ShenandoahBarrierSet::resolve_oop_static_not_null(result)),
- // "expect not forwarded");
- return NULL;
+ // Success! We have updated with known to-space copy. We have already asserted it is sane.
+ return forwarded_oop;
}
} else {
shenandoah_assert_not_forwarded(p, heap_oop);
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -402,7 +402,7 @@
assert(_task_queues->is_empty(), "queues must be empty before traversal GC");
TASKQUEUE_STATS_ONLY(_task_queues->reset_taskqueue_stats());
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
@@ -414,7 +414,7 @@
_heap->workers()->run_task(&traversal_task);
}
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
@@ -571,7 +571,7 @@
_heap->make_parsable(true);
if (!_heap->cancelled_gc()) {
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
ShenandoahGCPhase phase_work(ShenandoahPhaseTimings::final_traversal_gc_work);
@@ -585,7 +585,7 @@
ShenandoahTaskTerminator terminator(nworkers, task_queues());
ShenandoahFinalTraversalCollectionTask task(&rp, &terminator);
_heap->workers()->run_task(&task);
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
@@ -706,13 +706,13 @@
};
void ShenandoahTraversalGC::fixup_roots() {
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::clear();
#endif
ShenandoahRootUpdater rp(_heap->workers()->active_workers(), ShenandoahPhaseTimings::final_traversal_update_roots, true /* update code cache */);
ShenandoahTraversalFixRootsTask update_roots_task(&rp);
_heap->workers()->run_task(&update_roots_task);
-#if defined(COMPILER2) || INCLUDE_JVMCI
+#if COMPILER2_OR_JVMCI
DerivedPointerTable::update_pointers();
#endif
}
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -54,7 +54,7 @@
}
shenandoah_assert_forwarded_except(p, obj, _heap->cancelled_gc());
// Update reference.
- _heap->atomic_compare_exchange_oop(forw, p, obj);
+ ShenandoahHeap::cas_oop(forw, p, obj);
obj = forw;
}
--- a/src/hotspot/share/gc/z/zAddress.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zAddress.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -49,6 +49,7 @@
static bool is_finalizable(uintptr_t value);
static bool is_finalizable_good(uintptr_t value);
static bool is_remapped(uintptr_t value);
+ static bool is_in(uintptr_t value);
static uintptr_t address(uintptr_t value);
static uintptr_t offset(uintptr_t value);
--- a/src/hotspot/share/gc/z/zAddress.inline.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zAddress.inline.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -26,6 +26,7 @@
#include "gc/z/zAddress.hpp"
#include "gc/z/zGlobals.hpp"
+#include "utilities/globalDefinitions.hpp"
#include "utilities/macros.hpp"
inline bool ZAddress::is_null(uintptr_t value) {
@@ -81,6 +82,16 @@
return value & ZAddressMetadataRemapped;
}
+inline bool ZAddress::is_in(uintptr_t value) {
+ // Check that exactly one non-offset bit is set
+ if (!is_power_of_2(value & ~ZAddressOffsetMask)) {
+ return false;
+ }
+
+ // Check that one of the non-finalizable metadata is set
+ return value & (ZAddressMetadataMask & ~ZAddressMetadataFinalizable);
+}
+
inline uintptr_t ZAddress::address(uintptr_t value) {
return value | ZAddressBase;
}
--- a/src/hotspot/share/gc/z/zCollectedHeap.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zCollectedHeap.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -109,7 +109,7 @@
}
bool ZCollectedHeap::is_in(const void* p) const {
- return is_in_reserved(p) && _heap.is_in((uintptr_t)p);
+ return _heap.is_in((uintptr_t)p);
}
uint32_t ZCollectedHeap::hash_oop(oop obj) const {
--- a/src/hotspot/share/gc/z/zDirector.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zDirector.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -81,7 +81,7 @@
// Perform GC if heap usage passes 10/20/30% and no other GC has been
// performed yet. This allows us to get some early samples of the GC
// duration, which is needed by the other rules.
- const size_t max_capacity = ZHeap::heap()->current_max_capacity();
+ const size_t max_capacity = ZHeap::heap()->soft_max_capacity();
const size_t used = ZHeap::heap()->used();
const double used_threshold_percent = (ZStatCycle::ncycles() + 1) * 0.1;
const size_t used_threshold = max_capacity * used_threshold_percent;
@@ -107,10 +107,10 @@
// Calculate amount of free memory available to Java threads. Note that
// the heap reserve is not available to Java threads and is therefore not
// considered part of the free memory.
- const size_t max_capacity = ZHeap::heap()->current_max_capacity();
+ const size_t max_capacity = ZHeap::heap()->soft_max_capacity();
const size_t max_reserve = ZHeap::heap()->max_reserve();
const size_t used = ZHeap::heap()->used();
- const size_t free_with_reserve = max_capacity - used;
+ const size_t free_with_reserve = max_capacity - MIN2(max_capacity, used);
const size_t free = free_with_reserve - MIN2(free_with_reserve, max_reserve);
// Calculate time until OOM given the max allocation rate and the amount
@@ -155,7 +155,7 @@
// passed since the previous GC. This helps avoid superfluous GCs when running
// applications with very low allocation rate.
const size_t used_after_last_gc = ZStatHeap::used_at_relocate_end();
- const size_t used_increase_threshold = ZHeap::heap()->current_max_capacity() * 0.10; // 10%
+ const size_t used_increase_threshold = ZHeap::heap()->soft_max_capacity() * 0.10; // 10%
const size_t used_threshold = used_after_last_gc + used_increase_threshold;
const size_t used = ZHeap::heap()->used();
const double time_since_last_gc = ZStatCycle::time_since_last();
@@ -191,13 +191,17 @@
// Calculate amount of free memory available to Java threads. Note that
// the heap reserve is not available to Java threads and is therefore not
// considered part of the free memory.
- const size_t max_capacity = ZHeap::heap()->current_max_capacity();
+ const size_t max_capacity = ZHeap::heap()->soft_max_capacity();
const size_t max_reserve = ZHeap::heap()->max_reserve();
const size_t used = ZHeap::heap()->used();
const size_t free_with_reserve = max_capacity - used;
const size_t free = free_with_reserve - MIN2(free_with_reserve, max_reserve);
+ const double free_percent = percent_of(free, max_capacity);
- return percent_of(free, max_capacity) <= 5.0;
+ log_debug(gc, director)("Rule: High Usage, Free: " SIZE_FORMAT "MB(%.1lf%%)",
+ free / M, free_percent);
+
+ return free_percent <= 5.0;
}
GCCause::Cause ZDirector::make_gc_decision() const {
--- a/src/hotspot/share/gc/z/zHeap.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zHeap.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -79,7 +79,7 @@
_heap = this;
// Update statistics
- ZStatHeap::set_at_initialize(heap_max_size(), heap_max_reserve_size());
+ ZStatHeap::set_at_initialize(heap_min_size(), heap_max_size(), heap_max_reserve_size());
}
size_t ZHeap::heap_min_size() const {
@@ -113,8 +113,8 @@
return _page_allocator.max_capacity();
}
-size_t ZHeap::current_max_capacity() const {
- return _page_allocator.current_max_capacity();
+size_t ZHeap::soft_max_capacity() const {
+ return _page_allocator.soft_max_capacity();
}
size_t ZHeap::capacity() const {
@@ -177,13 +177,17 @@
}
bool ZHeap::is_in(uintptr_t addr) const {
- if (addr < ZAddressReservedStart || addr >= ZAddressReservedEnd) {
- return false;
- }
+ // An address is considered to be "in the heap" if it points into
+ // the allocated part of a pages, regardless of which heap view is
+ // used. Note that an address with the finalizable metadata bit set
+ // is not pointing into a heap view, and therefore not considered
+ // to be "in the heap".
- const ZPage* const page = _page_table.get(addr);
- if (page != NULL) {
- return page->is_in(addr);
+ if (ZAddress::is_in(addr)) {
+ const ZPage* const page = _page_table.get(addr);
+ if (page != NULL) {
+ return page->is_in(addr);
+ }
}
return false;
@@ -313,7 +317,7 @@
_mark.start();
// Update statistics
- ZStatHeap::set_at_mark_start(capacity(), used());
+ ZStatHeap::set_at_mark_start(soft_max_capacity(), capacity(), used());
}
void ZHeap::mark(bool initial) {
--- a/src/hotspot/share/gc/z/zHeap.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zHeap.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -89,7 +89,7 @@
// Heap metrics
size_t min_capacity() const;
size_t max_capacity() const;
- size_t current_max_capacity() const;
+ size_t soft_max_capacity() const;
size_t capacity() const;
size_t max_reserve() const;
size_t used_high() const;
--- a/src/hotspot/share/gc/z/zHeap.inline.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zHeap.inline.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -135,7 +135,11 @@
}
inline bool ZHeap::is_oop(oop object) const {
- return ZAddress::is_good(ZOop::to_address(object));
+ // Verify that we have a good address. Note that ZAddress::is_good()
+ // would not be a strong enough verification, since it only verifies
+ // that the metadata bits are good.
+ const uintptr_t addr = ZOop::to_address(object);
+ return ZAddress::good(addr) == addr;
}
#endif // SHARE_GC_Z_ZHEAP_INLINE_HPP
--- a/src/hotspot/share/gc/z/zPageAllocator.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zPageAllocator.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -34,6 +34,7 @@
#include "gc/z/zSafeDelete.inline.hpp"
#include "gc/z/zStat.hpp"
#include "gc/z/zTracer.inline.hpp"
+#include "runtime/globals.hpp"
#include "runtime/init.hpp"
#include "runtime/java.hpp"
#include "utilities/debug.hpp"
@@ -181,8 +182,9 @@
return _max_capacity;
}
-size_t ZPageAllocator::current_max_capacity() const {
- return _current_max_capacity;
+size_t ZPageAllocator::soft_max_capacity() const {
+ // Note that SoftMaxHeapSize is a manageable flag
+ return MIN2(SoftMaxHeapSize, _current_max_capacity);
}
size_t ZPageAllocator::capacity() const {
--- a/src/hotspot/share/gc/z/zPageAllocator.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zPageAllocator.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -94,7 +94,7 @@
size_t min_capacity() const;
size_t max_capacity() const;
- size_t current_max_capacity() const;
+ size_t soft_max_capacity() const;
size_t capacity() const;
size_t max_reserve() const;
size_t used_high() const;
--- a/src/hotspot/share/gc/z/zStat.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zStat.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -41,6 +41,13 @@
#include "utilities/debug.hpp"
#include "utilities/ticks.hpp"
+#define ZSIZE_FMT SIZE_FORMAT "M(%.0lf%%)"
+#define ZSIZE_ARGS(size) ((size) / M), (percent_of(size, ZStatHeap::max_capacity()))
+
+#define ZTABLE_ARGS_NA "%9s", "-"
+#define ZTABLE_ARGS(size) SIZE_FORMAT_W(8) "M (%.0lf%%)", \
+ ((size) / M), (percent_of(size, ZStatHeap::max_capacity()))
+
//
// Stat sampler/counter data
//
@@ -621,9 +628,6 @@
GCCause::to_string(ZCollectedHeap::heap()->gc_cause()));
}
-#define ZUSED_FMT SIZE_FORMAT "M(%.0lf%%)"
-#define ZUSED_ARGS(size, max_capacity) ((size) / M), (percent_of(size, max_capacity))
-
void ZStatPhaseCycle::register_end(const Ticks& start, const Ticks& end) const {
timer()->register_gc_end(end);
@@ -644,10 +648,10 @@
ZStatReferences::print();
ZStatHeap::print();
- log_info(gc)("Garbage Collection (%s) " ZUSED_FMT "->" ZUSED_FMT,
+ log_info(gc)("Garbage Collection (%s) " ZSIZE_FMT "->" ZSIZE_FMT,
GCCause::to_string(ZCollectedHeap::heap()->gc_cause()),
- ZUSED_ARGS(ZStatHeap::used_at_mark_start(), ZStatHeap::max_capacity()),
- ZUSED_ARGS(ZStatHeap::used_at_relocate_end(), ZStatHeap::max_capacity()));
+ ZSIZE_ARGS(ZStatHeap::used_at_mark_start()),
+ ZSIZE_ARGS(ZStatHeap::used_at_relocate_end()));
}
Tickspan ZStatPhasePause::_max;
@@ -1212,10 +1216,6 @@
ZStatHeap::ZAtRelocateStart ZStatHeap::_at_relocate_start;
ZStatHeap::ZAtRelocateEnd ZStatHeap::_at_relocate_end;
-#define ZSIZE_NA "%9s", "-"
-#define ZSIZE_ARGS(size) SIZE_FORMAT_W(8) "M (%.0lf%%)", \
- ((size) / M), (percent_of(size, _at_initialize.max_capacity))
-
size_t ZStatHeap::available(size_t used) {
return _at_initialize.max_capacity - used;
}
@@ -1228,14 +1228,18 @@
return available(used) - reserve(used);
}
-void ZStatHeap::set_at_initialize(size_t max_capacity,
+void ZStatHeap::set_at_initialize(size_t min_capacity,
+ size_t max_capacity,
size_t max_reserve) {
+ _at_initialize.min_capacity = min_capacity;
_at_initialize.max_capacity = max_capacity;
_at_initialize.max_reserve = max_reserve;
}
-void ZStatHeap::set_at_mark_start(size_t capacity,
+void ZStatHeap::set_at_mark_start(size_t soft_max_capacity,
+ size_t capacity,
size_t used) {
+ _at_mark_start.soft_max_capacity = soft_max_capacity;
_at_mark_start.capacity = capacity;
_at_mark_start.reserve = reserve(used);
_at_mark_start.used = used;
@@ -1308,6 +1312,13 @@
}
void ZStatHeap::print() {
+ log_info(gc, heap)("Min Capacity: "
+ ZSIZE_FMT, ZSIZE_ARGS(_at_initialize.min_capacity));
+ log_info(gc, heap)("Max Capacity: "
+ ZSIZE_FMT, ZSIZE_ARGS(_at_initialize.max_capacity));
+ log_info(gc, heap)("Soft Max Capacity: "
+ ZSIZE_FMT, ZSIZE_ARGS(_at_mark_start.soft_max_capacity));
+
ZStatTablePrinter table(10, 18);
log_info(gc, heap)("%s", table()
.fill()
@@ -1320,74 +1331,74 @@
.end());
log_info(gc, heap)("%s", table()
.right("Capacity:")
- .left(ZSIZE_ARGS(_at_mark_start.capacity))
- .left(ZSIZE_ARGS(_at_mark_end.capacity))
- .left(ZSIZE_ARGS(_at_relocate_start.capacity))
- .left(ZSIZE_ARGS(_at_relocate_end.capacity))
- .left(ZSIZE_ARGS(_at_relocate_end.capacity_high))
- .left(ZSIZE_ARGS(_at_relocate_end.capacity_low))
+ .left(ZTABLE_ARGS(_at_mark_start.capacity))
+ .left(ZTABLE_ARGS(_at_mark_end.capacity))
+ .left(ZTABLE_ARGS(_at_relocate_start.capacity))
+ .left(ZTABLE_ARGS(_at_relocate_end.capacity))
+ .left(ZTABLE_ARGS(_at_relocate_end.capacity_high))
+ .left(ZTABLE_ARGS(_at_relocate_end.capacity_low))
.end());
log_info(gc, heap)("%s", table()
.right("Reserve:")
- .left(ZSIZE_ARGS(_at_mark_start.reserve))
- .left(ZSIZE_ARGS(_at_mark_end.reserve))
- .left(ZSIZE_ARGS(_at_relocate_start.reserve))
- .left(ZSIZE_ARGS(_at_relocate_end.reserve))
- .left(ZSIZE_ARGS(_at_relocate_end.reserve_high))
- .left(ZSIZE_ARGS(_at_relocate_end.reserve_low))
+ .left(ZTABLE_ARGS(_at_mark_start.reserve))
+ .left(ZTABLE_ARGS(_at_mark_end.reserve))
+ .left(ZTABLE_ARGS(_at_relocate_start.reserve))
+ .left(ZTABLE_ARGS(_at_relocate_end.reserve))
+ .left(ZTABLE_ARGS(_at_relocate_end.reserve_high))
+ .left(ZTABLE_ARGS(_at_relocate_end.reserve_low))
.end());
log_info(gc, heap)("%s", table()
.right("Free:")
- .left(ZSIZE_ARGS(_at_mark_start.free))
- .left(ZSIZE_ARGS(_at_mark_end.free))
- .left(ZSIZE_ARGS(_at_relocate_start.free))
- .left(ZSIZE_ARGS(_at_relocate_end.free))
- .left(ZSIZE_ARGS(_at_relocate_end.free_high))
- .left(ZSIZE_ARGS(_at_relocate_end.free_low))
+ .left(ZTABLE_ARGS(_at_mark_start.free))
+ .left(ZTABLE_ARGS(_at_mark_end.free))
+ .left(ZTABLE_ARGS(_at_relocate_start.free))
+ .left(ZTABLE_ARGS(_at_relocate_end.free))
+ .left(ZTABLE_ARGS(_at_relocate_end.free_high))
+ .left(ZTABLE_ARGS(_at_relocate_end.free_low))
.end());
log_info(gc, heap)("%s", table()
.right("Used:")
- .left(ZSIZE_ARGS(_at_mark_start.used))
- .left(ZSIZE_ARGS(_at_mark_end.used))
- .left(ZSIZE_ARGS(_at_relocate_start.used))
- .left(ZSIZE_ARGS(_at_relocate_end.used))
- .left(ZSIZE_ARGS(_at_relocate_end.used_high))
- .left(ZSIZE_ARGS(_at_relocate_end.used_low))
+ .left(ZTABLE_ARGS(_at_mark_start.used))
+ .left(ZTABLE_ARGS(_at_mark_end.used))
+ .left(ZTABLE_ARGS(_at_relocate_start.used))
+ .left(ZTABLE_ARGS(_at_relocate_end.used))
+ .left(ZTABLE_ARGS(_at_relocate_end.used_high))
+ .left(ZTABLE_ARGS(_at_relocate_end.used_low))
.end());
log_info(gc, heap)("%s", table()
.right("Live:")
- .left(ZSIZE_NA)
- .left(ZSIZE_ARGS(_at_mark_end.live))
- .left(ZSIZE_ARGS(_at_mark_end.live /* Same as at mark end */))
- .left(ZSIZE_ARGS(_at_mark_end.live /* Same as at mark end */))
- .left(ZSIZE_NA)
- .left(ZSIZE_NA)
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS(_at_mark_end.live))
+ .left(ZTABLE_ARGS(_at_mark_end.live /* Same as at mark end */))
+ .left(ZTABLE_ARGS(_at_mark_end.live /* Same as at mark end */))
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS_NA)
.end());
log_info(gc, heap)("%s", table()
.right("Allocated:")
- .left(ZSIZE_NA)
- .left(ZSIZE_ARGS(_at_mark_end.allocated))
- .left(ZSIZE_ARGS(_at_relocate_start.allocated))
- .left(ZSIZE_ARGS(_at_relocate_end.allocated))
- .left(ZSIZE_NA)
- .left(ZSIZE_NA)
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS(_at_mark_end.allocated))
+ .left(ZTABLE_ARGS(_at_relocate_start.allocated))
+ .left(ZTABLE_ARGS(_at_relocate_end.allocated))
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS_NA)
.end());
log_info(gc, heap)("%s", table()
.right("Garbage:")
- .left(ZSIZE_NA)
- .left(ZSIZE_ARGS(_at_mark_end.garbage))
- .left(ZSIZE_ARGS(_at_relocate_start.garbage))
- .left(ZSIZE_ARGS(_at_relocate_end.garbage))
- .left(ZSIZE_NA)
- .left(ZSIZE_NA)
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS(_at_mark_end.garbage))
+ .left(ZTABLE_ARGS(_at_relocate_start.garbage))
+ .left(ZTABLE_ARGS(_at_relocate_end.garbage))
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS_NA)
.end());
log_info(gc, heap)("%s", table()
.right("Reclaimed:")
- .left(ZSIZE_NA)
- .left(ZSIZE_NA)
- .left(ZSIZE_ARGS(_at_relocate_start.reclaimed))
- .left(ZSIZE_ARGS(_at_relocate_end.reclaimed))
- .left(ZSIZE_NA)
- .left(ZSIZE_NA)
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS(_at_relocate_start.reclaimed))
+ .left(ZTABLE_ARGS(_at_relocate_end.reclaimed))
+ .left(ZTABLE_ARGS_NA)
+ .left(ZTABLE_ARGS_NA)
.end());
}
--- a/src/hotspot/share/gc/z/zStat.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/gc/z/zStat.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -467,11 +467,13 @@
class ZStatHeap : public AllStatic {
private:
static struct ZAtInitialize {
+ size_t min_capacity;
size_t max_capacity;
size_t max_reserve;
} _at_initialize;
static struct ZAtMarkStart {
+ size_t soft_max_capacity;
size_t capacity;
size_t reserve;
size_t used;
@@ -521,9 +523,11 @@
static size_t free(size_t used);
public:
- static void set_at_initialize(size_t max_capacity,
+ static void set_at_initialize(size_t min_capacity,
+ size_t max_capacity,
size_t max_reserve);
- static void set_at_mark_start(size_t capacity,
+ static void set_at_mark_start(size_t soft_max_capacity,
+ size_t capacity,
size_t used);
static void set_at_mark_end(size_t capacity,
size_t allocated,
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -462,8 +462,8 @@
last_native_ms = last_java_ms;
}
_sample.signal();
- jlong java_interval = _interval_java == 0 ? max_jlong : MAX2<jlong>(_interval_java, 10);
- jlong native_interval = _interval_native == 0 ? max_jlong : MAX2<jlong>(_interval_native, 10);
+ jlong java_interval = _interval_java == 0 ? max_jlong : MAX2<jlong>(_interval_java, 1);
+ jlong native_interval = _interval_native == 0 ? max_jlong : MAX2<jlong>(_interval_native, 1);
jlong now_ms = get_monotonic_ms();
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1113,7 +1113,15 @@
return (jlongArray) JVMCIENV->get_jobject(array);
C2V_END
-C2V_VMENTRY_0(int, allocateCompileId, (JNIEnv* env, jobject, jobject jvmci_method, int entry_bci))
+C2V_VMENTRY_0(jint, getCountersSize, (JNIEnv* env, jobject))
+ return (jint) JVMCICounterSize;
+C2V_END
+
+C2V_VMENTRY_0(jboolean, setCountersSize, (JNIEnv* env, jobject, jint new_size))
+ return JavaThread::resize_all_jvmci_counters(new_size);
+C2V_END
+
+C2V_VMENTRY_0(jint, allocateCompileId, (JNIEnv* env, jobject, jobject jvmci_method, int entry_bci))
HandleMark hm;
if (jvmci_method == NULL) {
JVMCI_THROW_0(NullPointerException);
@@ -1615,7 +1623,7 @@
tty->flush();
C2V_END
-C2V_VMENTRY_0(int, methodDataProfileDataSize, (JNIEnv* env, jobject, jlong metaspace_method_data, jint position))
+C2V_VMENTRY_0(jint, methodDataProfileDataSize, (JNIEnv* env, jobject, jlong metaspace_method_data, jint position))
MethodData* mdo = JVMCIENV->asMethodData(metaspace_method_data);
ProfileData* profile_data = mdo->data_at(position);
if (mdo->is_valid(profile_data)) {
@@ -1721,7 +1729,7 @@
}
C2V_END
-C2V_VMENTRY_0(int, interpreterFrameSize, (JNIEnv* env, jobject, jobject bytecode_frame_handle))
+C2V_VMENTRY_0(jint, interpreterFrameSize, (JNIEnv* env, jobject, jobject bytecode_frame_handle))
if (bytecode_frame_handle == NULL) {
JVMCI_THROW_0(NullPointerException);
}
@@ -1769,7 +1777,7 @@
}
C2V_END
-C2V_VMENTRY_0(int, getIdentityHashCode, (JNIEnv* env, jobject, jobject object))
+C2V_VMENTRY_0(jint, getIdentityHashCode, (JNIEnv* env, jobject, jobject object))
Handle obj = JVMCIENV->asConstant(JVMCIENV->wrap(object), JVMCI_CHECK_0);
return obj->identity_hash();
C2V_END
@@ -2551,7 +2559,7 @@
FailedSpeculation::free_failed_speculations((FailedSpeculation**)(address) failed_speculations_address);
}
-C2V_VMENTRY_0(bool, addFailedSpeculation, (JNIEnv* env, jobject, jlong failed_speculations_address, jbyteArray speculation_obj))
+C2V_VMENTRY_0(jboolean, addFailedSpeculation, (JNIEnv* env, jobject, jlong failed_speculations_address, jbyteArray speculation_obj))
JVMCIPrimitiveArray speculation_handle = JVMCIENV->wrap(speculation_obj);
int speculation_len = JVMCIENV->get_length(speculation_handle);
char* speculation = NEW_RESOURCE_ARRAY(char, speculation_len);
@@ -2644,6 +2652,8 @@
{CC "invalidateHotSpotNmethod", CC "(" HS_NMETHOD ")V", FN_PTR(invalidateHotSpotNmethod)},
{CC "readUncompressedOop", CC "(J)" OBJECTCONSTANT, FN_PTR(readUncompressedOop)},
{CC "collectCounters", CC "()[J", FN_PTR(collectCounters)},
+ {CC "getCountersSize", CC "()I", FN_PTR(getCountersSize)},
+ {CC "setCountersSize", CC "(I)Z", FN_PTR(setCountersSize)},
{CC "allocateCompileId", CC "(" HS_RESOLVED_METHOD "I)I", FN_PTR(allocateCompileId)},
{CC "isMature", CC "(" METASPACE_METHOD_DATA ")Z", FN_PTR(isMature)},
{CC "hasCompiledCodeForOSR", CC "(" HS_RESOLVED_METHOD "II)Z", FN_PTR(hasCompiledCodeForOSR)},
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -938,8 +938,6 @@
if (exception->is_a(SystemDictionary::ThreadDeath_klass())) {
// Don't print anything if we are being killed.
} else {
- java_lang_Throwable::print(exception(), tty);
- tty->cr();
java_lang_Throwable::print_stack_trace(exception, tty);
// Clear and ignore any exceptions raised during printing
@@ -1397,11 +1395,18 @@
assert(false, "JVMCICompiler.compileMethod should always return non-null");
}
} else {
- // An uncaught exception was thrown during compilation. Generally these
- // should be handled by the Java code in some useful way but if they leak
- // through to here report them instead of dying or silently ignoring them.
- JVMCIENV->describe_pending_exception(true);
- compile_state->set_failure(false, "unexpected exception thrown");
+ // An uncaught exception here implies failure during compiler initialization.
+ // The only sensible thing to do here is to exit the VM.
+
+ // Only report initialization failure once
+ static volatile int report_init_failure = 0;
+ if (!report_init_failure && Atomic::cmpxchg(1, &report_init_failure, 0) == 0) {
+ tty->print_cr("Exception during JVMCI compiler initialization:");
+ JVMCIENV->describe_pending_exception(true);
+ }
+ JVMCIENV->clear_pending_exception();
+ before_exit((JavaThread*) THREAD);
+ vm_exit(-1);
}
if (compiler->is_bootstrapping()) {
compiler->set_bootstrap_compilation_request_handled();
@@ -1538,25 +1543,23 @@
old->make_not_entrant();
}
}
- if (TraceNMethodInstalls) {
+
+ LogTarget(Info, nmethod, install) lt;
+ if (lt.is_enabled()) {
ResourceMark rm;
char *method_name = method->name_and_sig_as_C_string();
- ttyLocker ttyl;
- tty->print_cr("Installing method (%d) %s [entry point: %p]",
- comp_level,
- method_name, nm->entry_point());
+ lt.print("Installing method (%d) %s [entry point: %p]",
+ comp_level, method_name, nm->entry_point());
}
// Allow the code to be executed
method->set_code(method, nm);
} else {
- if (TraceNMethodInstalls ) {
+ LogTarget(Info, nmethod, install) lt;
+ if (lt.is_enabled()) {
ResourceMark rm;
char *method_name = method->name_and_sig_as_C_string();
- ttyLocker ttyl;
- tty->print_cr("Installing osr method (%d) %s @ %d",
- comp_level,
- method_name,
- entry_bci);
+ lt.print("Installing osr method (%d) %s @ %d",
+ comp_level, method_name, entry_bci);
}
InstanceKlass::cast(method->method_holder())->add_osr_nmethod(nm);
}
--- a/src/hotspot/share/logging/logTag.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/logging/logTag.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -83,6 +83,7 @@
LOG_TAG(iklass) \
LOG_TAG(init) \
LOG_TAG(inlining) \
+ LOG_TAG(install) \
LOG_TAG(interpreter) \
LOG_TAG(itables) \
LOG_TAG(jfr) \
--- a/src/hotspot/share/memory/iterator.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/memory/iterator.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -322,6 +322,9 @@
// Read/write the 32-bit unsigned integer pointed to by p.
virtual void do_u4(u4* p) = 0;
+ // Read/write the bool pointed to by p.
+ virtual void do_bool(bool* p) = 0;
+
// Read/write the region specified.
virtual void do_region(u_char* start, size_t size) = 0;
--- a/src/hotspot/share/memory/metaspaceShared.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/memory/metaspaceShared.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1935,6 +1935,11 @@
*p = (u4)(uintx(obj));
}
+void ReadClosure::do_bool(bool* p) {
+ intptr_t obj = nextPtr();
+ *p = (bool)(uintx(obj));
+}
+
void ReadClosure::do_tag(int tag) {
int old_tag;
old_tag = (int)(intptr_t)nextPtr();
--- a/src/hotspot/share/memory/metaspaceShared.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/memory/metaspaceShared.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -125,6 +125,11 @@
do_ptr(&ptr);
}
+ void do_bool(bool *p) {
+ void* ptr = (void*)(uintx(*p));
+ do_ptr(&ptr);
+ }
+
void do_tag(int tag) {
_dump_region->append_intptr_t((intptr_t)tag);
}
@@ -154,6 +159,8 @@
void do_u4(u4* p);
+ void do_bool(bool *p);
+
void do_tag(int tag);
void do_oop(oop *p);
--- a/src/hotspot/share/oops/instanceKlass.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/oops/instanceKlass.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -438,6 +438,8 @@
_static_field_size(parser.static_field_size()),
_nonstatic_oop_map_size(nonstatic_oop_map_size(parser.total_oop_map_count())),
_itable_len(parser.itable_size()),
+ _init_thread(NULL),
+ _init_state(allocated),
_reference_type(parser.reference_type())
{
set_vtable_length(parser.vtable_size());
@@ -1071,11 +1073,13 @@
Handle h_init_lock(THREAD, init_lock());
if (h_init_lock() != NULL) {
ObjectLocker ol(h_init_lock, THREAD);
+ set_init_thread(NULL); // reset _init_thread before changing _init_state
set_init_state(state);
fence_and_clear_init_lock();
ol.notify_all(CHECK);
} else {
assert(h_init_lock() != NULL, "The initialization state should never be set twice");
+ set_init_thread(NULL); // reset _init_thread before changing _init_state
set_init_state(state);
}
}
@@ -3710,6 +3714,7 @@
: (_init_state < state);
assert(good_state || state == allocated, "illegal state transition");
#endif
+ assert(_init_thread == NULL, "should be cleared before state change");
_init_state = (u1)state;
}
--- a/src/hotspot/share/oops/instanceKlass.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/oops/instanceKlass.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -247,7 +247,7 @@
u2 _misc_flags;
u2 _minor_version; // minor version number of class file
u2 _major_version; // major version number of class file
- Thread* _init_thread; // Pointer to current thread doing initialization (to handle recusive initialization)
+ Thread* _init_thread; // Pointer to current thread doing initialization (to handle recursive initialization)
OopMapCache* volatile _oop_map_cache; // OopMapCache for all methods in the klass (allocated lazily)
JNIid* _jni_ids; // First JNI identifier for static fields in this class
jmethodID* volatile _methods_jmethod_ids; // jmethodIDs corresponding to method_idnum, or NULL if none
--- a/src/hotspot/share/oops/method.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/oops/method.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -835,6 +835,7 @@
void Method::print_made_not_compilable(int comp_level, bool is_osr, bool report, const char* reason) {
+ assert(reason != NULL, "must provide a reason");
if (PrintCompilation && report) {
ttyLocker ttyl;
tty->print("made not %scompilable on ", is_osr ? "OSR " : "");
@@ -895,7 +896,7 @@
}
// call this when compiler finds that this method is not compilable
-void Method::set_not_compilable(int comp_level, bool report, const char* reason) {
+void Method::set_not_compilable(const char* reason, int comp_level, bool report) {
if (is_always_compilable()) {
// Don't mark a method which should be always compilable
return;
@@ -926,7 +927,7 @@
return false;
}
-void Method::set_not_osr_compilable(int comp_level, bool report, const char* reason) {
+void Method::set_not_osr_compilable(const char* reason, int comp_level, bool report) {
print_made_not_compilable(comp_level, /*is_osr*/ true, report, reason);
if (comp_level == CompLevel_all) {
set_not_c1_osr_compilable();
--- a/src/hotspot/share/oops/method.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/oops/method.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -945,14 +945,14 @@
// whether it is not compilable for another reason like having a
// breakpoint set in it.
bool is_not_compilable(int comp_level = CompLevel_any) const;
- void set_not_compilable(int comp_level = CompLevel_all, bool report = true, const char* reason = NULL);
- void set_not_compilable_quietly(int comp_level = CompLevel_all) {
- set_not_compilable(comp_level, false);
+ void set_not_compilable(const char* reason, int comp_level = CompLevel_all, bool report = true);
+ void set_not_compilable_quietly(const char* reason, int comp_level = CompLevel_all) {
+ set_not_compilable(reason, comp_level, false);
}
bool is_not_osr_compilable(int comp_level = CompLevel_any) const;
- void set_not_osr_compilable(int comp_level = CompLevel_all, bool report = true, const char* reason = NULL);
- void set_not_osr_compilable_quietly(int comp_level = CompLevel_all) {
- set_not_osr_compilable(comp_level, false);
+ void set_not_osr_compilable(const char* reason, int comp_level = CompLevel_all, bool report = true);
+ void set_not_osr_compilable_quietly(const char* reason, int comp_level = CompLevel_all) {
+ set_not_osr_compilable(reason, comp_level, false);
}
bool is_always_compilable() const;
--- a/src/hotspot/share/oops/methodData.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/oops/methodData.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -558,8 +558,14 @@
}
// Direct accessor
- uint count() const {
- return uint_at(count_off);
+ int count() const {
+ intptr_t raw_data = intptr_at(count_off);
+ if (raw_data > max_jint) {
+ raw_data = max_jint;
+ } else if (raw_data < min_jint) {
+ raw_data = min_jint;
+ }
+ return int(raw_data);
}
// Code generation support
@@ -570,8 +576,8 @@
return cell_offset(counter_cell_count);
}
- void set_count(uint count) {
- set_uint_at(count_off, count);
+ void set_count(int count) {
+ set_int_at(count_off, count);
}
void print_data_on(outputStream* st, const char* extra = NULL) const;
@@ -2386,7 +2392,7 @@
void inc_decompile_count() {
_nof_decompiles += 1;
if (decompile_count() > (uint)PerMethodRecompilationCutoff) {
- method()->set_not_compilable(CompLevel_full_optimization, true, "decompile_count > PerMethodRecompilationCutoff");
+ method()->set_not_compilable("decompile_count > PerMethodRecompilationCutoff", CompLevel_full_optimization);
}
}
uint tenure_traps() const {
--- a/src/hotspot/share/opto/matcher.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/opto/matcher.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -2066,6 +2066,12 @@
// Node is shared and has no reason to clone. Flag it as shared.
// This causes it to match into a register for the sharing.
set_shared(n); // Flag as shared and
+ if (n->is_DecodeNarrowPtr()) {
+ // Oop field/array element loads must be shared but since
+ // they are shared through a DecodeN they may appear to have
+ // a single use so force sharing here.
+ set_shared(n->in(1));
+ }
mstack.pop(); // remove node from stack
continue;
}
@@ -2098,13 +2104,6 @@
continue; // for(int i = ...)
}
- if( mop == Op_AddP && m->in(AddPNode::Base)->is_DecodeNarrowPtr()) {
- // Bases used in addresses must be shared but since
- // they are shared through a DecodeN they may appear
- // to have a single use so force sharing here.
- set_shared(m->in(AddPNode::Base)->in(1));
- }
-
// if 'n' and 'm' are part of a graph for BMI instruction, clone this node.
#ifdef X86
if (UseBMI1Instructions && is_bmi_pattern(n, m)) {
--- a/src/hotspot/share/opto/parse1.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/opto/parse1.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -2112,8 +2112,7 @@
assert(C->has_method(), "only for normal compilations");
assert(depth() == 1, "only for main compiled method");
assert(is_normal_parse(), "no barrier needed on osr entry");
- assert(method()->holder()->is_being_initialized() || method()->holder()->is_initialized(),
- "initialization should have been started");
+ assert(!method()->holder()->is_not_initialized(), "initialization should have been started");
set_parse_bci(0);
--- a/src/hotspot/share/prims/jvmti.xml Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/prims/jvmti.xml Fri Jun 07 09:38:40 2019 -0700
@@ -2824,7 +2824,7 @@
<p/>
Changes to global state are not addressed and thus remain changed.
<p/>
- The specified thread must be suspended (which implies it cannot be the current thread).
+ The specified thread must be suspended or must be the current thread.
<p/>
Both the called method and calling method must be non-native Java programming
language methods.
@@ -2849,7 +2849,7 @@
The implementation is unable to pop this frame.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are less than two stack frames on the call stack.
@@ -2910,8 +2910,7 @@
Only frames corresponding to non-native Java programming language
methods can receive notification.
<p/>
- The specified thread must either be the current thread
- or the thread must be suspended.
+ The specified thread must be suspended or must be the current thread.
</description>
<origin>jvmdi</origin>
<capabilities>
@@ -3023,7 +3022,7 @@
result type of the called method.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no more frames on the call stack.
@@ -3071,7 +3070,7 @@
<code>boolean</code>.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no frames on the call stack.
@@ -3114,7 +3113,7 @@
The result type of the called method is not <code>long</code>.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no frames on the call stack.
@@ -3157,7 +3156,7 @@
The result type of the called method is not <code>float</code>.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no frames on the call stack.
@@ -3198,7 +3197,7 @@
The result type of the called method is not <code>double</code>.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no frames on the call stack.
@@ -3235,7 +3234,7 @@
The called method has a result type.
</error>
<error id="JVMTI_ERROR_THREAD_NOT_SUSPENDED">
- Thread was not the current thread and was not suspended.
+ Thread was not suspended and was not the current thread.
</error>
<error id="JVMTI_ERROR_NO_MORE_FRAMES">
There are no frames on the call stack.
@@ -14965,6 +14964,11 @@
"RedefineClasses can be called on any modifiable class. See IsModifiableClass.
(can_redefine_classes must also be set)"
</change>
+ <change date="5 June 2019" version="13.0.0">
+ Minor PopFrame spec update:
+ - The specified thread must be suspended or must be the current thread.
+ (It was not allowed to be the current thread before.)
+ </change>
</changehistory>
</specification>
--- a/src/hotspot/share/prims/whitebox.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/prims/whitebox.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -919,9 +919,9 @@
CHECK_JNI_EXCEPTION(env);
methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
if (is_osr) {
- mh->set_not_osr_compilable(comp_level, true /* report */, "WhiteBox");
+ mh->set_not_osr_compilable("WhiteBox", comp_level);
} else {
- mh->set_not_compilable(comp_level, true /* report */, "WhiteBox");
+ mh->set_not_compilable("WhiteBox", comp_level);
}
WB_END
--- a/src/hotspot/share/runtime/arguments.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/arguments.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -537,6 +537,7 @@
{ "AllowJNIEnvProxy", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
{ "ThreadLocalHandshakes", JDK_Version::jdk(13), JDK_Version::jdk(14), JDK_Version::jdk(15) },
{ "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
+ { "FlightRecorder", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() },
// --- Deprecated alias flags (see also aliased_jvm_flags) - sorted by obsolete_in then expired_in:
{ "DefaultMaxRAMFraction", JDK_Version::jdk(8), JDK_Version::undefined(), JDK_Version::undefined() },
@@ -604,6 +605,7 @@
{ "TraceSafepointCleanupTime", LogLevel::Info, true, LOG_TAGS(safepoint, cleanup) },
{ "TraceJVMTIObjectTagging", LogLevel::Debug, true, LOG_TAGS(jvmti, objecttagging) },
{ "TraceRedefineClasses", LogLevel::Info, false, LOG_TAGS(redefine, class) },
+ { "TraceNMethodInstalls", LogLevel::Info, true, LOG_TAGS(nmethod, install) },
{ NULL, LogLevel::Off, false, LOG_TAGS(_NO_TAG) }
};
--- a/src/hotspot/share/runtime/deoptimization.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/deoptimization.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -632,7 +632,7 @@
p2i(thread), p2i(array), exec_mode);
}
#endif
- Events::log(thread, "DEOPT UNPACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT " mode %d",
+ Events::log_deopt_message(thread, "DEOPT UNPACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT " mode %d",
p2i(stub_frame.pc()), p2i(stub_frame.sp()), exec_mode);
UnrollBlock* info = array->unroll_block();
@@ -1316,7 +1316,7 @@
#endif // COMPILER2_OR_JVMCI
vframeArray* Deoptimization::create_vframeArray(JavaThread* thread, frame fr, RegisterMap *reg_map, GrowableArray<compiledVFrame*>* chunk, bool realloc_failures) {
- Events::log(thread, "DEOPT PACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT, p2i(fr.pc()), p2i(fr.sp()));
+ Events::log_deopt_message(thread, "DEOPT PACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT, p2i(fr.pc()), p2i(fr.sp()));
#ifndef PRODUCT
if (PrintDeoptimizationDetails) {
@@ -1676,7 +1676,7 @@
nmethodLocker nl(fr.pc());
// Log a message
- Events::log(thread, "Uncommon trap: trap_request=" PTR32_FORMAT " fr.pc=" INTPTR_FORMAT " relative=" INTPTR_FORMAT,
+ Events::log_deopt_message(thread, "Uncommon trap: trap_request=" PTR32_FORMAT " fr.pc=" INTPTR_FORMAT " relative=" INTPTR_FORMAT,
trap_request, p2i(fr.pc()), fr.pc() - fr.cb()->code_begin());
{
@@ -2076,7 +2076,7 @@
if (trap_method() == nm->method()) {
make_not_compilable = true;
} else {
- trap_method->set_not_compilable(CompLevel_full_optimization, true, "overflow_recompile_count > PerBytecodeRecompilationCutoff");
+ trap_method->set_not_compilable("overflow_recompile_count > PerBytecodeRecompilationCutoff", CompLevel_full_optimization);
// But give grace to the enclosing nm->method().
}
}
@@ -2090,7 +2090,7 @@
// Give up compiling
if (make_not_compilable && !nm->method()->is_not_compilable(CompLevel_full_optimization)) {
assert(make_not_entrant, "consistent");
- nm->method()->set_not_compilable(CompLevel_full_optimization);
+ nm->method()->set_not_compilable("give up compiling", CompLevel_full_optimization);
}
} // Free marked resources
--- a/src/hotspot/share/runtime/globals.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/globals.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -2455,7 +2455,7 @@
"leverage profiling for table/lookup switch") \
\
JFR_ONLY(product(bool, FlightRecorder, false, \
- "Enable Flight Recorder")) \
+ "(Deprecated) Enable Flight Recorder")) \
\
JFR_ONLY(product(ccstr, FlightRecorderOptions, NULL, \
"Flight Recorder options")) \
--- a/src/hotspot/share/runtime/jniHandles.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/jniHandles.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -396,8 +396,10 @@
block->_next = NULL;
block->_pop_frame_link = NULL;
block->_planned_capacity = block_size_in_oops;
- // _last initialized in allocate_handle
+ // _last, _free_list & _allocate_before_rebuild initialized in allocate_handle
debug_only(block->_last = NULL);
+ debug_only(block->_free_list = NULL);
+ debug_only(block->_allocate_before_rebuild = -1);
return block;
}
@@ -458,7 +460,12 @@
"only blocks first in chain should have pop frame link set");
for (int index = 0; index < current->_top; index++) {
oop* root = &(current->_handles)[index];
- f->do_oop(root);
+ oop value = *root;
+ // traverse heap pointers only, not deleted handles or free list
+ // pointers
+ if (value != NULL && Universe::heap()->is_in_reserved(value)) {
+ f->do_oop(root);
+ }
}
// the next handle block is valid only if current block is full
if (current->_top < block_size_in_oops) {
@@ -479,6 +486,8 @@
for (JNIHandleBlock* current = _next; current != NULL;
current = current->_next) {
assert(current->_last == NULL, "only first block should have _last set");
+ assert(current->_free_list == NULL,
+ "only first block should have _free_list set");
if (current->_top == 0) {
// All blocks after the first clear trailing block are already cleared.
#ifdef ASSERT
@@ -492,6 +501,8 @@
current->zap();
}
// Clear initial block
+ _free_list = NULL;
+ _allocate_before_rebuild = 0;
_last = this;
zap();
}
@@ -503,6 +514,13 @@
return (jobject) handle;
}
+ // Try free list
+ if (_free_list != NULL) {
+ oop* handle = _free_list;
+ _free_list = (oop*) *_free_list;
+ NativeAccess<IS_DEST_UNINITIALIZED>::oop_store(handle, obj);
+ return (jobject) handle;
+ }
// Check if unused block follow last
if (_last->_next != NULL) {
// update last and retry
@@ -510,16 +528,51 @@
return allocate_handle(obj);
}
- // Append new block
- Thread* thread = Thread::current();
- Handle obj_handle(thread, obj);
- // This can block, so we need to preserve obj across call.
- _last->_next = JNIHandleBlock::allocate_block(thread);
- _last = _last->_next;
- obj = obj_handle();
+ // No space available, we have to rebuild free list or expand
+ if (_allocate_before_rebuild == 0) {
+ rebuild_free_list(); // updates _allocate_before_rebuild counter
+ } else {
+ // Append new block
+ Thread* thread = Thread::current();
+ Handle obj_handle(thread, obj);
+ // This can block, so we need to preserve obj across call.
+ _last->_next = JNIHandleBlock::allocate_block(thread);
+ _last = _last->_next;
+ _allocate_before_rebuild--;
+ obj = obj_handle();
+ }
return allocate_handle(obj); // retry
}
+void JNIHandleBlock::rebuild_free_list() {
+ assert(_allocate_before_rebuild == 0 && _free_list == NULL, "just checking");
+ int free = 0;
+ int blocks = 0;
+ for (JNIHandleBlock* current = this; current != NULL; current = current->_next) {
+ for (int index = 0; index < current->_top; index++) {
+ oop* handle = &(current->_handles)[index];
+ if (*handle == NULL) {
+ // this handle was cleared out by a delete call, reuse it
+ *handle = (oop) _free_list;
+ _free_list = handle;
+ free++;
+ }
+ }
+ // we should not rebuild free list if there are unused handles at the end
+ assert(current->_top == block_size_in_oops, "just checking");
+ blocks++;
+ }
+ // Heuristic: if more than half of the handles are free we rebuild next time
+ // as well, otherwise we append a corresponding number of new blocks before
+ // attempting a free list rebuild again.
+ int total = blocks * block_size_in_oops;
+ int extra = total - 2*free;
+ if (extra > 0) {
+ // Not as many free handles as we would like - compute number of new blocks to append
+ _allocate_before_rebuild = (extra + block_size_in_oops - 1) / block_size_in_oops;
+ }
+}
+
bool JNIHandleBlock::contains(jobject handle) const {
return ((jobject)&_handles[0] <= handle && handle<(jobject)&_handles[_top]);
--- a/src/hotspot/share/runtime/jniHandles.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/jniHandles.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -148,6 +148,8 @@
// Having two types of blocks complicates the code and the space overhead in negligible.
JNIHandleBlock* _last; // Last block in use
JNIHandleBlock* _pop_frame_link; // Block to restore on PopLocalFrame call
+ oop* _free_list; // Handle free list
+ int _allocate_before_rebuild; // Number of blocks to allocate before rebuilding free list
// Check JNI, "planned capacity" for current frame (or push/ensure)
size_t _planned_capacity;
@@ -163,6 +165,9 @@
// Fill block with bad_handle values
void zap() NOT_DEBUG_RETURN;
+ // Free list computation
+ void rebuild_free_list();
+
// No more handles in the both the current and following blocks
void clear() { _top = 0; }
--- a/src/hotspot/share/runtime/os.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/os.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -518,6 +518,10 @@
static void abort(bool dump_core = true);
// Die immediately, no exit hook, no abort hook, no cleanup.
+ // Dump a core file, if possible, for debugging. os::abort() is the
+ // preferred means to abort the VM on error. os::die() should only
+ // be called if something has gone badly wrong. CreateCoredumpOnCrash
+ // is intentionally not honored by this function.
static void die();
// File i/o operations
--- a/src/hotspot/share/runtime/thread.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/thread.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1592,6 +1592,78 @@
}
}
+// Attempt to enlarge the array for per thread counters.
+jlong* resize_counters_array(jlong* old_counters, int current_size, int new_size) {
+ jlong* new_counters = NEW_C_HEAP_ARRAY(jlong, new_size, mtJVMCI);
+ if (new_counters == NULL) {
+ return NULL;
+ }
+ if (old_counters == NULL) {
+ old_counters = new_counters;
+ memset(old_counters, 0, sizeof(jlong) * new_size);
+ } else {
+ for (int i = 0; i < MIN2((int) current_size, new_size); i++) {
+ new_counters[i] = old_counters[i];
+ }
+ if (new_size > current_size) {
+ memset(new_counters + current_size, 0, sizeof(jlong) * (new_size - current_size));
+ }
+ FREE_C_HEAP_ARRAY(jlong, old_counters);
+ }
+ return new_counters;
+}
+
+// Attempt to enlarge the array for per thread counters.
+bool JavaThread::resize_counters(int current_size, int new_size) {
+ jlong* new_counters = resize_counters_array(_jvmci_counters, current_size, new_size);
+ if (new_counters == NULL) {
+ return false;
+ } else {
+ _jvmci_counters = new_counters;
+ return true;
+ }
+}
+
+class VM_JVMCIResizeCounters : public VM_Operation {
+ private:
+ int _new_size;
+ bool _failed;
+
+ public:
+ VM_JVMCIResizeCounters(int new_size) : _new_size(new_size), _failed(false) { }
+ VMOp_Type type() const { return VMOp_JVMCIResizeCounters; }
+ bool allow_nested_vm_operations() const { return true; }
+ void doit() {
+ // Resize the old thread counters array
+ jlong* new_counters = resize_counters_array(JavaThread::_jvmci_old_thread_counters, JVMCICounterSize, _new_size);
+ if (new_counters == NULL) {
+ _failed = true;
+ return;
+ } else {
+ JavaThread::_jvmci_old_thread_counters = new_counters;
+ }
+
+ // Now resize each threads array
+ for (JavaThreadIteratorWithHandle jtiwh; JavaThread *tp = jtiwh.next(); ) {
+ if (!tp->resize_counters(JVMCICounterSize, _new_size)) {
+ _failed = true;
+ break;
+ }
+ }
+ if (!_failed) {
+ JVMCICounterSize = _new_size;
+ }
+ }
+
+ bool failed() { return _failed; }
+};
+
+bool JavaThread::resize_all_jvmci_counters(int new_size) {
+ VM_JVMCIResizeCounters op(new_size);
+ VMThread::execute(&op);
+ return !op.failed();
+}
+
#endif // INCLUDE_JVMCI
// A JavaThread is a normal Java thread
@@ -1630,11 +1702,9 @@
_in_retryable_allocation = false;
_jvmci._alternate_call_target = NULL;
assert(_jvmci._implicit_exception_pc == NULL, "must be");
+ _jvmci_counters = NULL;
if (JVMCICounterSize > 0) {
- _jvmci_counters = NEW_C_HEAP_ARRAY(jlong, JVMCICounterSize, mtInternal);
- memset(_jvmci_counters, 0, sizeof(jlong) * JVMCICounterSize);
- } else {
- _jvmci_counters = NULL;
+ resize_counters(0, (int) JVMCICounterSize);
}
#endif // INCLUDE_JVMCI
_reserved_stack_activation = NULL; // stack base not known yet
@@ -3773,7 +3843,7 @@
#if INCLUDE_JVMCI
if (JVMCICounterSize > 0) {
- JavaThread::_jvmci_old_thread_counters = NEW_C_HEAP_ARRAY(jlong, JVMCICounterSize, mtInternal);
+ JavaThread::_jvmci_old_thread_counters = NEW_C_HEAP_ARRAY(jlong, JVMCICounterSize, mtJVMCI);
memset(JavaThread::_jvmci_old_thread_counters, 0, sizeof(jlong) * JVMCICounterSize);
} else {
JavaThread::_jvmci_old_thread_counters = NULL;
--- a/src/hotspot/share/runtime/thread.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/thread.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -1152,6 +1152,11 @@
public:
static jlong* _jvmci_old_thread_counters;
static void collect_counters(jlong* array, int length);
+
+ bool resize_counters(int current_size, int new_size);
+
+ static bool resize_all_jvmci_counters(int new_size);
+
private:
#endif // INCLUDE_JVMCI
--- a/src/hotspot/share/runtime/tieredThresholdPolicy.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/tieredThresholdPolicy.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -412,8 +412,14 @@
// method == inlinee if the event originated in the main method
method_back_branch_event(method, inlinee, bci, comp_level, nm, thread);
// Check if event led to a higher level OSR compilation
- nmethod* osr_nm = inlinee->lookup_osr_nmethod_for(bci, comp_level, false);
- if (osr_nm != NULL && osr_nm->comp_level() > comp_level) {
+ CompLevel expected_comp_level = comp_level;
+ if (inlinee->is_not_osr_compilable(expected_comp_level)) {
+ // It's not possble to reach the expected level so fall back to simple.
+ expected_comp_level = CompLevel_simple;
+ }
+ nmethod* osr_nm = inlinee->lookup_osr_nmethod_for(bci, expected_comp_level, false);
+ assert(osr_nm == NULL || osr_nm->comp_level() >= expected_comp_level, "lookup_osr_nmethod_for is broken");
+ if (osr_nm != NULL) {
// Perform OSR with new nmethod
return osr_nm;
}
@@ -449,9 +455,20 @@
// in the interpreter and then compile with C2 (the transition function will request that,
// see common() ). If the method cannot be compiled with C2 but still can with C1, compile it with
// pure C1.
- if (!can_be_compiled(mh, level)) {
+ if ((bci == InvocationEntryBci && !can_be_compiled(mh, level))) {
if (level == CompLevel_full_optimization && can_be_compiled(mh, CompLevel_simple)) {
- compile(mh, bci, CompLevel_simple, thread);
+ compile(mh, bci, CompLevel_simple, thread);
+ }
+ return;
+ }
+ if ((bci != InvocationEntryBci && !can_be_osr_compiled(mh, level))) {
+ if (level == CompLevel_full_optimization && can_be_osr_compiled(mh, CompLevel_simple)) {
+ nmethod* osr_nm = mh->lookup_osr_nmethod_for(bci, CompLevel_simple, false);
+ if (osr_nm != NULL && osr_nm->comp_level() > CompLevel_simple) {
+ // Invalidate the existing OSR nmethod so that a compile at CompLevel_simple is permitted.
+ osr_nm->make_not_entrant();
+ }
+ compile(mh, bci, CompLevel_simple, thread);
}
return;
}
--- a/src/hotspot/share/runtime/vmOperations.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/vmOperations.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -113,6 +113,7 @@
template(LinuxDllLoad) \
template(RotateGCLog) \
template(WhiteBoxOperation) \
+ template(JVMCIResizeCounters) \
template(ClassLoaderStatsOperation) \
template(ClassLoaderHierarchyOperation) \
template(DumpHashtable) \
--- a/src/hotspot/share/runtime/vmStructs.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/runtime/vmStructs.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -526,7 +526,7 @@
nonstatic_field(ClassLoaderData, _is_unsafe_anonymous, bool) \
volatile_nonstatic_field(ClassLoaderData, _dictionary, Dictionary*) \
\
- static_field(ClassLoaderDataGraph, _head, ClassLoaderData*) \
+ static_ptr_volatile_field(ClassLoaderDataGraph, _head, ClassLoaderData*) \
\
/**********/ \
/* Arrays */ \
--- a/src/hotspot/share/services/diagnosticCommand.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/services/diagnosticCommand.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -48,6 +48,7 @@
#include "services/management.hpp"
#include "services/writeableFlags.hpp"
#include "utilities/debug.hpp"
+#include "utilities/events.hpp"
#include "utilities/formatBuffer.hpp"
#include "utilities/macros.hpp"
@@ -95,6 +96,7 @@
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export, true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<EventLogDCmd>(full_export, true, false));
#if INCLUDE_JVMTI // Both JVMTI and SERVICES have to be enabled to have this dcmd
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export, true, false));
#endif // INCLUDE_JVMTI
@@ -965,6 +967,45 @@
}
//---< END >--- CodeHeap State Analytics.
+EventLogDCmd::EventLogDCmd(outputStream* output, bool heap) :
+ DCmdWithParser(output, heap),
+ _log("log", "Name of log to be printed. If omitted, all logs are printed.", "STRING", false, NULL),
+ _max("max", "Maximum number of events to be printed (newest first). If omitted, all events are printed.", "STRING", false, NULL)
+{
+ _dcmdparser.add_dcmd_option(&_log);
+ _dcmdparser.add_dcmd_option(&_max);
+}
+
+void EventLogDCmd::execute(DCmdSource source, TRAPS) {
+ const char* max_value = _max.value();
+ long max = -1;
+ if (max_value != NULL) {
+ char* endptr = NULL;
+ max = ::strtol(max_value, &endptr, 10);
+ if (max == 0 && max_value == endptr) {
+ output()->print_cr("Invalid max option: \"%s\".", max_value);
+ return;
+ }
+ }
+ const char* log_name = _log.value();
+ if (log_name != NULL) {
+ Events::print_one(output(), log_name, max);
+ } else {
+ Events::print_all(output(), max);
+ }
+}
+
+int EventLogDCmd::num_arguments() {
+ ResourceMark rm;
+ EventLogDCmd* dcmd = new EventLogDCmd(NULL, false);
+ if (dcmd != NULL) {
+ DCmdMark mark(dcmd);
+ return dcmd->_dcmdparser.num_arguments();
+ } else {
+ return 0;
+ }
+}
+
void CompilerDirectivesPrintDCmd::execute(DCmdSource source, TRAPS) {
DirectivesStack::print(output());
}
--- a/src/hotspot/share/services/diagnosticCommand.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/services/diagnosticCommand.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -888,4 +888,28 @@
};
#endif // INCLUDE_JVMTI
+class EventLogDCmd : public DCmdWithParser {
+protected:
+ DCmdArgument<char*> _log;
+ DCmdArgument<char*> _max;
+public:
+ EventLogDCmd(outputStream* output, bool heap);
+ static const char* name() {
+ return "VM.events";
+ }
+ static const char* description() {
+ return "Print VM event logs";
+ }
+ static const char* impact() {
+ return "Low: Depends on event log size. ";
+ }
+ static const JavaPermission permission() {
+ JavaPermission p = {"java.lang.management.ManagementPermission",
+ "monitor", NULL};
+ return p;
+ }
+ static int num_arguments();
+ virtual void execute(DCmdSource source, TRAPS);
+};
+
#endif // SHARE_SERVICES_DIAGNOSTICCOMMAND_HPP
--- a/src/hotspot/share/utilities/events.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/events.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -51,26 +51,51 @@
}
// For each registered event logger, print out the current contents of
-// the buffer. This is normally called when the JVM is crashing.
-void Events::print_all(outputStream* out) {
+// the buffer.
+void Events::print_all(outputStream* out, int max) {
EventLog* log = _logs;
while (log != NULL) {
- log->print_log_on(out);
+ log->print_log_on(out, max);
log = log->next();
}
}
+// Print a single event log specified by name.
+void Events::print_one(outputStream* out, const char* log_name, int max) {
+ EventLog* log = _logs;
+ int num_printed = 0;
+ while (log != NULL) {
+ if (log->matches_name_or_handle(log_name)) {
+ log->print_log_on(out, max);
+ num_printed ++;
+ }
+ log = log->next();
+ }
+ // Write a short error note if no name matched.
+ if (num_printed == 0) {
+ out->print_cr("The name \"%s\" did not match any known event log. "
+ "Valid event log names are:", log_name);
+ EventLog* log = _logs;
+ while (log != NULL) {
+ log->print_names(out);
+ out->cr();
+ log = log->next();
+ }
+ }
+}
+
+
void Events::print() {
print_all(tty);
}
void Events::init() {
if (LogEvents) {
- _messages = new StringEventLog("Events");
- _exceptions = new ExceptionsEventLog("Internal exceptions");
- _redefinitions = new StringEventLog("Classes redefined");
- _class_unloading = new UnloadingEventLog("Classes unloaded");
- _deopt_messages = new StringEventLog("Deoptimization events");
+ _messages = new StringEventLog("Events", "events");
+ _exceptions = new ExceptionsEventLog("Internal exceptions", "exc");
+ _redefinitions = new StringEventLog("Classes redefined", "redef");
+ _class_unloading = new UnloadingEventLog("Classes unloaded", "unload");
+ _deopt_messages = new StringEventLog("Deoptimization events", "deopt");
}
}
--- a/src/hotspot/share/utilities/events.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/events.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -29,6 +29,8 @@
#include "runtime/mutexLocker.hpp"
#include "runtime/thread.hpp"
#include "utilities/formatBuffer.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
#include "utilities/vmError.hpp"
// Events and EventMark provide interfaces to log events taking place in the vm.
@@ -59,7 +61,15 @@
// crashes.
EventLog();
- virtual void print_log_on(outputStream* out) = 0;
+ // Print log to output stream.
+ virtual void print_log_on(outputStream* out, int max = -1) = 0;
+
+ // Returns true if s matches either the log name or the log handle.
+ virtual bool matches_name_or_handle(const char* s) const = 0;
+
+ // Print log names (for help output of VM.events).
+ virtual void print_names(outputStream* out) const = 0;
+
};
@@ -78,16 +88,21 @@
protected:
Mutex _mutex;
+ // Name is printed out as a header.
const char* _name;
+ // Handle is a short specifier used to select this particular event log
+ // for printing (see VM.events command).
+ const char* _handle;
int _length;
int _index;
int _count;
EventRecord<T>* _records;
public:
- EventLogBase<T>(const char* name, int length = LogEventsBufferEntries):
+ EventLogBase<T>(const char* name, const char* handle, int length = LogEventsBufferEntries):
_mutex(Mutex::event, name, false, Monitor::_safepoint_check_never),
_name(name),
+ _handle(handle),
_length(length),
_index(0),
_count(0) {
@@ -116,10 +131,16 @@
}
// Print the contents of the log
- void print_log_on(outputStream* out);
+ void print_log_on(outputStream* out, int max = -1);
+
+ // Returns true if s matches either the log name or the log handle.
+ bool matches_name_or_handle(const char* s) const;
+
+ // Print log names (for help output of VM.events).
+ void print_names(outputStream* out) const;
private:
- void print_log_impl(outputStream* out);
+ void print_log_impl(outputStream* out, int max = -1);
// Print a single element. A templated implementation might need to
// be declared by subclasses.
@@ -145,7 +166,8 @@
template <size_t bufsz>
class FormatStringEventLog : public EventLogBase< FormatStringLogMessage<bufsz> > {
public:
- FormatStringEventLog(const char* name, int count = LogEventsBufferEntries) : EventLogBase< FormatStringLogMessage<bufsz> >(name, count) {}
+ FormatStringEventLog(const char* name, const char* short_name, int count = LogEventsBufferEntries)
+ : EventLogBase< FormatStringLogMessage<bufsz> >(name, short_name, count) {}
void logv(Thread* thread, const char* format, va_list ap) ATTRIBUTE_PRINTF(3, 0) {
if (!this->should_log()) return;
@@ -173,7 +195,8 @@
// Event log for class unloading events to materialize the class name in place in the log stream.
class UnloadingEventLog : public EventLogBase<StringLogMessage> {
public:
- UnloadingEventLog(const char* name, int count = LogEventsBufferEntries) : EventLogBase<StringLogMessage>(name, count) {}
+ UnloadingEventLog(const char* name, const char* short_name, int count = LogEventsBufferEntries)
+ : EventLogBase<StringLogMessage>(name, short_name, count) {}
void log(Thread* thread, InstanceKlass* ik);
};
@@ -181,7 +204,8 @@
// Event log for exceptions
class ExceptionsEventLog : public ExtendedStringEventLog {
public:
- ExceptionsEventLog(const char* name, int count = LogEventsBufferEntries) : ExtendedStringEventLog(name, count) {}
+ ExceptionsEventLog(const char* name, const char* short_name, int count = LogEventsBufferEntries)
+ : ExtendedStringEventLog(name, short_name, count) {}
void log(Thread* thread, Handle h_exception, const char* message, const char* file, int line);
};
@@ -209,7 +233,13 @@
// Class unloading events
static UnloadingEventLog* _class_unloading;
public:
- static void print_all(outputStream* out);
+
+ // Print all event logs; limit number of events per event log to be printed with max
+ // (max == -1 prints all events).
+ static void print_all(outputStream* out, int max = -1);
+
+ // Print a single event log specified by name or handle.
+ static void print_one(outputStream* out, const char* log_name, int max = -1);
// Dump all events to the tty
static void print();
@@ -279,21 +309,31 @@
}
}
-
template <class T>
-inline void EventLogBase<T>::print_log_on(outputStream* out) {
+inline void EventLogBase<T>::print_log_on(outputStream* out, int max) {
if (Thread::current_or_null() == NULL) {
// Not yet attached? Don't try to use locking
- print_log_impl(out);
+ print_log_impl(out, max);
} else {
MutexLocker ml(&_mutex, Mutex::_no_safepoint_check_flag);
- print_log_impl(out);
+ print_log_impl(out, max);
}
}
+template <class T>
+inline bool EventLogBase<T>::matches_name_or_handle(const char* s) const {
+ return ::strcasecmp(s, _name) == 0 ||
+ ::strcasecmp(s, _handle) == 0;
+}
+
+template <class T>
+inline void EventLogBase<T>::print_names(outputStream* out) const {
+ out->print("\"%s\" : %s", _handle, _name);
+}
+
// Dump the ring buffer entries that current have entries.
template <class T>
-inline void EventLogBase<T>::print_log_impl(outputStream* out) {
+inline void EventLogBase<T>::print_log_impl(outputStream* out, int max) {
out->print_cr("%s (%d events):", _name, _count);
if (_count == 0) {
out->print_cr("No events");
@@ -301,18 +341,36 @@
return;
}
+ int printed = 0;
if (_count < _length) {
for (int i = 0; i < _count; i++) {
+ if (max > 0 && printed == max) {
+ break;
+ }
print(out, _records[i]);
+ printed ++;
}
} else {
for (int i = _index; i < _length; i++) {
+ if (max > 0 && printed == max) {
+ break;
+ }
print(out, _records[i]);
+ printed ++;
}
for (int i = 0; i < _index; i++) {
+ if (max > 0 && printed == max) {
+ break;
+ }
print(out, _records[i]);
+ printed ++;
}
}
+
+ if (printed == max) {
+ out->print_cr("...(skipped)");
+ }
+
out->cr();
}
--- a/src/hotspot/share/utilities/globalDefinitions.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -1085,6 +1085,28 @@
#undef JAVA_INTEGER_OP
+//----------------------------------------------------------------------------------------------------
+// The goal of this code is to provide saturating operations for int/uint.
+// Checks overflow conditions and saturates the result to min_jint/max_jint.
+#define SATURATED_INTEGER_OP(OP, NAME, TYPE1, TYPE2) \
+inline int NAME (TYPE1 in1, TYPE2 in2) { \
+ jlong res = static_cast<jlong>(in1); \
+ res OP ## = static_cast<jlong>(in2); \
+ if (res > max_jint) { \
+ res = max_jint; \
+ } else if (res < min_jint) { \
+ res = min_jint; \
+ } \
+ return static_cast<int>(res); \
+}
+
+SATURATED_INTEGER_OP(+, saturated_add, int, int)
+SATURATED_INTEGER_OP(+, saturated_add, int, uint)
+SATURATED_INTEGER_OP(+, saturated_add, uint, int)
+SATURATED_INTEGER_OP(+, saturated_add, uint, uint)
+
+#undef SATURATED_INTEGER_OP
+
// Dereference vptr
// All C++ compilers that we know of have the vtbl pointer in the first
// word. If there are exceptions, this function needs to be made compiler
--- a/src/hotspot/share/utilities/ostream.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/ostream.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -312,6 +312,7 @@
buffer = NEW_C_HEAP_ARRAY(char, buffer_length, mtInternal);
buffer_pos = 0;
buffer_fixed = false;
+ zero_terminate();
}
// useful for output to fixed chunks of memory, such as performance counters
@@ -320,6 +321,7 @@
buffer = fixed_buffer;
buffer_pos = 0;
buffer_fixed = true;
+ zero_terminate();
}
void stringStream::write(const char* s, size_t len) {
@@ -343,9 +345,9 @@
// invariant: buffer is always null-terminated
guarantee(buffer_pos + write_len + 1 <= buffer_length, "stringStream oob");
if (write_len > 0) {
- buffer[buffer_pos + write_len] = 0;
memcpy(buffer + buffer_pos, s, write_len);
buffer_pos += write_len;
+ zero_terminate();
}
// Note that the following does not depend on write_len.
@@ -354,7 +356,18 @@
update_position(s, len);
}
-char* stringStream::as_string() {
+void stringStream::zero_terminate() {
+ assert(buffer != NULL &&
+ buffer_pos < buffer_length, "sanity");
+ buffer[buffer_pos] = '\0';
+}
+
+void stringStream::reset() {
+ buffer_pos = 0; _precount = 0; _position = 0;
+ zero_terminate();
+}
+
+char* stringStream::as_string() const {
char* copy = NEW_RESOURCE_ARRAY(char, buffer_pos + 1);
strncpy(copy, buffer, buffer_pos);
copy[buffer_pos] = 0; // terminating null
--- a/src/hotspot/share/utilities/ostream.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/ostream.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -198,6 +198,10 @@
size_t buffer_pos;
size_t buffer_length;
bool buffer_fixed;
+
+ // zero terminate at buffer_pos.
+ void zero_terminate();
+
public:
// Create a stringStream using an internal buffer of initially initial_bufsize size;
// will be enlarged on demand. There is no maximum cap.
@@ -209,10 +213,10 @@
virtual void write(const char* c, size_t len);
// Return number of characters written into buffer, excluding terminating zero and
// subject to truncation in static buffer mode.
- size_t size() { return buffer_pos; }
- const char* base() { return buffer; }
- void reset() { buffer_pos = 0; _precount = 0; _position = 0; }
- char* as_string();
+ size_t size() const { return buffer_pos; }
+ const char* base() const { return buffer; }
+ void reset();
+ char* as_string() const;
};
class fileStream : public outputStream {
--- a/src/hotspot/share/utilities/vmError.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/vmError.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -406,12 +406,16 @@
return Atomic::load(&_step_start_time);
}
+void VMError::clear_step_start_time() {
+ return Atomic::store((jlong)0, &_step_start_time);
+}
+
void VMError::report(outputStream* st, bool _verbose) {
# define BEGIN if (_current_step == 0) { _current_step = __LINE__;
# define STEP(s) } if (_current_step < __LINE__) { _current_step = __LINE__; _current_step_info = s; \
record_step_start_time(); _step_did_timeout = false;
-# define END }
+# define END clear_step_start_time(); }
// don't allocate large buffer on stack
static char buf[O_BUFLEN];
@@ -451,6 +455,15 @@
// Step to global timeout ratio is 4:1, so in order to be absolutely sure we hit the
// global timeout, let's execute the timeout step five times.
// See corresponding test in test/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java
+ STEP("setup for test unresponsive error reporting step")
+ if (_verbose && TestUnresponsiveErrorHandler) {
+ // We record reporting_start_time for this test here because we
+ // care about the time spent executing TIMEOUT_TEST_STEP and not
+ // about the time it took us to get here.
+ tty->print_cr("Recording reporting_start_time for TestUnresponsiveErrorHandler.");
+ record_reporting_start_time();
+ }
+
#define TIMEOUT_TEST_STEP STEP("test unresponsive error reporting step") \
if (_verbose && TestUnresponsiveErrorHandler) { os::infinite_sleep(); }
TIMEOUT_TEST_STEP
@@ -1358,7 +1371,14 @@
_error_reported = true;
reporting_started();
- record_reporting_start_time();
+ if (!TestUnresponsiveErrorHandler) {
+ // Record reporting_start_time unless we're running the
+ // TestUnresponsiveErrorHandler test. For that test we record
+ // reporting_start_time at the beginning of the test.
+ record_reporting_start_time();
+ } else {
+ out.print_raw_cr("Delaying recording reporting_start_time for TestUnresponsiveErrorHandler.");
+ }
if (ShowMessageBoxOnError || PauseAtExit) {
show_message_box(buffer, sizeof(buffer));
@@ -1665,7 +1685,9 @@
// Timestamp is stored in nanos.
if (reporting_start_time_l > 0) {
const jlong end = reporting_start_time_l + (jlong)ErrorLogTimeout * TIMESTAMP_TO_SECONDS_FACTOR;
- if (end <= now) {
+ if (end <= now && !_reporting_did_timeout) {
+ // We hit ErrorLogTimeout and we haven't interrupted the reporting
+ // thread yet.
_reporting_did_timeout = true;
interrupt_reporting_thread();
return true; // global timeout
@@ -1678,7 +1700,9 @@
// hang for some reason, so this simple rule allows for three hanging step and still
// hopefully leaves time enough for the rest of the steps to finish.
const jlong end = step_start_time_l + (jlong)ErrorLogTimeout * TIMESTAMP_TO_SECONDS_FACTOR / 4;
- if (end <= now) {
+ if (end <= now && !_step_did_timeout) {
+ // The step timed out and we haven't interrupted the reporting
+ // thread yet.
_step_did_timeout = true;
interrupt_reporting_thread();
return false; // (Not a global timeout)
--- a/src/hotspot/share/utilities/vmError.hpp Thu Jun 06 15:46:36 2019 +0300
+++ b/src/hotspot/share/utilities/vmError.hpp Fri Jun 07 09:38:40 2019 -0700
@@ -135,6 +135,7 @@
static jlong get_reporting_start_time();
static void record_step_start_time();
static jlong get_step_start_time();
+ static void clear_step_start_time();
public:
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java Fri Jun 07 09:38:40 2019 -0700
@@ -447,8 +447,8 @@
}
/**
- * This method is called by trusted subclasses of ObjectOutputStream that
- * constructed ObjectOutputStream using the protected no-arg constructor.
+ * This method is called by trusted subclasses of ObjectInputStream that
+ + constructed ObjectInputStream using the protected no-arg constructor.
* The subclass is expected to provide an override method with the modifier
* "final".
*
--- a/src/java.base/share/classes/java/io/ObjectOutputStream.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -357,8 +357,8 @@
/**
* Method used by subclasses to override the default writeObject method.
- * This method is called by trusted subclasses of ObjectInputStream that
- * constructed ObjectInputStream using the protected no-arg constructor.
+ * This method is called by trusted subclasses of ObjectOutputStream that
+ * constructed ObjectOutputStream using the protected no-arg constructor.
* The subclass is expected to provide an override method with the modifier
* "final".
*
--- a/src/java.base/share/classes/java/io/PrintWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/io/PrintWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -704,9 +704,8 @@
/**
* Terminates the current line by writing the line separator string. The
- * line separator string is defined by the system property
- * {@code line.separator}, and is not necessarily a single newline
- * character ({@code '\n'}).
+ * line separator is {@link System#lineSeparator()} and is not necessarily
+ * a single newline character ({@code '\n'}).
*/
public void println() {
newLine();
--- a/src/java.base/share/classes/java/lang/Enum.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/Enum.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -59,6 +59,8 @@
* @see Class#getEnumConstants()
* @see java.util.EnumSet
* @see java.util.EnumMap
+ * @jls 8.9 Enum Types
+ * @jls 8.9.3 Enum Members
* @since 1.5
*/
@SuppressWarnings("serial") // No serialVersionUID needed due to
@@ -283,7 +285,7 @@
}
/**
- * A <a href="package-summary.html#nominal">nominal descriptor</a> for an
+ * A <a href="{@docRoot}/java.base/java/lang/constant/package-summary.html#nominal">nominal descriptor</a> for an
* {@code enum} constant.
*
* @param <E> the type of the enum constant
--- a/src/java.base/share/classes/java/lang/Runtime.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/Runtime.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -639,15 +639,20 @@
public native long maxMemory();
/**
- * Runs the garbage collector.
- * Calling this method suggests that the Java virtual machine expend
- * effort toward recycling unused objects in order to make the memory
- * they currently occupy available for quick reuse. When control
- * returns from the method call, the virtual machine has made
- * its best effort to recycle all discarded objects.
+ * Runs the garbage collector in the Java Virtual Machine.
+ * <p>
+ * Calling this method suggests that the Java Virtual Machine
+ * expend effort toward recycling unused objects in order to
+ * make the memory they currently occupy available for reuse
+ * by the Java Virtual Machine.
+ * When control returns from the method call, the Java Virtual Machine
+ * has made a best effort to reclaim space from all unused objects.
+ * There is no guarantee that this effort will recycle any particular
+ * number of unused objects, reclaim any particular amount of space, or
+ * complete at any particular time, if at all, before the method returns or ever.
* <p>
* The name {@code gc} stands for "garbage
- * collector". The virtual machine performs this recycling
+ * collector". The Java Virtual Machine performs this recycling
* process automatically as needed, in a separate thread, even if the
* {@code gc} method is not invoked explicitly.
* <p>
--- a/src/java.base/share/classes/java/lang/String.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/String.java Fri Jun 07 09:38:40 2019 -0700
@@ -36,6 +36,7 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.Formatter;
+import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
@@ -2797,11 +2798,6 @@
return indexOfNonWhitespace() == length();
}
- private Stream<String> lines(int maxLeading, int maxTrailing) {
- return isLatin1() ? StringLatin1.lines(value, maxLeading, maxTrailing)
- : StringUTF16.lines(value, maxLeading, maxTrailing);
- }
-
/**
* Returns a stream of lines extracted from this string,
* separated by line terminators.
@@ -2833,7 +2829,7 @@
* @since 11
*/
public Stream<String> lines() {
- return lines(0, 0);
+ return isLatin1() ? StringLatin1.lines(value) : StringUTF16.lines(value);
}
/**
@@ -2873,12 +2869,10 @@
* @since 12
*/
public String indent(int n) {
- return isEmpty() ? "" : indent(n, false);
- }
-
- private String indent(int n, boolean removeBlanks) {
- Stream<String> stream = removeBlanks ? lines(Integer.MAX_VALUE, Integer.MAX_VALUE)
- : lines();
+ if (isEmpty()) {
+ return "";
+ }
+ Stream<String> stream = lines();
if (n > 0) {
final String spaces = " ".repeat(n);
stream = stream.map(s -> spaces + s);
@@ -2901,6 +2895,265 @@
}
/**
+ * Returns a string whose value is this string, with incidental
+ * {@linkplain Character#isWhitespace(int) white space} removed from
+ * the beginning and end of every line.
+ * <p>
+ * Incidental {@linkplain Character#isWhitespace(int) white space}
+ * is often present in a text block to align the content with the opening
+ * delimiter. For example, in the following code, dots represent incidental
+ * {@linkplain Character#isWhitespace(int) white space}:
+ * <blockquote><pre>
+ * String html = """
+ * ..............<html>
+ * .............. <body>
+ * .............. <p>Hello, world</p>
+ * .............. </body>
+ * ..............</html>
+ * ..............""";
+ * </pre></blockquote>
+ * This method treats the incidental
+ * {@linkplain Character#isWhitespace(int) white space} as indentation to be
+ * stripped, producing a string that preserves the relative indentation of
+ * the content. Using | to visualize the start of each line of the string:
+ * <blockquote><pre>
+ * |<html>
+ * | <body>
+ * | <p>Hello, world</p>
+ * | </body>
+ * |</html>
+ * </pre></blockquote>
+ * First, the individual lines of this string are extracted as if by using
+ * {@link String#lines()}.
+ * <p>
+ * Then, the <i>minimum indentation</i> (min) is determined as follows.
+ * For each non-blank line (as defined by {@link String#isBlank()}), the
+ * leading {@linkplain Character#isWhitespace(int) white space} characters are
+ * counted. The leading {@linkplain Character#isWhitespace(int) white space}
+ * characters on the last line are also counted even if
+ * {@linkplain String#isBlank() blank}. The <i>min</i> value is the smallest
+ * of these counts.
+ * <p>
+ * For each {@linkplain String#isBlank() non-blank} line, <i>min</i> leading
+ * {@linkplain Character#isWhitespace(int) white space} characters are removed,
+ * and any trailing {@linkplain Character#isWhitespace(int) white space}
+ * characters are removed. {@linkplain String#isBlank() Blank} lines are
+ * replaced with the empty string.
+ *
+ * <p>
+ * Finally, the lines are joined into a new string, using the LF character
+ * {@code "\n"} (U+000A) to separate lines.
+ *
+ * @apiNote
+ * This method's primary purpose is to shift a block of lines as far as
+ * possible to the left, while preserving relative indentation. Lines
+ * that were indented the least will thus have no leading
+ * {@linkplain Character#isWhitespace(int) white space}.
+ * The line count of the result will be the same as line count of this
+ * string.
+ * If this string ends with a line terminator then the result will end
+ * with a line terminator.
+ *
+ * @implNote
+ * This method treats all {@linkplain Character#isWhitespace(int) white space}
+ * characters as having equal width. As long as the indentation on every
+ * line is consistently composed of the same character sequences, then the
+ * result will be as described above.
+ *
+ * @return string with incidental indentation removed and line
+ * terminators normalized
+ *
+ * @see String#lines()
+ * @see String#isBlank()
+ * @see String#indent(int)
+ * @see Character#isWhitespace(int)
+ *
+ * @since 13
+ *
+ * @deprecated This method is associated with text blocks, a preview language feature.
+ * Text blocks and/or this method may be changed or removed in a future release.
+ */
+ @Deprecated(forRemoval=true, since="13")
+ public String stripIndent() {
+ int length = length();
+ if (length == 0) {
+ return "";
+ }
+ char lastChar = charAt(length - 1);
+ boolean optOut = lastChar == '\n' || lastChar == '\r';
+ List<String> lines = lines().collect(Collectors.toList());
+ final int outdent = optOut ? 0 : outdent(lines);
+ return lines.stream()
+ .map(line -> {
+ int firstNonWhitespace = line.indexOfNonWhitespace();
+ int lastNonWhitespace = line.lastIndexOfNonWhitespace();
+ int incidentalWhitespace = Math.min(outdent, firstNonWhitespace);
+ return firstNonWhitespace > lastNonWhitespace
+ ? "" : line.substring(incidentalWhitespace, lastNonWhitespace);
+ })
+ .collect(Collectors.joining("\n", "", optOut ? "\n" : ""));
+ }
+
+ private static int outdent(List<String> lines) {
+ // Note: outdent is guaranteed to be zero or positive number.
+ // If there isn't a non-blank line then the last must be blank
+ int outdent = Integer.MAX_VALUE;
+ for (String line : lines) {
+ int leadingWhitespace = line.indexOfNonWhitespace();
+ if (leadingWhitespace != line.length()) {
+ outdent = Integer.min(outdent, leadingWhitespace);
+ }
+ }
+ String lastLine = lines.get(lines.size() - 1);
+ if (lastLine.isBlank()) {
+ outdent = Integer.min(outdent, lastLine.length());
+ }
+ return outdent;
+ }
+
+ /**
+ * Returns a string whose value is this string, with escape sequences
+ * translated as if in a string literal.
+ * <p>
+ * Escape sequences are translated as follows;
+ * <table class="striped">
+ * <caption style="display:none">Translation</caption>
+ * <thead>
+ * <tr>
+ * <th scope="col">Escape</th>
+ * <th scope="col">Name</th>
+ * <th scope="col">Translation</th>
+ * </tr>
+ * </thead>
+ * <tbody>
+ * <tr>
+ * <th scope="row">{@code \u005Cb}</th>
+ * <td>backspace</td>
+ * <td>{@code U+0008}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005Ct}</th>
+ * <td>horizontal tab</td>
+ * <td>{@code U+0009}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005Cn}</th>
+ * <td>line feed</td>
+ * <td>{@code U+000A}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005Cf}</th>
+ * <td>form feed</td>
+ * <td>{@code U+000C}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005Cr}</th>
+ * <td>carriage return</td>
+ * <td>{@code U+000D}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005C"}</th>
+ * <td>double quote</td>
+ * <td>{@code U+0022}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005C'}</th>
+ * <td>single quote</td>
+ * <td>{@code U+0027}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005C\u005C}</th>
+ * <td>backslash</td>
+ * <td>{@code U+005C}</td>
+ * </tr>
+ * <tr>
+ * <th scope="row">{@code \u005C0 - \u005C377}</th>
+ * <td>octal escape</td>
+ * <td>code point equivalents</td>
+ * </tr>
+ * </tbody>
+ * </table>
+ *
+ * @implNote
+ * This method does <em>not</em> translate Unicode escapes such as "{@code \u005cu2022}".
+ * Unicode escapes are translated by the Java compiler when reading input characters and
+ * are not part of the string literal specification.
+ *
+ * @throws IllegalArgumentException when an escape sequence is malformed.
+ *
+ * @return String with escape sequences translated.
+ *
+ * @jls 3.10.7 Escape Sequences
+ *
+ * @since 13
+ *
+ * @deprecated This method is associated with text blocks, a preview language feature.
+ * Text blocks and/or this method may be changed or removed in a future release.
+ */
+ @Deprecated(forRemoval=true, since="13")
+ public String translateEscapes() {
+ if (isEmpty()) {
+ return "";
+ }
+ char[] chars = toCharArray();
+ int length = chars.length;
+ int from = 0;
+ int to = 0;
+ while (from < length) {
+ char ch = chars[from++];
+ if (ch == '\\') {
+ ch = from < length ? chars[from++] : '\0';
+ switch (ch) {
+ case 'b':
+ ch = '\b';
+ break;
+ case 'f':
+ ch = '\f';
+ break;
+ case 'n':
+ ch = '\n';
+ break;
+ case 'r':
+ ch = '\r';
+ break;
+ case 't':
+ ch = '\t';
+ break;
+ case '\'':
+ case '\"':
+ case '\\':
+ // as is
+ break;
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+ int limit = Integer.min(from + (ch <= '3' ? 2 : 1), length);
+ int code = ch - '0';
+ while (from < limit) {
+ ch = chars[from];
+ if (ch < '0' || '7' < ch) {
+ break;
+ }
+ from++;
+ code = (code << 3) | (ch - '0');
+ }
+ ch = (char)code;
+ break;
+ default: {
+ String msg = String.format(
+ "Invalid escape sequence: \\%c \\\\u%04X",
+ ch, (int)ch);
+ throw new IllegalArgumentException(msg);
+ }
+ }
+ }
+
+ chars[to++] = ch;
+ }
+
+ return new String(chars, 0, to);
+ }
+
+ /**
* This method allows the application of a function to {@code this}
* string. The function should expect a single String argument
* and produce an {@code R} result.
@@ -3063,6 +3316,30 @@
}
/**
+ * Formats using this string as the format string, and the supplied
+ * arguments.
+ *
+ * @implSpec This method is equivalent to {@code String.format(this, args)}.
+ *
+ * @param args
+ * Arguments referenced by the format specifiers in this string.
+ *
+ * @return A formatted string
+ *
+ * @see java.lang.String#format(String,Object...)
+ * @see java.util.Formatter
+ *
+ * @since 13
+ *
+ * @deprecated This method is associated with text blocks, a preview language feature.
+ * Text blocks and/or this method may be changed or removed in a future release.
+ */
+ @Deprecated(forRemoval=true, since="13")
+ public String formatted(Object... args) {
+ return new Formatter().format(this, args).toString();
+ }
+
+ /**
* Returns the string representation of the {@code Object} argument.
*
* @param obj an {@code Object}.
--- a/src/java.base/share/classes/java/lang/StringLatin1.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/StringLatin1.java Fri Jun 07 09:38:40 2019 -0700
@@ -732,76 +732,10 @@
static LinesSpliterator spliterator(byte[] value) {
return new LinesSpliterator(value, 0, value.length);
}
-
- static LinesSpliterator spliterator(byte[] value, int leading, int trailing) {
- int length = value.length;
- int left = 0;
- int index;
- for (int l = 0; l < leading; l++) {
- index = skipBlankForward(value, left, length);
- if (index == left) {
- break;
- }
- left = index;
- }
- int right = length;
- for (int t = 0; t < trailing; t++) {
- index = skipBlankBackward(value, left, right);
- if (index == right) {
- break;
- }
- right = index;
- }
- return new LinesSpliterator(value, left, right - left);
- }
-
- private static int skipBlankForward(byte[] value, int start, int length) {
- int index = start;
- while (index < length) {
- char ch = getChar(value, index++);
- if (ch == '\n') {
- return index;
- }
- if (ch == '\r') {
- if (index < length && getChar(value, index) == '\n') {
- return index + 1;
- }
- return index;
- }
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
- return start;
- }
- }
- return length;
- }
-
- private static int skipBlankBackward(byte[] value, int start, int fence) {
- int index = fence;
- if (start < index && getChar(value, index - 1) == '\n') {
- index--;
- }
- if (start < index && getChar(value, index - 1) == '\r') {
- index--;
- }
- while (start < index) {
- char ch = getChar(value, --index);
- if (ch == '\r' || ch == '\n') {
- return index + 1;
- }
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
- return fence;
- }
- }
- return start;
- }
}
- static Stream<String> lines(byte[] value, int leading, int trailing) {
- if (leading == 0 && trailing == 0) {
- return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
- } else {
- return StreamSupport.stream(LinesSpliterator.spliterator(value, leading, trailing), false);
- }
+ static Stream<String> lines(byte[] value) {
+ return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
}
public static void putChar(byte[] val, int index, int c) {
--- a/src/java.base/share/classes/java/lang/StringUTF16.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/StringUTF16.java Fri Jun 07 09:38:40 2019 -0700
@@ -1119,76 +1119,10 @@
static LinesSpliterator spliterator(byte[] value) {
return new LinesSpliterator(value, 0, value.length >>> 1);
}
-
- static LinesSpliterator spliterator(byte[] value, int leading, int trailing) {
- int length = value.length >>> 1;
- int left = 0;
- int index;
- for (int l = 0; l < leading; l++) {
- index = skipBlankForward(value, left, length);
- if (index == left) {
- break;
- }
- left = index;
- }
- int right = length;
- for (int t = 0; t < trailing; t++) {
- index = skipBlankBackward(value, left, right);
- if (index == right) {
- break;
- }
- right = index;
- }
- return new LinesSpliterator(value, left, right - left);
- }
-
- private static int skipBlankForward(byte[] value, int start, int length) {
- int index = start;
- while (index < length) {
- char ch = getChar(value, index++);
- if (ch == '\n') {
- return index;
- }
- if (ch == '\r') {
- if (index < length && getChar(value, index) == '\n') {
- return index + 1;
- }
- return index;
- }
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
- return start;
- }
- }
- return length;
- }
-
- private static int skipBlankBackward(byte[] value, int start, int fence) {
- int index = fence;
- if (start < index && getChar(value, index - 1) == '\n') {
- index--;
- }
- if (start < index && getChar(value, index - 1) == '\r') {
- index--;
- }
- while (start < index) {
- char ch = getChar(value, --index);
- if (ch == '\r' || ch == '\n') {
- return index + 1;
- }
- if (ch != ' ' && ch != '\t' && !Character.isWhitespace(ch)) {
- return fence;
- }
- }
- return start;
- }
}
- static Stream<String> lines(byte[] value, int leading, int trailing) {
- if (leading == 0 && trailing == 0) {
- return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
- } else {
- return StreamSupport.stream(LinesSpliterator.spliterator(value, leading, trailing), false);
- }
+ static Stream<String> lines(byte[] value) {
+ return StreamSupport.stream(LinesSpliterator.spliterator(value), false);
}
private static void putChars(byte[] val, int index, char[] str, int off, int end) {
--- a/src/java.base/share/classes/java/lang/System.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/System.java Fri Jun 07 09:38:40 2019 -0700
@@ -618,8 +618,9 @@
* {@link #getProperty(String)} method is returned as a
* {@code Properties} object. If there is no current set of
* system properties, a set of system properties is first created and
- * initialized. This set of system properties always includes values
- * for the following keys:
+ * initialized. This set of system properties includes a value
+ * for each of the following keys unless the description of the associated
+ * value indicates that the value is optional.
* <table class="striped" style="text-align:left">
* <caption style="display:none">Shows property keys and associated values</caption>
* <thead>
@@ -639,7 +640,7 @@
* <tr><th scope="row">{@systemProperty java.vendor.url}</th>
* <td>Java vendor URL</td></tr>
* <tr><th scope="row">{@systemProperty java.vendor.version}</th>
- * <td>Java vendor version</td></tr>
+ * <td>Java vendor version <em>(optional)</em> </td></tr>
* <tr><th scope="row">{@systemProperty java.home}</th>
* <td>Java installation directory</td></tr>
* <tr><th scope="row">{@systemProperty java.vm.specification.version}</th>
@@ -1782,14 +1783,17 @@
}
/**
- * Runs the garbage collector.
- *
- * Calling the {@code gc} method suggests that the Java Virtual
- * Machine expend effort toward recycling unused objects in order to
- * make the memory they currently occupy available for quick reuse.
- * When control returns from the method call, the Java Virtual
- * Machine has made a best effort to reclaim space from all discarded
- * objects.
+ * Runs the garbage collector in the Java Virtual Machine.
+ * <p>
+ * Calling the {@code gc} method suggests that the Java Virtual Machine
+ * expend effort toward recycling unused objects in order to
+ * make the memory they currently occupy available for reuse
+ * by the Java Virtual Machine.
+ * When control returns from the method call, the Java Virtual Machine
+ * has made a best effort to reclaim space from all unused objects.
+ * There is no guarantee that this effort will recycle any particular
+ * number of unused objects, reclaim any particular amount of space, or
+ * complete at any particular time, if at all, before the method returns or ever.
* <p>
* The call {@code System.gc()} is effectively equivalent to the
* call:
--- a/src/java.base/share/classes/java/lang/invoke/VarHandle.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/invoke/VarHandle.java Fri Jun 07 09:38:40 2019 -0700
@@ -2118,7 +2118,7 @@
}
/**
- * A <a href="package-summary.html#nominal">nominal descriptor</a> for a
+ * A <a href="{@docRoot}/java.base/java/lang/constant/package-summary.html#nominal">nominal descriptor</a> for a
* {@link VarHandle} constant.
*
* @since 12
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java Fri Jun 07 09:38:40 2019 -0700
@@ -673,6 +673,10 @@
* @return an object representing the receiver type of the method or
* constructor represented by this {@code Executable} or {@code null} if
* this {@code Executable} can not have a receiver parameter
+ *
+ * @jls 8.4 Method Declarations
+ * @jls 8.4.1 Formal Parameters
+ * @jls 8.8 Constructor Declarations
*/
public AnnotatedType getAnnotatedReceiverType() {
if (Modifier.isStatic(this.getModifiers()))
--- a/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/net/AbstractPlainSocketImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -446,7 +446,10 @@
} else if (name == StandardSocketOptions.SO_REUSEPORT) {
setOption(SocketOptions.SO_REUSEPORT, value);
} else if (name == StandardSocketOptions.SO_LINGER ) {
- setOption(SocketOptions.SO_LINGER, value);
+ if (((Integer)value).intValue() < 0)
+ setOption(SocketOptions.SO_LINGER, false);
+ else
+ setOption(SocketOptions.SO_LINGER, value);
} else if (name == StandardSocketOptions.IP_TOS) {
int i = ((Integer)value).intValue();
if (i < 0 || i > 255)
@@ -482,7 +485,12 @@
} else if (name == StandardSocketOptions.SO_REUSEPORT) {
return (T)getOption(SocketOptions.SO_REUSEPORT);
} else if (name == StandardSocketOptions.SO_LINGER) {
- return (T)getOption(SocketOptions.SO_LINGER);
+ Object value = getOption(SocketOptions.SO_LINGER);
+ if (value instanceof Boolean) {
+ assert ((Boolean)value).booleanValue() == false;
+ value = -1;
+ }
+ return (T)value;
} else if (name == StandardSocketOptions.IP_TOS) {
return (T)getOption(SocketOptions.IP_TOS);
} else if (name == StandardSocketOptions.TCP_NODELAY) {
--- a/src/java.base/share/classes/java/net/JarURLConnection.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/net/JarURLConnection.java Fri Jun 07 09:38:40 2019 -0700
@@ -254,7 +254,7 @@
* @see #getJarEntry
*/
public JarEntry getJarEntry() throws IOException {
- return getJarFile().getJarEntry(entryName);
+ return entryName == null ? null : getJarFile().getJarEntry(entryName);
}
/**
--- a/src/java.base/share/classes/java/net/ServerSocket.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/net/ServerSocket.java Fri Jun 07 09:38:40 2019 -0700
@@ -472,6 +472,12 @@
* as its arguments to ensure the operation is allowed.
* This could result in a SecurityException.
*
+ * @implNote
+ * An instance of this class using a system-default {@code SocketImpl}
+ * accepts sockets with a {@code SocketImpl} of the same type, regardless
+ * of the {@linkplain Socket#setSocketImplFactory(SocketImplFactory)
+ * client socket implementation factory}, if one has been set.
+ *
* @exception IOException if an I/O error occurs when waiting for a
* connection.
* @exception SecurityException if a security manager exists and its
@@ -501,15 +507,33 @@
/**
* Subclasses of ServerSocket use this method to override accept()
* to return their own subclass of socket. So a FooServerSocket
- * will typically hand this method an <i>empty</i> FooSocket. On
- * return from implAccept the FooSocket will be connected to a client.
+ * will typically hand this method a newly created, unbound, FooSocket.
+ * On return from implAccept the FooSocket will be connected to a client.
+ *
+ * <p> The behavior of this method is unspecified when invoked with a
+ * socket that is not newly created and unbound. Any socket options set
+ * on the given socket prior to invoking this method may or may not be
+ * preserved when the connection is accepted. It may not be possible to
+ * accept a connection when this socket has a {@code SocketImpl} of one
+ * type and the given socket has a {@code SocketImpl} of a completely
+ * different type.
+ *
+ * @implNote
+ * An instance of this class using a system-default {@code SocketImpl}
+ * can accept a connection with a Socket using a {@code SocketImpl} of
+ * the same type: {@code IOException} is thrown if the Socket is using
+ * a custom {@code SocketImpl}. An instance of this class using a
+ * custom {@code SocketImpl} cannot accept a connection with a Socket
+ * using a system-default {@code SocketImpl}.
*
* @param s the Socket
* @throws java.nio.channels.IllegalBlockingModeException
* if this socket has an associated channel,
* and the channel is in non-blocking mode
* @throws IOException if an I/O error occurs when waiting
- * for a connection.
+ * for a connection, or if it is not possible for this socket
+ * to accept a connection with the given socket
+ *
* @since 1.1
* @revised 1.4
* @spec JSR-51
--- a/src/java.base/share/classes/java/util/BitSet.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/util/BitSet.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -1182,9 +1182,13 @@
public String toString() {
checkInvariants();
+ final int MAX_INITIAL_CAPACITY = Integer.MAX_VALUE - 8;
int numBits = (wordsInUse > 128) ?
cardinality() : wordsInUse * BITS_PER_WORD;
- StringBuilder b = new StringBuilder(6*numBits + 2);
+ // Avoid overflow in the case of a humongous numBits
+ int initialCapacity = (numBits <= (MAX_INITIAL_CAPACITY - 2) / 6) ?
+ 6 * numBits + 2 : MAX_INITIAL_CAPACITY;
+ StringBuilder b = new StringBuilder(initialCapacity);
b.append('{');
int i = nextSetBit(0);
--- a/src/java.base/share/classes/java/util/Properties.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/util/Properties.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -641,11 +641,16 @@
while (off < end) {
aChar = in[off++];
if (aChar == '\\') {
+ // No need to bounds check since LineReader::readLine excludes
+ // unescaped \s at the end of the line
aChar = in[off++];
if(aChar == 'u') {
// Read the xxxx
- int value=0;
- for (int i=0; i<4; i++) {
+ if (off > end - 4)
+ throw new IllegalArgumentException(
+ "Malformed \\uxxxx encoding.");
+ int value = 0;
+ for (int i = 0; i < 4; i++) {
aChar = in[off++];
switch (aChar) {
case '0': case '1': case '2': case '3': case '4':
--- a/src/java.base/share/classes/java/util/regex/Pattern.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java Fri Jun 07 09:38:40 2019 -0700
@@ -2100,7 +2100,7 @@
private Node sequence(Node end) {
Node head = null;
Node tail = null;
- Node node = null;
+ Node node;
LOOP:
for (;;) {
int ch = peek();
@@ -2617,7 +2617,6 @@
CharPredicate prev = null;
CharPredicate curr = null;
BitClass bits = new BitClass();
- BmpCharPredicate bitsP = ch -> ch < 256 && bits.bits[ch];
boolean isNeg = false;
boolean hasBits = false;
@@ -2658,9 +2657,9 @@
if (hasBits) {
// bits used, union has high precedence
if (prev == null) {
- prev = curr = bitsP;
+ prev = curr = bits;
} else {
- prev = prev.union(bitsP);
+ prev = prev.union(bits);
}
hasBits = false;
}
@@ -2689,9 +2688,9 @@
if (consume)
next();
if (prev == null)
- prev = bitsP;
+ prev = bits;
else if (hasBits)
- prev = prev.union(bitsP);
+ prev = prev.union(bits);
if (isNeg)
return prev.negate();
return prev;
@@ -2947,8 +2946,8 @@
*/
private Node group0() {
boolean capturingGroup = false;
- Node head = null;
- Node tail = null;
+ Node head;
+ Node tail;
int save = flags0;
int saveTCNCount = topClosureNodes.size();
root = null;
@@ -2997,7 +2996,7 @@
head = createGroup(true);
tail = root;
head.next = expr(tail);
- tail.next = lookbehindEnd;
+ tail.next = LookBehindEndNode.INSTANCE;
TreeInfo info = new TreeInfo();
head.study(info);
if (info.maxValid == false) {
@@ -3253,7 +3252,6 @@
* Prev could be a single or a group, so it could be a chain of nodes.
*/
private Node closure(Node prev) {
- Node atom;
int ch = peek();
switch (ch) {
case '?':
@@ -3279,11 +3277,12 @@
cmin = Math.addExact(Math.multiplyExact(cmin, 10),
ch - '0');
} while (ASCII.isDigit(ch = read()));
- cmax = cmin;
if (ch == ',') {
ch = read();
- cmax = MAX_REPS;
- if (ch != '}') {
+ if (ch == '}') {
+ unread();
+ return curly(prev, cmin);
+ } else {
cmax = 0;
while (ASCII.isDigit(ch)) {
cmax = Math.addExact(Math.multiplyExact(cmax, 10),
@@ -3291,6 +3290,8 @@
ch = read();
}
}
+ } else {
+ cmax = cmin;
}
} catch (ArithmeticException ae) {
throw error("Illegal repetition range");
@@ -3299,18 +3300,16 @@
throw error("Unclosed counted closure");
if (cmax < cmin)
throw error("Illegal repetition range");
- Curly curly;
ch = peek();
if (ch == '?') {
next();
- curly = new Curly(prev, cmin, cmax, Qtype.LAZY);
+ return new Curly(prev, cmin, cmax, Qtype.LAZY);
} else if (ch == '+') {
next();
- curly = new Curly(prev, cmin, cmax, Qtype.POSSESSIVE);
+ return new Curly(prev, cmin, cmax, Qtype.POSSESSIVE);
} else {
- curly = new Curly(prev, cmin, cmax, Qtype.GREEDY);
+ return new Curly(prev, cmin, cmax, Qtype.GREEDY);
}
- return curly;
} else {
throw error("Illegal repetition");
}
@@ -3485,14 +3484,10 @@
* never matches values above Latin-1, and a complemented BitClass always
* matches values above Latin-1.
*/
- static final class BitClass extends BmpCharProperty {
+ static final class BitClass implements BmpCharPredicate {
final boolean[] bits;
BitClass() {
- this(new boolean[256]);
- }
- private BitClass(boolean[] bits) {
- super( ch -> ch < 256 && bits[ch]);
- this.bits = bits;
+ bits = new boolean[256];
}
BitClass add(int c, int flags) {
assert c >= 0 && c <= 255;
@@ -3508,8 +3503,12 @@
bits[c] = true;
return this;
}
+ public boolean is(int ch) {
+ return ch < 256 && bits[ch];
+ }
}
+
/**
* Utility method for creating a string slice matcher.
*/
@@ -3922,7 +3921,7 @@
* boolean property.
*/
static class CharProperty extends Node {
- CharPredicate predicate;
+ final CharPredicate predicate;
CharProperty (CharPredicate predicate) {
this.predicate = predicate;
@@ -4266,8 +4265,8 @@
}
/**
- * Handles the greedy style repetition with the minimum either be
- * 0 or 1 and the maximum be MAX_REPS, for * and + quantifier.
+ * Handles the greedy style repetition with the specified minimum
+ * and the maximum equal to MAX_REPS, for *, + and {N,} quantifiers.
*/
static class CharPropertyGreedy extends Node {
final CharPredicate predicate;
@@ -4277,7 +4276,7 @@
this.predicate = cp.predicate;
this.cmin = cmin;
}
- boolean match(Matcher matcher, int i, CharSequence seq) {
+ boolean match(Matcher matcher, int i, CharSequence seq) {
int n = 0;
int to = matcher.to;
// greedy, all the way down
@@ -4320,7 +4319,7 @@
super(bcp, cmin);
}
- boolean match(Matcher matcher, int i, CharSequence seq) {
+ boolean match(Matcher matcher, int i, CharSequence seq) {
int n = 0;
int to = matcher.to;
while (i < to && predicate.is(seq.charAt(i))) {
@@ -4697,7 +4696,7 @@
* "next".
*/
static final class BranchConn extends Node {
- BranchConn() {};
+ BranchConn() {}
boolean match(Matcher matcher, int i, CharSequence seq) {
return next.match(matcher, i, seq);
}
@@ -4794,34 +4793,6 @@
matcher.locals[localIndex] = save;
return ret;
}
- boolean matchRef(Matcher matcher, int i, CharSequence seq) {
- int save = matcher.locals[localIndex];
- matcher.locals[localIndex] = ~i; // HACK
- boolean ret = next.match(matcher, i, seq);
- matcher.locals[localIndex] = save;
- return ret;
- }
- }
-
- /**
- * Recursive reference to a group in the regular expression. It calls
- * matchRef because if the reference fails to match we would not unset
- * the group.
- */
- static final class GroupRef extends Node {
- GroupHead head;
- GroupRef(GroupHead head) {
- this.head = head;
- }
- boolean match(Matcher matcher, int i, CharSequence seq) {
- return head.matchRef(matcher, i, seq)
- && next.match(matcher, matcher.last, seq);
- }
- boolean study(TreeInfo info) {
- info.maxValid = false;
- info.deterministic = false;
- return next.study(info);
- }
}
/**
@@ -4943,7 +4914,7 @@
}
boolean matchInit(Matcher matcher, int i, CharSequence seq) {
int save = matcher.locals[countIndex];
- boolean ret = false;
+ boolean ret;
if (posIndex != -1 && matcher.localsPos[posIndex] == null) {
matcher.localsPos[posIndex] = new IntHashSet();
}
@@ -5157,41 +5128,6 @@
}
}
- static final class Conditional extends Node {
- Node cond, yes, not;
- Conditional(Node cond, Node yes, Node not) {
- this.cond = cond;
- this.yes = yes;
- this.not = not;
- }
- boolean match(Matcher matcher, int i, CharSequence seq) {
- if (cond.match(matcher, i, seq)) {
- return yes.match(matcher, i, seq);
- } else {
- return not.match(matcher, i, seq);
- }
- }
- boolean study(TreeInfo info) {
- int minL = info.minLength;
- int maxL = info.maxLength;
- boolean maxV = info.maxValid;
- info.reset();
- yes.study(info);
-
- int minL2 = info.minLength;
- int maxL2 = info.maxLength;
- boolean maxV2 = info.maxValid;
- info.reset();
- not.study(info);
-
- info.minLength = minL + Math.min(minL2, info.minLength);
- info.maxLength = maxL + Math.max(maxL2, info.maxLength);
- info.maxValid = (maxV & maxV2 & info.maxValid);
- info.deterministic = false;
- return next.study(info);
- }
- }
-
/**
* Zero width positive lookahead.
*/
@@ -5202,7 +5138,7 @@
}
boolean match(Matcher matcher, int i, CharSequence seq) {
int savedTo = matcher.to;
- boolean conditionMatched = false;
+ boolean conditionMatched;
// Relax transparent region boundaries for lookahead
if (matcher.transparentBounds)
@@ -5227,7 +5163,7 @@
}
boolean match(Matcher matcher, int i, CharSequence seq) {
int savedTo = matcher.to;
- boolean conditionMatched = false;
+ boolean conditionMatched;
// Relax transparent region boundaries for lookahead
if (matcher.transparentBounds)
@@ -5253,11 +5189,15 @@
* For use with lookbehinds; matches the position where the lookbehind
* was encountered.
*/
- static Node lookbehindEnd = new Node() {
+ static class LookBehindEndNode extends Node {
+ private LookBehindEndNode() {} // Singleton
+
+ static LookBehindEndNode INSTANCE = new LookBehindEndNode();
+
boolean match(Matcher matcher, int i, CharSequence seq) {
return i == matcher.lookbehindTo;
}
- };
+ }
/**
* Zero width positive lookbehind.
@@ -5525,7 +5465,7 @@
if (patternLength < 4) {
return node;
}
- int i, j, k;
+ int i, j;
int[] lastOcc = new int[128];
int[] optoSft = new int[patternLength];
// Precalculate part of the bad character shift
@@ -5680,7 +5620,7 @@
static interface BmpCharPredicate extends CharPredicate {
default CharPredicate and(CharPredicate p) {
- if(p instanceof BmpCharPredicate)
+ if (p instanceof BmpCharPredicate)
return (BmpCharPredicate)(ch -> is(ch) && p.is(ch));
return ch -> is(ch) && p.is(ch);
}
--- a/src/java.base/share/classes/java/util/regex/PrintPattern.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/java/util/regex/PrintPattern.java Fri Jun 07 09:38:40 2019 -0700
@@ -195,7 +195,13 @@
pstr = gcp.predicate.toString();
else
pstr = "Single \"" + pstr + "\"";
- str = name + " " + pstr + ((gcp.cmin == 0) ? "*" : "+");
+ str = name + " " + pstr;
+ if (gcp.cmin == 0)
+ str += "*";
+ else if (gcp.cmin == 1)
+ str += "+";
+ else
+ str += "{" + gcp.cmin + ",}";
print(node, str, depth);
} else if (node instanceof Pattern.BackRef) {
str = "GroupBackRef " + ((Pattern.BackRef)node).groupIndex / 2;
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java Fri Jun 07 09:38:40 2019 -0700
@@ -821,7 +821,7 @@
} catch (Throwable e) {
if (mainClass.getModule().isNamed()) {
abort(e, "java.launcher.module.error5",
- mainClass.getName(), mainClass.getModule(),
+ mainClass.getName(), mainClass.getModule().getName(),
e.getClass().getName(), e.getLocalizedMessage());
} else {
abort(e, "java.launcher.cls.error7", mainClass.getName(),
--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties Fri Jun 07 09:38:40 2019 -0700
@@ -249,4 +249,4 @@
{0} not found
java.launcher.module.error5=\
Error: Unable to initialize main class {0} in module {1}\n\
- Caused by: {1}: {2}
+ Caused by: {2}: {3}
--- a/src/java.base/share/conf/security/java.security Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/share/conf/security/java.security Fri Jun 07 09:38:40 2019 -0700
@@ -475,6 +475,31 @@
krb5.kdc.bad.policy = tryLast
#
+# Kerberos cross-realm referrals (RFC 6806)
+#
+# OpenJDK's Kerberos client supports cross-realm referrals as defined in
+# RFC 6806. This allows to setup more dynamic environments in which clients
+# do not need to know in advance how to reach the realm of a target principal
+# (either a user or service).
+#
+# When a client issues an AS or a TGS request, the "canonicalize" option
+# is set to announce support of this feature. A KDC server may fulfill the
+# request or reply referring the client to a different one. If referred,
+# the client will issue a new request and the cycle repeats.
+#
+# In addition to referrals, the "canonicalize" option allows the KDC server
+# to change the client name in response to an AS request. For security reasons,
+# RFC 6806 (section 11) FAST scheme is enforced.
+#
+# Disable Kerberos cross-realm referrals. Value may be overwritten with a
+# System property (-Dsun.security.krb5.disableReferrals).
+sun.security.krb5.disableReferrals=false
+
+# Maximum number of AS or TGS referrals to avoid infinite loops. Value may
+# be overwritten with a System property (-Dsun.security.krb5.maxReferrals).
+sun.security.krb5.maxReferrals=5
+
+#
# Algorithm restrictions for certification path (CertPath) processing
#
# In some environments, certain algorithms or key lengths may be undesirable
Binary file src/java.base/share/lib/security/cacerts has changed
--- a/src/java.base/unix/native/libjava/ProcessImpl_md.c Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c Fri Jun 07 09:38:40 2019 -0700
@@ -655,6 +655,18 @@
c->redirectErrorStream = redirectErrorStream;
c->mode = mode;
+ /* In posix_spawn mode, require the child process to signal aliveness
+ * right after it comes up. This is because there are implementations of
+ * posix_spawn() which do not report failed exec()s back to the caller
+ * (e.g. glibc, see JDK-8223777). In those cases, the fork() will have
+ * worked and successfully started the child process, but the exec() will
+ * have failed. There is no way for us to distinguish this from a target
+ * binary just exiting right after start.
+ *
+ * Note that we could do this additional handshake in all modes but for
+ * prudence only do it when it is needed (in posix_spawn mode). */
+ c->sendAlivePing = (mode == MODE_POSIX_SPAWN) ? 1 : 0;
+
resultPid = startChild(env, process, c, phelperpath);
assert(resultPid != 0);
@@ -674,6 +686,30 @@
}
close(fail[1]); fail[1] = -1; /* See: WhyCantJohnnyExec (childproc.c) */
+ /* If we expect the child to ping aliveness, wait for it. */
+ if (c->sendAlivePing) {
+ switch(readFully(fail[0], &errnum, sizeof(errnum))) {
+ case 0: /* First exec failed; */
+ waitpid(resultPid, NULL, 0);
+ throwIOException(env, 0, "Failed to exec spawn helper.");
+ goto Catch;
+ case sizeof(errnum):
+ assert(errnum == CHILD_IS_ALIVE);
+ if (errnum != CHILD_IS_ALIVE) {
+ /* Should never happen since the first thing the spawn
+ * helper should do is to send an alive ping to the parent,
+ * before doing any subsequent work. */
+ throwIOException(env, 0, "Bad code from spawn helper "
+ "(Failed to exec spawn helper.");
+ goto Catch;
+ }
+ break;
+ default:
+ throwIOException(env, errno, "Read failed");
+ goto Catch;
+ }
+ }
+
switch (readFully(fail[0], &errnum, sizeof(errnum))) {
case 0: break; /* Exec succeeded */
case sizeof(errnum):
--- a/src/java.base/unix/native/libjava/childproc.c Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/unix/native/libjava/childproc.c Fri Jun 07 09:38:40 2019 -0700
@@ -313,6 +313,14 @@
childProcess(void *arg)
{
const ChildStuff* p = (const ChildStuff*) arg;
+ int fail_pipe_fd = p->fail[1];
+
+ if (p->sendAlivePing) {
+ /* Child shall signal aliveness to parent at the very first
+ * moment. */
+ int code = CHILD_IS_ALIVE;
+ restartableWrite(fail_pipe_fd, &code, sizeof(code));
+ }
/* Close the parent sides of the pipes.
Closing pipe fds here is redundant, since closeDescriptors()
@@ -343,9 +351,12 @@
goto WhyCantJohnnyExec;
}
- if (moveDescriptor(p->fail[1], FAIL_FILENO) == -1)
+ if (moveDescriptor(fail_pipe_fd, FAIL_FILENO) == -1)
goto WhyCantJohnnyExec;
+ /* We moved the fail pipe fd */
+ fail_pipe_fd = FAIL_FILENO;
+
/* close everything */
if (closeDescriptors() == 0) { /* failed, close the old way */
int max_fd = (int)sysconf(_SC_OPEN_MAX);
@@ -377,9 +388,9 @@
*/
{
int errnum = errno;
- restartableWrite(FAIL_FILENO, &errnum, sizeof(errnum));
+ restartableWrite(fail_pipe_fd, &errnum, sizeof(errnum));
}
- close(FAIL_FILENO);
+ close(fail_pipe_fd);
_exit(-1);
return 0; /* Suppress warning "no return value from function" */
}
--- a/src/java.base/unix/native/libjava/childproc.h Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.base/unix/native/libjava/childproc.h Fri Jun 07 09:38:40 2019 -0700
@@ -101,6 +101,7 @@
const char **envv;
const char *pdir;
int redirectErrorStream;
+ int sendAlivePing;
} ChildStuff;
/* following used in addition when mode is SPAWN */
@@ -114,6 +115,13 @@
int parentPathvBytes; /* total number of bytes in parentPathv array */
} SpawnInfo;
+/* If ChildStuff.sendAlivePing is true, child shall signal aliveness to
+ * the parent the moment it gains consciousness, before any subsequent
+ * pre-exec errors could happen.
+ * This code must fit into an int and not be a valid errno value on any of
+ * our platforms. */
+#define CHILD_IS_ALIVE 65535
+
/**
* The cached and split version of the JDK's effective PATH.
* (We don't support putenv("PATH=...") in native code)
--- a/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ExecutableElement.java Fri Jun 07 09:38:40 2019 -0700
@@ -95,6 +95,10 @@
*
* @return the receiver type of this executable
* @since 1.8
+ *
+ * @jls 8.4 Method Declarations
+ * @jls 8.4.1 Formal Parameters
+ * @jls 8.8 Constructor Declarations
*/
TypeMirror getReceiverType();
--- a/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.compiler/share/classes/javax/lang/model/type/ExecutableType.java Fri Jun 07 09:38:40 2019 -0700
@@ -92,6 +92,10 @@
*
* @return the receiver type of this executable
* @since 1.8
+ *
+ * @jls 8.4 Method Declarations
+ * @jls 8.4.1 Formal Parameters
+ * @jls 8.8 Constructor Declarations
*/
TypeMirror getReceiverType();
--- a/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c Fri Jun 07 09:38:40 2019 -0700
@@ -1329,7 +1329,15 @@
/* free the old pX11IMData and set it to null. this also avoids crashing
* the jvm if the XIM server reappears */
while (x11InputMethodGRefListHead != NULL) {
- getX11InputMethodData(env, x11InputMethodGRefListHead->inputMethodGRef);
+ if (getX11InputMethodData(env,
+ x11InputMethodGRefListHead->inputMethodGRef) == NULL) {
+ /* Clear possible exceptions
+ */
+ if ((*env)->ExceptionOccurred(env)) {
+ (*env)->ExceptionDescribe(env);
+ (*env)->ExceptionClear(env);
+ }
+ }
}
AWT_UNLOCK();
}
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -80,6 +80,11 @@
public static final int KRB_NT_UID = 5;
+ /**
+ * Enterprise name (alias)
+ */
+ public static final int KRB_NT_ENTERPRISE = 10;
+
private transient String fullName;
private transient String realm;
--- a/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/org/ietf/jgss/package-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -52,7 +52,7 @@
* produces tokens that the application must somehow transport to the
* other end.
*
- * <h3 id="useSubjectCredsOnly">Credential Acquisition</h3>
+ * <h2 id="useSubjectCredsOnly">Credential Acquisition</h2>
* The GSS-API itself does not dictate how an underlying mechanism
* obtains the credentials that are needed for authentication. It is
* assumed that prior to calling the GSS-API, these credentials are
@@ -93,28 +93,9 @@
* just the current Subject itself.
*
* <h2>Related Documentation</h2>
- * <p>
* For an online tutorial on using Java GSS-API, please see
* {@extLink security_guide_jgss_tutorial
* Introduction to JAAS and Java GSS-API}.
- * </p>
- *
- * <!--
- * <h2>Package Specification</h2>
- *
- * ##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
- * <ul>
- * <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
- * </ul>
- *
- * <h2>Related Documentation</h2>
- *
- * For overviews, tutorials, examples, guides, and tool documentation, please see:
- * <ul>
- * <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
- * </ul>
- *
- * -->
*
* @since 1.4
* */
--- a/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -218,7 +218,7 @@
* @exception IOException if an I/O error occurs while reading encoded data.
*
*/
- private Checksum(DerValue encoding) throws Asn1Exception, IOException {
+ public Checksum(DerValue encoding) throws Asn1Exception, IOException {
DerValue der;
if (encoding.getTag() != DerValue.tag_Sequence) {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
--- a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -48,6 +48,7 @@
import sun.security.action.GetPropertyAction;
import sun.security.krb5.internal.crypto.EType;
import sun.security.krb5.internal.Krb5;
+import sun.security.util.SecurityProperties;
/**
* This class maintains key-value pairs of Kerberos configurable constants
@@ -56,6 +57,41 @@
public class Config {
+ /**
+ * {@systemProperty sun.security.krb5.disableReferrals} property
+ * indicating whether or not cross-realm referrals (RFC 6806) are
+ * enabled.
+ */
+ public static final boolean DISABLE_REFERRALS;
+
+ /**
+ * {@systemProperty sun.security.krb5.maxReferrals} property
+ * indicating the maximum number of cross-realm referral
+ * hops allowed.
+ */
+ public static final int MAX_REFERRALS;
+
+ static {
+ String disableReferralsProp =
+ SecurityProperties.privilegedGetOverridable(
+ "sun.security.krb5.disableReferrals");
+ if (disableReferralsProp != null) {
+ DISABLE_REFERRALS = "true".equalsIgnoreCase(disableReferralsProp);
+ } else {
+ DISABLE_REFERRALS = false;
+ }
+
+ int maxReferralsValue = 5;
+ String maxReferralsProp =
+ SecurityProperties.privilegedGetOverridable(
+ "sun.security.krb5.maxReferrals");
+ try {
+ maxReferralsValue = Integer.parseInt(maxReferralsProp);
+ } catch (NumberFormatException e) {
+ }
+ MAX_REFERRALS = maxReferralsValue;
+ }
+
/*
* Only allow a single instance of Config.
*/
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsRep.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -155,11 +155,11 @@
rep.encKDCRepPart = enc_part;
ASReq req = asReq.getMessage();
- check(true, req, rep);
+ check(true, req, rep, dkey);
creds = new Credentials(
rep.ticket,
- req.reqBody.cname,
+ rep.cname,
enc_part.sname,
enc_part.key,
enc_part.flags,
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReq.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -36,6 +36,7 @@
import sun.security.krb5.internal.crypto.KeyUsage;
import java.io.IOException;
import java.time.Instant;
+import java.util.Arrays;
/**
* This class encapsulates the KRB-AS-REQ message that the client
@@ -58,7 +59,8 @@
KerberosTime till, // ok, will use
KerberosTime rtime, // ok
int[] eTypes, // NO
- HostAddresses addresses // ok
+ HostAddresses addresses, // ok
+ PAData[] extraPAs // ok
)
throws KrbException, IOException {
@@ -93,6 +95,15 @@
paData[0] = new PAData( Krb5.PA_ENC_TIMESTAMP,
encTs.asn1Encode());
}
+ if (extraPAs != null && extraPAs.length > 0) {
+ if (paData == null) {
+ paData = new PAData[extraPAs.length];
+ } else {
+ paData = Arrays.copyOf(paData, paData.length + extraPAs.length);
+ }
+ System.arraycopy(extraPAs, 0, paData,
+ paData.length - extraPAs.length, extraPAs.length);
+ }
if (cname.getRealm() == null) {
throw new RealmException(Krb5.REALM_NULL,
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbAsReqBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, 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
@@ -262,7 +262,9 @@
* @throws KrbException
* @throws IOException
*/
- private KrbAsReq build(EncryptionKey key) throws KrbException, IOException {
+ private KrbAsReq build(EncryptionKey key, ReferralsState referralsState)
+ throws KrbException, IOException {
+ PAData[] extraPAs = null;
int[] eTypes;
if (password != null) {
eTypes = EType.getDefaults("default_tkt_enctypes");
@@ -272,6 +274,14 @@
ks);
for (EncryptionKey k: ks) k.destroy();
}
+ options = (options == null) ? new KDCOptions() : options;
+ if (referralsState.isEnabled()) {
+ options.set(KDCOptions.CANONICALIZE, true);
+ extraPAs = new PAData[]{ new PAData(Krb5.PA_REQ_ENC_PA_REP,
+ new byte[]{}) };
+ } else {
+ options.set(KDCOptions.CANONICALIZE, false);
+ }
return new KrbAsReq(key,
options,
cname,
@@ -280,7 +290,8 @@
till,
rtime,
eTypes,
- addresses);
+ addresses,
+ extraPAs);
}
/**
@@ -318,11 +329,15 @@
*/
private KrbAsReqBuilder send() throws KrbException, IOException {
boolean preAuthFailedOnce = false;
- KdcComm comm = new KdcComm(cname.getRealmAsString());
+ KdcComm comm = null;
EncryptionKey pakey = null;
+ ReferralsState referralsState = new ReferralsState();
while (true) {
+ if (referralsState.refreshComm()) {
+ comm = new KdcComm(cname.getRealmAsString());
+ }
try {
- req = build(pakey);
+ req = build(pakey, referralsState);
rep = new KrbAsRep(comm.send(req.encoding()));
return this;
} catch (KrbException ke) {
@@ -351,12 +366,69 @@
}
paList = kerr.getPA(); // Update current paList
} else {
+ if (referralsState.handleError(ke)) {
+ continue;
+ }
throw ke;
}
}
}
}
+ private final class ReferralsState {
+ private boolean enabled;
+ private int count;
+ private boolean refreshComm;
+
+ ReferralsState() throws KrbException {
+ if (Config.DISABLE_REFERRALS) {
+ if (cname.getNameType() == PrincipalName.KRB_NT_ENTERPRISE) {
+ throw new KrbException("NT-ENTERPRISE principals only allowed" +
+ " when referrals are enabled.");
+ }
+ enabled = false;
+ } else {
+ enabled = true;
+ }
+ refreshComm = true;
+ }
+
+ boolean handleError(KrbException ke) throws RealmException {
+ if (enabled) {
+ if (ke.returnCode() == Krb5.KRB_ERR_WRONG_REALM) {
+ Realm referredRealm = ke.getError().getClientRealm();
+ if (req.getMessage().reqBody.kdcOptions.get(KDCOptions.CANONICALIZE) &&
+ referredRealm != null && referredRealm.toString().length() > 0 &&
+ count < Config.MAX_REFERRALS) {
+ cname = new PrincipalName(cname.getNameType(),
+ cname.getNameStrings(), referredRealm);
+ refreshComm = true;
+ count++;
+ return true;
+ }
+ }
+ if (count < Config.MAX_REFERRALS &&
+ cname.getNameType() != PrincipalName.KRB_NT_ENTERPRISE) {
+ // Server may raise an error if CANONICALIZE is true.
+ // Try CANONICALIZE false.
+ enabled = false;
+ return true;
+ }
+ }
+ return false;
+ }
+
+ boolean refreshComm() {
+ boolean retRefreshComm = refreshComm;
+ refreshComm = false;
+ return retRefreshComm;
+ }
+
+ boolean isEnabled() {
+ return enabled;
+ }
+ }
+
/**
* Performs AS-REQ send and AS-REP receive.
* Maybe a state is needed here, to divide prepare process and getCreds.
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbKdcRep.java Fri Jun 07 09:38:40 2019 -0700
@@ -31,23 +31,41 @@
package sun.security.krb5;
import sun.security.krb5.internal.*;
+import sun.security.krb5.internal.crypto.KeyUsage;
+import sun.security.util.DerInputStream;
abstract class KrbKdcRep {
static void check(
boolean isAsReq,
KDCReq req,
- KDCRep rep
+ KDCRep rep,
+ EncryptionKey replyKey
) throws KrbApErrException {
- if (isAsReq && !req.reqBody.cname.equals(rep.cname)) {
+ // cname change in AS-REP is allowed only if the client
+ // sent CANONICALIZE and the server supports RFC 6806 - Section 11
+ // FAST scheme (ENC-PA-REP flag).
+ if (isAsReq && !req.reqBody.cname.equals(rep.cname) &&
+ (!req.reqBody.kdcOptions.get(KDCOptions.CANONICALIZE) ||
+ !rep.encKDCRepPart.flags.get(Krb5.TKT_OPTS_ENC_PA_REP))) {
rep.encKDCRepPart.key.destroy();
throw new KrbApErrException(Krb5.KRB_AP_ERR_MODIFIED);
}
+ // sname change in TGS-REP is allowed only if client
+ // sent CANONICALIZE and new sname is a referral of
+ // the form krbtgt/TO-REALM.COM@FROM-REALM.COM.
if (!req.reqBody.sname.equals(rep.encKDCRepPart.sname)) {
- rep.encKDCRepPart.key.destroy();
- throw new KrbApErrException(Krb5.KRB_AP_ERR_MODIFIED);
+ String[] snameStrings = rep.encKDCRepPart.sname.getNameStrings();
+ if (isAsReq || !req.reqBody.kdcOptions.get(KDCOptions.CANONICALIZE) ||
+ snameStrings == null || snameStrings.length != 2 ||
+ !snameStrings[0].equals(PrincipalName.TGS_DEFAULT_SRV_NAME) ||
+ !rep.encKDCRepPart.sname.getRealmString().equals(
+ req.reqBody.sname.getRealmString())) {
+ rep.encKDCRepPart.key.destroy();
+ throw new KrbApErrException(Krb5.KRB_AP_ERR_MODIFIED);
+ }
}
if (req.reqBody.getNonce() != rep.encKDCRepPart.nonce) {
@@ -118,5 +136,45 @@
}
}
}
+
+ // RFC 6806 - Section 11 mechanism check
+ if (rep.encKDCRepPart.flags.get(Krb5.TKT_OPTS_ENC_PA_REP) &&
+ req.reqBody.kdcOptions.get(KDCOptions.CANONICALIZE)) {
+ boolean reqPaReqEncPaRep = false;
+ boolean repPaReqEncPaRepValid = false;
+
+ // PA_REQ_ENC_PA_REP only required for AS requests
+ for (PAData pa : req.pAData) {
+ if (pa.getType() == Krb5.PA_REQ_ENC_PA_REP) {
+ reqPaReqEncPaRep = true;
+ break;
+ }
+ }
+
+ if (rep.encKDCRepPart.pAData != null) {
+ for (PAData pa : rep.encKDCRepPart.pAData) {
+ if (pa.getType() == Krb5.PA_REQ_ENC_PA_REP) {
+ try {
+ Checksum repCksum = new Checksum(
+ new DerInputStream(
+ pa.getValue()).getDerValue());
+ repPaReqEncPaRepValid =
+ repCksum.verifyKeyedChecksum(
+ req.asn1Encode(), replyKey,
+ KeyUsage.KU_AS_REQ);
+ } catch (Exception e) {
+ if (Krb5.DEBUG) {
+ e.printStackTrace();
+ }
+ }
+ break;
+ }
+ }
+ }
+
+ if (reqPaReqEncPaRep && !repPaReqEncPaRepValid) {
+ throw new KrbApErrException(Krb5.KRB_AP_ERR_MODIFIED);
+ }
+ }
}
}
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -84,7 +84,7 @@
EncTGSRepPart enc_part = new EncTGSRepPart(ref);
rep.encKDCRepPart = enc_part;
- check(false, req, rep);
+ check(false, req, rep, tgsReq.tgsReqKey);
this.creds = new Credentials(rep.ticket,
rep.cname,
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -36,6 +36,7 @@
import java.io.IOException;
import java.net.UnknownHostException;
import java.time.Instant;
+import java.util.Arrays;
/**
* This class encapsulates a Kerberos TGS-REQ that is sent from the
@@ -57,59 +58,23 @@
private byte[] ibuf;
// Used in CredentialsUtil
- public KrbTgsReq(Credentials asCreds,
- PrincipalName sname)
+ public KrbTgsReq(KDCOptions options, Credentials asCreds,
+ PrincipalName cname, PrincipalName sname,
+ Ticket[] additionalTickets, PAData[] extraPAs)
throws KrbException, IOException {
- this(new KDCOptions(),
- asCreds,
- sname,
- null, // KerberosTime from
- null, // KerberosTime till
- null, // KerberosTime rtime
- null, // eTypes, // null, // int[] eTypes
- null, // HostAddresses addresses
- null, // AuthorizationData authorizationData
- null, // Ticket[] additionalTickets
- null); // EncryptionKey subSessionKey
- }
-
- // S4U2proxy
- public KrbTgsReq(Credentials asCreds,
- Ticket second,
- PrincipalName sname)
- throws KrbException, IOException {
- this(KDCOptions.with(KDCOptions.CNAME_IN_ADDL_TKT,
- KDCOptions.FORWARDABLE),
- asCreds,
- sname,
- null,
- null,
- null,
- null,
- null,
- null,
- new Ticket[] {second}, // the service ticket
- null);
- }
-
- // S4U2user
- public KrbTgsReq(Credentials asCreds,
- PrincipalName sname,
- PAData extraPA)
- throws KrbException, IOException {
- this(KDCOptions.with(KDCOptions.FORWARDABLE),
- asCreds,
- asCreds.getClient(),
- sname,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- extraPA); // the PA-FOR-USER
+ this(options,
+ asCreds,
+ cname,
+ sname,
+ null, // KerberosTime from
+ null, // KerberosTime till
+ null, // KerberosTime rtime
+ null, // int[] eTypes
+ null, // HostAddresses addresses
+ null, // AuthorizationData authorizationData
+ additionalTickets,
+ null, // EncryptionKey subKey
+ extraPAs);
}
// Called by Credentials, KrbCred
@@ -143,7 +108,7 @@
AuthorizationData authorizationData,
Ticket[] additionalTickets,
EncryptionKey subKey,
- PAData extraPA) throws KrbException, IOException {
+ PAData[] extraPAs) throws KrbException, IOException {
princName = cname;
servName = sname;
@@ -216,7 +181,7 @@
authorizationData,
additionalTickets,
subKey,
- extraPA);
+ extraPAs);
obuf = tgsReqMessg.asn1Encode();
// XXX We need to revisit this to see if can't move it
@@ -282,7 +247,7 @@
AuthorizationData authorizationData,
Ticket[] additionalTickets,
EncryptionKey subKey,
- PAData extraPA)
+ PAData[] extraPAs)
throws IOException, KrbException, UnknownHostException {
KerberosTime req_till = null;
if (till == null) {
@@ -382,11 +347,14 @@
null).getMessage();
PAData tgsPAData = new PAData(Krb5.PA_TGS_REQ, tgs_ap_req);
- return new TGSReq(
- extraPA != null ?
- new PAData[] {extraPA, tgsPAData } :
- new PAData[] {tgsPAData},
- reqBody);
+ PAData[] pa;
+ if (extraPAs != null) {
+ pa = Arrays.copyOf(extraPAs, extraPAs.length + 1);
+ pa[extraPAs.length] = tgsPAData;
+ } else {
+ pa = new PAData[] {tgsPAData};
+ }
+ return new TGSReq(pa, reqBody);
}
TGSReq getMessage() {
--- a/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -91,6 +91,11 @@
public static final int KRB_NT_UID = 5;
/**
+ * Enterprise name (alias)
+ */
+ public static final int KRB_NT_ENTERPRISE = 10;
+
+ /**
* TGS Name
*/
public static final String TGS_DEFAULT_SRV_NAME = "krbtgt";
@@ -465,6 +470,7 @@
case KRB_NT_SRV_INST:
case KRB_NT_SRV_XHST:
case KRB_NT_UID:
+ case KRB_NT_ENTERPRISE:
nameStrings = nameParts;
nameType = type;
if (realm != null) {
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/CredentialsUtil.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -33,6 +33,8 @@
import sun.security.krb5.*;
import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
/**
* This class is a utility that contains much of the TGS-Exchange
@@ -61,13 +63,11 @@
if (!ccreds.isForwardable()) {
throw new KrbException("S4U2self needs a FORWARDABLE ticket");
}
- KrbTgsReq req = new KrbTgsReq(
- ccreds,
- ccreds.getClient(),
- new PAData(Krb5.PA_FOR_USER,
- new PAForUserEnc(client,
- ccreds.getSessionKey()).asn1Encode()));
- Credentials creds = req.sendAndGetCreds();
+ Credentials creds = serviceCreds(KDCOptions.with(KDCOptions.FORWARDABLE),
+ ccreds, ccreds.getClient(), ccreds.getClient(), null,
+ new PAData[] {new PAData(Krb5.PA_FOR_USER,
+ new PAForUserEnc(client,
+ ccreds.getSessionKey()).asn1Encode())});
if (!creds.getClient().equals(client)) {
throw new KrbException("S4U2self request not honored by KDC");
}
@@ -89,11 +89,10 @@
String backend, Ticket second,
PrincipalName client, Credentials ccreds)
throws KrbException, IOException {
- KrbTgsReq req = new KrbTgsReq(
- ccreds,
- second,
- new PrincipalName(backend));
- Credentials creds = req.sendAndGetCreds();
+ Credentials creds = serviceCreds(KDCOptions.with(
+ KDCOptions.CNAME_IN_ADDL_TKT, KDCOptions.FORWARDABLE),
+ ccreds, ccreds.getClient(), new PrincipalName(backend),
+ new Ticket[] {second}, null);
if (!creds.getClient().equals(client)) {
throw new KrbException("S4U2proxy request not honored by KDC");
}
@@ -114,53 +113,9 @@
public static Credentials acquireServiceCreds(
String service, Credentials ccreds)
throws KrbException, IOException {
- PrincipalName sname = new PrincipalName(service);
- String serviceRealm = sname.getRealmString();
- String localRealm = ccreds.getClient().getRealmString();
-
- if (localRealm.equals(serviceRealm)) {
- if (DEBUG) {
- System.out.println(
- ">>> Credentials acquireServiceCreds: same realm");
- }
- return serviceCreds(sname, ccreds);
- }
- Credentials theCreds = null;
-
- boolean[] okAsDelegate = new boolean[1];
- Credentials theTgt = getTGTforRealm(localRealm, serviceRealm,
- ccreds, okAsDelegate);
- if (theTgt != null) {
- if (DEBUG) {
- System.out.println(">>> Credentials acquireServiceCreds: "
- + "got right tgt");
- System.out.println(">>> Credentials acquireServiceCreds: "
- + "obtaining service creds for " + sname);
- }
-
- try {
- theCreds = serviceCreds(sname, theTgt);
- } catch (Exception exc) {
- if (DEBUG) {
- System.out.println(exc);
- }
- theCreds = null;
- }
- }
-
- if (theCreds != null) {
- if (DEBUG) {
- System.out.println(">>> Credentials acquireServiceCreds: "
- + "returning creds:");
- Credentials.printDebug(theCreds);
- }
- if (!okAsDelegate[0]) {
- theCreds.resetDelegate();
- }
- return theCreds;
- }
- throw new KrbApErrException(Krb5.KRB_AP_ERR_GEN_CRED,
- "No service creds");
+ PrincipalName sname = new PrincipalName(service,
+ PrincipalName.KRB_NT_SRV_HST);
+ return serviceCreds(sname, ccreds);
}
/**
@@ -305,6 +260,148 @@
private static Credentials serviceCreds(
PrincipalName service, Credentials ccreds)
throws KrbException, IOException {
- return new KrbTgsReq(ccreds, service).sendAndGetCreds();
+ return serviceCreds(new KDCOptions(), ccreds,
+ ccreds.getClient(), service, null, null);
+ }
+
+ /*
+ * Obtains credentials for a service (TGS).
+ * Cross-realm referrals are handled if enabled. A fallback scheme
+ * without cross-realm referrals supports is used in case of server
+ * error to maintain backward compatibility.
+ */
+ private static Credentials serviceCreds(
+ KDCOptions options, Credentials asCreds,
+ PrincipalName cname, PrincipalName sname,
+ Ticket[] additionalTickets, PAData[] extraPAs)
+ throws KrbException, IOException {
+ if (!Config.DISABLE_REFERRALS) {
+ try {
+ return serviceCredsReferrals(options, asCreds,
+ cname, sname, additionalTickets, extraPAs);
+ } catch (KrbException e) {
+ // Server may raise an error if CANONICALIZE is true.
+ // Try CANONICALIZE false.
+ }
+ }
+ return serviceCredsSingle(options, asCreds,
+ cname, sname, additionalTickets, extraPAs);
+ }
+
+ /*
+ * Obtains credentials for a service (TGS).
+ * May handle and follow cross-realm referrals as defined by RFC 6806.
+ */
+ private static Credentials serviceCredsReferrals(
+ KDCOptions options, Credentials asCreds,
+ PrincipalName cname, PrincipalName sname,
+ Ticket[] additionalTickets, PAData[] extraPAs)
+ throws KrbException, IOException {
+ options = new KDCOptions(options.toBooleanArray());
+ options.set(KDCOptions.CANONICALIZE, true);
+ PrincipalName cSname = sname;
+ Credentials creds = null;
+ boolean isReferral = false;
+ List<String> referrals = new LinkedList<>();
+ while (referrals.size() <= Config.MAX_REFERRALS) {
+ ReferralsCache.ReferralCacheEntry ref =
+ ReferralsCache.get(sname, cSname.getRealmString());
+ String toRealm = null;
+ if (ref == null) {
+ creds = serviceCredsSingle(options, asCreds,
+ cname, cSname, additionalTickets, extraPAs);
+ PrincipalName server = creds.getServer();
+ if (!cSname.equals(server)) {
+ String[] serverNameStrings = server.getNameStrings();
+ if (serverNameStrings.length == 2 &&
+ serverNameStrings[0].equals(
+ PrincipalName.TGS_DEFAULT_SRV_NAME) &&
+ !cSname.getRealmAsString().equals(serverNameStrings[1])) {
+ // Server Name (sname) has the following format:
+ // krbtgt/TO-REALM.COM@FROM-REALM.COM
+ ReferralsCache.put(sname, server.getRealmString(),
+ serverNameStrings[1], creds);
+ toRealm = serverNameStrings[1];
+ isReferral = true;
+ asCreds = creds;
+ }
+ }
+ } else {
+ toRealm = ref.getToRealm();
+ asCreds = ref.getCreds();
+ isReferral = true;
+ }
+ if (isReferral) {
+ if (referrals.contains(toRealm)) {
+ // Referrals loop detected
+ return null;
+ }
+ cSname = new PrincipalName(cSname.getNameString(),
+ cSname.getNameType(), toRealm);
+ referrals.add(toRealm);
+ isReferral = false;
+ continue;
+ }
+ break;
+ }
+ return creds;
+ }
+
+ /*
+ * Obtains credentials for a service (TGS).
+ * If the service realm is different than the one in the TGT, a new TGT for
+ * the service realm is obtained first (see getTGTforRealm call). This is
+ * not expected when following cross-realm referrals because the referral
+ * TGT realm matches the service realm.
+ */
+ private static Credentials serviceCredsSingle(
+ KDCOptions options, Credentials asCreds,
+ PrincipalName cname, PrincipalName sname,
+ Ticket[] additionalTickets, PAData[] extraPAs)
+ throws KrbException, IOException {
+ Credentials theCreds = null;
+ boolean[] okAsDelegate = new boolean[]{true};
+ String[] serverAsCredsNames = asCreds.getServer().getNameStrings();
+ String tgtRealm = serverAsCredsNames[1];
+ String serviceRealm = sname.getRealmString();
+ if (!serviceRealm.equals(tgtRealm)) {
+ // This is a cross-realm service request
+ if (DEBUG) {
+ System.out.println(">>> serviceCredsSingle:" +
+ " cross-realm authentication");
+ System.out.println(">>> serviceCredsSingle:" +
+ " obtaining credentials from " + tgtRealm +
+ " to " + serviceRealm);
+ }
+ Credentials newTgt = getTGTforRealm(tgtRealm, serviceRealm,
+ asCreds, okAsDelegate);
+ if (newTgt == null) {
+ throw new KrbApErrException(Krb5.KRB_AP_ERR_GEN_CRED,
+ "No service creds");
+ }
+ if (DEBUG) {
+ System.out.println(">>> Cross-realm TGT Credentials" +
+ " serviceCredsSingle: ");
+ Credentials.printDebug(newTgt);
+ }
+ asCreds = newTgt;
+ cname = asCreds.getClient();
+ } else if (DEBUG) {
+ System.out.println(">>> Credentials serviceCredsSingle:" +
+ " same realm");
+ }
+ KrbTgsReq req = new KrbTgsReq(options, asCreds,
+ cname, sname, additionalTickets, extraPAs);
+ theCreds = req.sendAndGetCreds();
+ if (theCreds != null) {
+ if (DEBUG) {
+ System.out.println(">>> TGS credentials serviceCredsSingle:");
+ Credentials.printDebug(theCreds);
+ }
+ if (!okAsDelegate[0]) {
+ theCreds.resetDelegate();
+ }
+ }
+ return theCreds;
}
}
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncASRepPart.java Fri Jun 07 09:38:40 2019 -0700
@@ -47,7 +47,8 @@
KerberosTime new_endtime,
KerberosTime new_renewTill,
PrincipalName new_sname,
- HostAddresses new_caddr) {
+ HostAddresses new_caddr,
+ PAData[] new_pAData) {
super(
new_key,
new_lastReq,
@@ -60,6 +61,7 @@
new_renewTill,
new_sname,
new_caddr,
+ new_pAData,
Krb5.KRB_ENC_AS_REP_PART
);
//may need to use Krb5.KRB_ENC_TGS_REP_PART to mimic
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncKDCRepPart.java Fri Jun 07 09:38:40 2019 -0700
@@ -31,7 +31,6 @@
package sun.security.krb5.internal;
import sun.security.krb5.*;
-import sun.security.krb5.EncryptionKey;
import sun.security.util.*;
import java.util.Vector;
import java.io.IOException;
@@ -41,19 +40,20 @@
* Implements the ASN.1 EncKDCRepPart type.
*
* <pre>{@code
- * EncKDCRepPart ::= SEQUENCE {
- * key [0] EncryptionKey,
- * last-req [1] LastReq,
- * nonce [2] UInt32,
- * key-expiration [3] KerberosTime OPTIONAL,
- * flags [4] TicketFlags,
- * authtime [5] KerberosTime,
- * starttime [6] KerberosTime OPTIONAL,
- * endtime [7] KerberosTime,
- * renew-till [8] KerberosTime OPTIONAL,
- * srealm [9] Realm,
- * sname [10] PrincipalName,
- * caddr [11] HostAddresses OPTIONAL
+ * EncKDCRepPart ::= SEQUENCE {
+ * key [0] EncryptionKey,
+ * last-req [1] LastReq,
+ * nonce [2] UInt32,
+ * key-expiration [3] KerberosTime OPTIONAL,
+ * flags [4] TicketFlags,
+ * authtime [5] KerberosTime,
+ * starttime [6] KerberosTime OPTIONAL,
+ * endtime [7] KerberosTime,
+ * renew-till [8] KerberosTime OPTIONAL,
+ * srealm [9] Realm,
+ * sname [10] PrincipalName,
+ * caddr [11] HostAddresses OPTIONAL,
+ * encrypted-pa-data [12] SEQUENCE OF PA-DATA OPTIONAL
* }
* }</pre>
*
@@ -76,6 +76,7 @@
public KerberosTime renewTill; //optional
public PrincipalName sname;
public HostAddresses caddr; //optional
+ public PAData[] pAData; //optional
public int msgType; //not included in sequence
public EncKDCRepPart(
@@ -90,6 +91,7 @@
KerberosTime new_renewTill,
PrincipalName new_sname,
HostAddresses new_caddr,
+ PAData[] new_pAData,
int new_msgType) {
key = new_key;
lastReq = new_lastReq;
@@ -102,6 +104,7 @@
renewTill = new_renewTill;
sname = new_sname;
caddr = new_caddr;
+ pAData = new_pAData;
msgType = new_msgType;
}
@@ -160,6 +163,9 @@
if (der.getData().available() > 0) {
caddr = HostAddresses.parse(der.getData(), (byte) 0x0B, true);
}
+ if (der.getData().available() > 0) {
+ pAData = PAData.parseSequence(der.getData(), (byte) 0x0C, true);
+ }
// We observe extra data from MSAD
/*if (der.getData().available() > 0) {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
@@ -175,47 +181,58 @@
*/
public byte[] asn1Encode(int rep_type) throws Asn1Exception,
IOException {
+ DerOutputStream bytes;
DerOutputStream temp = new DerOutputStream();
- DerOutputStream bytes = new DerOutputStream();
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ DerOutputStream out = new DerOutputStream();
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x00), key.asn1Encode());
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x01), lastReq.asn1Encode());
temp.putInteger(BigInteger.valueOf(nonce));
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x02), temp);
if (keyExpiration != null) {
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x03), keyExpiration.asn1Encode());
}
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x04), flags.asn1Encode());
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x05), authtime.asn1Encode());
if (starttime != null) {
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x06), starttime.asn1Encode());
}
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x07), endtime.asn1Encode());
if (renewTill != null) {
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x08), renewTill.asn1Encode());
}
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x09), sname.getRealm().asn1Encode());
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x0A), sname.asn1Encode());
if (caddr != null) {
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
true, (byte) 0x0B), caddr.asn1Encode());
}
+ if (pAData != null && pAData.length > 0) {
+ temp = new DerOutputStream();
+ for (int i = 0; i < pAData.length; i++) {
+ temp.write(pAData[i].asn1Encode());
+ }
+ bytes = new DerOutputStream();
+ bytes.write(DerValue.tag_SequenceOf, temp);
+ out.write(DerValue.createTag(DerValue.TAG_CONTEXT,
+ true, (byte) 0x0C), bytes);
+ }
//should use the rep_type to build the encoding
//but other implementations do not; it is ignored and
//the cached msgType is used instead
temp = new DerOutputStream();
- temp.write(DerValue.tag_Sequence, bytes);
+ temp.write(DerValue.tag_Sequence, out);
bytes = new DerOutputStream();
bytes.write(DerValue.createTag(DerValue.TAG_APPLICATION,
true, (byte) msgType), temp);
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/EncTGSRepPart.java Fri Jun 07 09:38:40 2019 -0700
@@ -46,7 +46,8 @@
KerberosTime new_endtime,
KerberosTime new_renewTill,
PrincipalName new_sname,
- HostAddresses new_caddr) {
+ HostAddresses new_caddr,
+ PAData[] new_pAData) {
super(
new_key,
new_lastReq,
@@ -59,6 +60,7 @@
new_renewTill,
new_sname,
new_caddr,
+ new_pAData,
Krb5.KRB_ENC_TGS_REP_PART);
}
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCOptions.java Fri Jun 07 09:38:40 2019 -0700
@@ -140,6 +140,7 @@
public static final int UNUSED10 = 10;
public static final int UNUSED11 = 11;
public static final int CNAME_IN_ADDL_TKT = 14;
+ public static final int CANONICALIZE = 15;
public static final int RENEWABLE_OK = 27;
public static final int ENC_TKT_IN_SKEY = 28;
public static final int RENEW = 30;
@@ -160,7 +161,8 @@
"UNUSED11", //11;
null,null,
"CNAME_IN_ADDL_TKT",//14;
- null,null,null,null,null,null,null,null,null,null,null,null,
+ "CANONICALIZE", //15;
+ null,null,null,null,null,null,null,null,null,null,null,
"RENEWABLE_OK", //27;
"ENC_TKT_IN_SKEY", //28;
null,
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KDCReq.java Fri Jun 07 09:38:40 2019 -0700
@@ -59,9 +59,9 @@
public class KDCReq {
public KDCReqBody reqBody;
+ public PAData[] pAData = null; //optional
private int pvno;
private int msgType;
- private PAData[] pAData = null; //optional
public KDCReq(PAData[] new_pAData, KDCReqBody new_reqBody,
int req_type) throws IOException {
@@ -144,23 +144,7 @@
} else {
throw new Asn1Exception(Krb5.ASN1_BAD_ID);
}
- if ((der.getData().peekByte() & 0x1F) == 0x03) {
- subDer = der.getData().getDerValue();
- DerValue subsubDer = subDer.getData().getDerValue();
- if (subsubDer.getTag() != DerValue.tag_SequenceOf) {
- throw new Asn1Exception(Krb5.ASN1_BAD_ID);
- }
- Vector<PAData> v = new Vector<>();
- while (subsubDer.getData().available() > 0) {
- v.addElement(new PAData(subsubDer.getData().getDerValue()));
- }
- if (v.size() > 0) {
- pAData = new PAData[v.size()];
- v.copyInto(pAData);
- }
- } else {
- pAData = null;
- }
+ pAData = PAData.parseSequence(der.getData(), (byte) 0x03, true);
subDer = der.getData().getDerValue();
if ((subDer.getTag() & 0x01F) == 0x04) {
DerValue subsubDer = subDer.getData().getDerValue();
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/KRBError.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -90,6 +90,7 @@
private KerberosTime sTime;
private Integer suSec;
private int errorCode;
+ private Realm crealm; //optional
private PrincipalName cname; //optional
private PrincipalName sname;
private String eText; //optional
@@ -138,6 +139,7 @@
sTime = new_sTime;
suSec = new_suSec;
errorCode = new_errorCode;
+ crealm = new_cname.getRealm();
cname = new_cname;
sname = new_sname;
eText = new_eText;
@@ -166,6 +168,7 @@
sTime = new_sTime;
suSec = new_suSec;
errorCode = new_errorCode;
+ crealm = new_cname.getRealm();
cname = new_cname;
sname = new_sname;
eText = new_eText;
@@ -262,6 +265,10 @@
pa = paList.toArray(new PAData[paList.size()]);
}
+ public final Realm getClientRealm() {
+ return crealm;
+ }
+
public final KerberosTime getServerTime() {
return sTime;
}
@@ -349,7 +356,7 @@
errorCode = subDer.getData().getBigInteger().intValue();
}
else throw new Asn1Exception(Krb5.ASN1_BAD_ID);
- Realm crealm = Realm.parse(der.getData(), (byte)0x07, true);
+ crealm = Realm.parse(der.getData(), (byte)0x07, true);
cname = PrincipalName.parse(der.getData(), (byte)0x08, true, crealm);
Realm realm = Realm.parse(der.getData(), (byte)0x09, false);
sname = PrincipalName.parse(der.getData(), (byte)0x0A, false, realm);
@@ -393,6 +400,9 @@
System.out.println("\t suSec is " + suSec);
System.out.println("\t error code is " + errorCode);
System.out.println("\t error Message is " + Krb5.getErrorMessage(errorCode));
+ if (crealm != null) {
+ System.out.println("\t crealm is " + crealm.toString());
+ }
if (cname != null) {
System.out.println("\t cname is " + cname.toString());
}
@@ -442,8 +452,10 @@
temp.putInteger(BigInteger.valueOf(errorCode));
bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x06), temp);
+ if (crealm != null) {
+ bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x07), crealm.asn1Encode());
+ }
if (cname != null) {
- bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x07), cname.getRealm().asn1Encode());
bytes.write(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x08), cname.asn1Encode());
}
@@ -488,6 +500,7 @@
isEqual(sTime, other.sTime) &&
isEqual(suSec, other.suSec) &&
errorCode == other.errorCode &&
+ isEqual(crealm, other.crealm) &&
isEqual(cname, other.cname) &&
isEqual(sname, other.sname) &&
isEqual(eText, other.eText) &&
@@ -508,6 +521,7 @@
if (sTime != null) result = 37 * result + sTime.hashCode();
if (suSec != null) result = 37 * result + suSec.hashCode();
result = 37 * result + errorCode;
+ if (crealm != null) result = 37 * result + crealm.hashCode();
if (cname != null) result = 37 * result + cname.hashCode();
if (sname != null) result = 37 * result + sname.hashCode();
if (eText != null) result = 37 * result + eText.hashCode();
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/Krb5.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, 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
@@ -72,6 +72,7 @@
public static final int TKT_OPTS_PRE_AUTHENT = 10;
public static final int TKT_OPTS_HW_AUTHENT = 11;
public static final int TKT_OPTS_DELEGATE = 13;
+ public static final int TKT_OPTS_ENC_PA_REP = 15;
public static final int TKT_OPTS_MAX = 31;
// KDC Options
@@ -165,6 +166,9 @@
// S4U2user info
public static final int PA_FOR_USER = 129;
+ // FAST (RFC 6806)
+ public static final int PA_REQ_ENC_PA_REP = 149;
+
//-------------------------------+-------------
//authorization data type |ad-type value
//-------------------------------+-------------
@@ -267,6 +271,7 @@
public static final int KRB_ERR_RESPONSE_TOO_BIG = 52; //Response too big for UDP, retry with TCP
public static final int KRB_ERR_GENERIC = 60; //Generic error (description in e-text)
public static final int KRB_ERR_FIELD_TOOLONG = 61; //Field is too long for this implementation
+ public static final int KRB_ERR_WRONG_REALM = 68; //Wrong realm
public static final int KRB_CRYPTO_NOT_SUPPORT = 100; //Client does not support this crypto type
public static final int KRB_AP_ERR_NOREALM = 62;
public static final int KRB_AP_ERR_GEN_CRED = 63;
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/PAData.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019 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
@@ -35,6 +35,8 @@
import sun.security.util.*;
import sun.security.krb5.Asn1Exception;
import java.io.IOException;
+import java.util.Vector;
+
import sun.security.krb5.internal.util.KerberosString;
/**
@@ -140,6 +142,41 @@
}
/**
+ * Parse (unmarshal) a PAData from a DER input stream. This form
+ * parsing might be used when expanding a value which is part of
+ * a constructed sequence and uses explicitly tagged type.
+ *
+ * @exception Asn1Exception if an Asn1Exception occurs.
+ * @param data the Der input stream value, which contains one or more
+ * marshaled values.
+ * @param explicitTag tag number.
+ * @param optional indicates if this data field is optional.
+ * @return an array of PAData.
+ */
+ public static PAData[] parseSequence(DerInputStream data,
+ byte explicitTag, boolean optional)
+ throws Asn1Exception, IOException {
+ if ((optional) &&
+ (((byte)data.peekByte() & (byte)0x1F) != explicitTag))
+ return null;
+ DerValue subDer = data.getDerValue();
+ DerValue subsubDer = subDer.getData().getDerValue();
+ if (subsubDer.getTag() != DerValue.tag_SequenceOf) {
+ throw new Asn1Exception(Krb5.ASN1_BAD_ID);
+ }
+ Vector<PAData> v = new Vector<>();
+ while (subsubDer.getData().available() > 0) {
+ v.addElement(new PAData(subsubDer.getData().getDerValue()));
+ }
+ if (v.size() > 0) {
+ PAData[] pas = new PAData[v.size()];
+ v.copyInto(pas);
+ return pas;
+ }
+ return null;
+ }
+
+ /**
* Gets the preferred etype from the PAData array.
* <ol>
* <li>ETYPE-INFO2-ENTRY with unknown s2kparams ignored</li>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ReferralsCache.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.krb5.internal;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import sun.security.krb5.Credentials;
+import sun.security.krb5.PrincipalName;
+
+/*
+ * ReferralsCache class implements a cache scheme for referral TGTs as
+ * described in RFC 6806 - 10. Caching Information. The goal is to optimize
+ * resources (such as network traffic) when a client requests credentials for a
+ * service principal to a given KDC. If a referral TGT was previously received,
+ * cached information is used instead of issuing a new query. Once a referral
+ * TGT expires, the corresponding referral entry in the cache is removed.
+ */
+final class ReferralsCache {
+
+ private static Map<PrincipalName, Map<String, ReferralCacheEntry>> referralsMap =
+ new HashMap<>();
+
+ static final class ReferralCacheEntry {
+ private final Credentials creds;
+ private final String toRealm;
+ ReferralCacheEntry(Credentials creds, String toRealm) {
+ this.creds = creds;
+ this.toRealm = toRealm;
+ }
+ Credentials getCreds() {
+ return creds;
+ }
+ String getToRealm() {
+ return toRealm;
+ }
+ }
+
+ /*
+ * Add a new referral entry to the cache, including: service principal,
+ * source KDC realm, destination KDC realm and referral TGT.
+ *
+ * If a loop is generated when adding the new referral, the first hop is
+ * automatically removed. For example, let's assume that adding a
+ * REALM-3.COM -> REALM-1.COM referral generates the following loop:
+ * REALM-1.COM -> REALM-2.COM -> REALM-3.COM -> REALM-1.COM. Then,
+ * REALM-1.COM -> REALM-2.COM referral entry is removed from the cache.
+ */
+ static synchronized void put(PrincipalName service,
+ String fromRealm, String toRealm, Credentials creds) {
+ pruneExpired(service);
+ if (creds.getEndTime().before(new Date())) {
+ return;
+ }
+ Map<String, ReferralCacheEntry> entries = referralsMap.get(service);
+ if (entries == null) {
+ entries = new HashMap<String, ReferralCacheEntry>();
+ referralsMap.put(service, entries);
+ }
+ entries.remove(fromRealm);
+ ReferralCacheEntry newEntry = new ReferralCacheEntry(creds, toRealm);
+ entries.put(fromRealm, newEntry);
+
+ // Remove loops within the cache
+ ReferralCacheEntry current = newEntry;
+ List<ReferralCacheEntry> seen = new LinkedList<>();
+ while (current != null) {
+ if (seen.contains(current)) {
+ // Loop found. Remove the first referral to cut the loop.
+ entries.remove(newEntry.getToRealm());
+ break;
+ }
+ seen.add(current);
+ current = entries.get(current.getToRealm());
+ }
+ }
+
+ /*
+ * Obtain a referral entry from the cache given a service principal and a
+ * source KDC realm.
+ */
+ static synchronized ReferralCacheEntry get(PrincipalName service,
+ String fromRealm) {
+ pruneExpired(service);
+ Map<String, ReferralCacheEntry> entries = referralsMap.get(service);
+ if (entries != null) {
+ ReferralCacheEntry toRef = entries.get(fromRealm);
+ if (toRef != null) {
+ return toRef;
+ }
+ }
+ return null;
+ }
+
+ /*
+ * Remove referral entries from the cache when referral TGTs expire.
+ */
+ private static void pruneExpired(PrincipalName service) {
+ Date now = new Date();
+ Map<String, ReferralCacheEntry> entries = referralsMap.get(service);
+ if (entries != null) {
+ for (Entry<String, ReferralCacheEntry> mapEntry :
+ entries.entrySet()) {
+ if (mapEntry.getValue().getCreds().getEndTime().before(now)) {
+ entries.remove(mapEntry.getKey());
+ }
+ }
+ }
+ }
+}
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/TicketFlags.java Fri Jun 07 09:38:40 2019 -0700
@@ -51,7 +51,8 @@
* renewable(8),
* initial(9),
* pre-authent(10),
- * hw-authent(11)
+ * hw-authent(11),
+ * enc-pa-rep(15)
* }
*/
public class TicketFlags extends KerberosFlags {
@@ -178,6 +179,9 @@
case 11:
sb.append("HW-AUTHENT;");
break;
+ case 15:
+ sb.append("ENC-PA-REP;");
+ break;
}
}
}
--- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, 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
@@ -56,6 +56,7 @@
public static final int KU_KRB_SAFE_CKSUM = 15; // KrbSafe
public static final int KU_PA_FOR_USER_ENC_CKSUM = 17; // S4U2user
public static final int KU_AD_KDC_ISSUED_CKSUM = 19;
+ public static final int KU_AS_REQ = 56;
public static final boolean isValid(int usage) {
return usage >= 0;
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/spi/SyncProvider.java Fri Jun 07 09:38:40 2019 -0700
@@ -55,7 +55,7 @@
* data. It uses the <code>XmlWriter</code> object to write itself to a stream or
* <code>java.io.Writer</code> object in XML format.
*
- * <h3>1.0 Naming Convention for Implementations</h3>
+ * <h2>1.0 Naming Convention for Implementations</h2>
* As a guide to naming <code>SyncProvider</code>
* implementations, the following should be noted:
* <UL>
--- a/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/source/doctree/package-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -30,7 +30,7 @@
* @author Jonathan Gibbons
* @since 1.8
*
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRoot}/../specs/javadoc/doc-comment-spec.html">
* Documentation Comment Specification for the Standard Doclet</a>
*/
package com.sun.source.doctree;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -46,6 +46,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
+import java.util.ServiceLoader;
import java.util.Set;
import javax.lang.model.element.Modifier;
@@ -417,6 +418,17 @@
public String toString() {
return wrappedToString(getClass(), clientJavaFileManager);
}
+
+ @Override @DefinedBy(Api.COMPILER)
+ public <S> ServiceLoader<S> getServiceLoader(Location location, Class<S> service) throws IOException {
+ try {
+ return clientJavaFileManager.getServiceLoader(location, service);
+ } catch (ClientCodeException e) {
+ throw e;
+ } catch (RuntimeException | Error e) {
+ throw new ClientCodeException(e);
+ }
+ }
}
protected class WrappedStandardJavaFileManager extends WrappedJavaFileManager
@@ -568,6 +580,18 @@
throw new ClientCodeException(e);
}
}
+
+ @Override @DefinedBy(Api.COMPILER)
+ public void setLocationForModule(Location location, String moduleName, Collection<? extends Path> paths) throws IOException {
+ try {
+ System.out.println("invoking wrapped setLocationForModule");
+ ((StandardJavaFileManager)clientJavaFileManager).setLocationForModule(location, moduleName, paths);
+ } catch (ClientCodeException e) {
+ throw e;
+ } catch (RuntimeException | Error e) {
+ throw new ClientCodeException(e);
+ }
+ }
}
protected class WrappedFileObject implements FileObject {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Fri Jun 07 09:38:40 2019 -0700
@@ -275,6 +275,11 @@
STATIC("static"),
/**
+ * Warn about issues relating to use of text blocks
+ */
+ TEXT_BLOCKS("text-blocks"),
+
+ /**
* Warn about issues relating to use of try blocks (i.e. try-with-resources)
*/
TRY("try"),
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Preview.java Fri Jun 07 09:38:40 2019 -0700
@@ -167,7 +167,8 @@
public boolean isPreview(Feature feature) {
if (feature == Feature.SWITCH_EXPRESSION ||
feature == Feature.SWITCH_MULTIPLE_CASE_LABELS ||
- feature == Feature.SWITCH_RULE)
+ feature == Feature.SWITCH_RULE ||
+ feature == Feature.TEXT_BLOCKS)
return true;
//Note: this is a backdoor which allows to optionally treat all features as 'preview' (for testing).
//When real preview features will be added, this method can be implemented to return 'true'
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java Fri Jun 07 09:38:40 2019 -0700
@@ -188,7 +188,8 @@
IMPORT_ON_DEMAND_OBSERVABLE_PACKAGES(JDK1_2, JDK8),
SWITCH_MULTIPLE_CASE_LABELS(JDK13, Fragments.FeatureMultipleCaseLabels, DiagKind.PLURAL),
SWITCH_RULE(JDK13, Fragments.FeatureSwitchRules, DiagKind.PLURAL),
- SWITCH_EXPRESSION(JDK13, Fragments.FeatureSwitchExpressions, DiagKind.PLURAL);
+ SWITCH_EXPRESSION(JDK13, Fragments.FeatureSwitchExpressions, DiagKind.PLURAL),
+ TEXT_BLOCKS(JDK13, Fragments.FeatureTextBlocks, DiagKind.PLURAL);
enum DiagKind {
NORMAL,
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -188,7 +188,7 @@
if (isFileContent) {
switch (phase) {
case PREAMBLE:
- if (peek("body")) {
+ if (isEndPreamble()) {
trees.add(html());
if (textStart == -1) {
textStart = bp;
@@ -200,7 +200,7 @@
}
break;
case BODY:
- if (peek("/body")) {
+ if (isEndBody()) {
addPendingText(trees, lastNonWhite);
break loop;
}
@@ -787,6 +787,94 @@
}
}
+ /**
+ * Returns whether this is the end of the preamble of an HTML file.
+ * The preamble ends with start of {@code body} element followed by
+ * possible whitespace and the start of a {@code main} element.
+ *
+ * @return whether this is the end of the preamble
+ */
+ boolean isEndPreamble() {
+ final int savedpos = bp;
+ try {
+ if (ch == '<')
+ nextChar();
+
+ if (isIdentifierStart(ch)) {
+ String name = StringUtils.toLowerCase(readIdentifier().toString());
+ switch (name) {
+ case "body":
+ // Check if also followed by <main>
+ // 1. skip rest of <body>
+ while (ch != -1 && ch != '>') {
+ nextChar();
+ }
+ if (ch == '>') {
+ nextChar();
+ }
+ // 2. skip any whitespce
+ while (ch != -1 && Character.isWhitespace(ch)) {
+ nextChar();
+ }
+ // 3. check if looking at "<main..."
+ if (ch == '<') {
+ nextChar();
+ if (isIdentifierStart(ch)) {
+ name = StringUtils.toLowerCase(readIdentifier().toString());
+ if (name.equals("main")) {
+ return false;
+ }
+ }
+ }
+ // if <body> is _not_ followed by <main> then this is the
+ // end of the preamble
+ return true;
+
+ case "main":
+ // <main> is unconditionally the end of the preamble
+ return true;
+ }
+ }
+ return false;
+ } finally {
+ bp = savedpos;
+ ch = buf[bp];
+ }
+ }
+
+ /**
+ * Returns whether this is the end of the main body of the content in a standalone
+ * HTML file.
+ * The content ends with the closing tag for a {@code main} or {@code body} element.
+ *
+ * @return whether this is the end of the main body of the content
+ */
+ boolean isEndBody() {
+ final int savedpos = bp;
+ try {
+ if (ch == '<')
+ nextChar();
+
+ if (ch == '/') {
+ nextChar();
+ if (isIdentifierStart(ch)) {
+ String name = StringUtils.toLowerCase(readIdentifier().toString());
+ switch (name) {
+ case "body":
+ case "main":
+ return true;
+ }
+ }
+ }
+
+ return false;
+ } finally {
+ bp = savedpos;
+ ch = buf[bp];
+ }
+
+ }
+
boolean peek(String s) {
final int savedpos = bp;
try {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,15 +25,22 @@
package com.sun.tools.javac.parser;
+import com.sun.tools.javac.code.Lint;
+import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Preview;
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.code.Source.Feature;
import com.sun.tools.javac.parser.Tokens.Comment.CommentStyle;
import com.sun.tools.javac.resources.CompilerProperties.Errors;
+import com.sun.tools.javac.resources.CompilerProperties.Warnings;
import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
+import com.sun.tools.javac.util.JCDiagnostic.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.nio.CharBuffer;
+import java.util.HashSet;
+import java.util.Set;
import static com.sun.tools.javac.parser.Tokens.*;
import static com.sun.tools.javac.util.LayoutCharacters.*;
@@ -84,8 +91,21 @@
*/
protected UnicodeReader reader;
+ /** Should the string stripped of indentation?
+ */
+ protected boolean shouldStripIndent;
+
+ /** Should the string's escapes be translated?
+ */
+ protected boolean shouldTranslateEscapes;
+
protected ScannerFactory fac;
+ // The set of lint options currently in effect. It is initialized
+ // from the context, and then is set/reset as needed by Attr as it
+ // visits all the various parts of the trees during attribution.
+ protected Lint lint;
+
private static final boolean hexFloatsWork = hexFloatsWork();
private static boolean hexFloatsWork() {
try {
@@ -121,6 +141,7 @@
this.source = fac.source;
this.preview = fac.preview;
this.reader = reader;
+ this.lint = fac.lint;
}
protected void checkSourceLevel(int pos, Feature feature) {
@@ -150,6 +171,11 @@
errPos = pos;
}
+ protected void lexWarning(LintCategory lc, int pos, JCDiagnostic.Warning key) {
+ DiagnosticPosition dp = new SimpleDiagnosticPosition(pos) ;
+ log.warning(lc, dp, key);
+ }
+
/** Read next character in character or string literal and copy into sbuf.
*/
private void scanLitChar(int pos) {
@@ -200,6 +226,309 @@
}
}
+ /** Read next character in character or string literal and copy into sbuf
+ * without translating escapes. Used by text blocks to preflight verify
+ * escapes sequences.
+ */
+ private void scanLitCharRaw(int pos) {
+ if (reader.ch == '\\') {
+ if (reader.peekChar() == '\\' && !reader.isUnicode()) {
+ reader.skipChar();
+ reader.putChar('\\', false);
+ reader.putChar('\\', true);
+ } else {
+ reader.putChar('\\', true);
+ switch (reader.ch) {
+ case '0': case '1': case '2': case '3':
+ case '4': case '5': case '6': case '7':
+ char leadch = reader.ch;
+ reader.putChar(true);
+ if ('0' <= reader.ch && reader.ch <= '7') {
+ reader.putChar(true);
+ if (leadch <= '3' && '0' <= reader.ch && reader.ch <= '7') {
+ reader.putChar(true);
+ }
+ }
+ break;
+ // Effectively list of valid escape sequences.
+ case 'b':
+ case 't':
+ case 'n':
+ case 'f':
+ case 'r':
+ case '\'':
+ case '\"':
+ case '\\':
+ reader.putChar(true); break;
+ default:
+ lexError(reader.bp, Errors.IllegalEscChar);
+ }
+ }
+ } else if (reader.bp != reader.buflen) {
+ reader.putChar(true);
+ }
+ }
+
+ /** Interim access to String methods used to support text blocks.
+ * Required to handle bootstrapping with pre-text block jdks.
+ * Could be reworked in the 'next' jdk.
+ */
+ static class TextBlockSupport {
+ /** Reflection method to remove incidental indentation.
+ */
+ private static final Method stripIndent;
+
+ /** Reflection method to translate escape sequences.
+ */
+ private static final Method translateEscapes;
+
+ /** true if stripIndent and translateEscapes are available in the bootstrap jdk.
+ */
+ private static final boolean hasSupport;
+
+ /** Get a string method via refection or null if not available.
+ */
+ private static Method getStringMethodOrNull(String name) {
+ try {
+ return String.class.getMethod(name);
+ } catch (Exception ex) {
+ // Method not available, return null.
+ }
+ return null;
+ }
+
+ static {
+ // Get text block string methods.
+ stripIndent = getStringMethodOrNull("stripIndent");
+ translateEscapes = getStringMethodOrNull("translateEscapes");
+ // true if stripIndent and translateEscapes are available in the bootstrap jdk.
+ hasSupport = stripIndent != null && translateEscapes != null;
+ }
+
+ /** Return true if stripIndent and translateEscapes are available in the bootstrap jdk.
+ */
+ static boolean hasSupport() {
+ return hasSupport;
+ }
+
+ /** Return the leading whitespace count (indentation) of the line.
+ */
+ private static int indent(String line) {
+ return line.length() - line.stripLeading().length();
+ }
+
+ enum WhitespaceChecks {
+ INCONSISTENT,
+ TRAILING
+ };
+
+ /** Check that the use of white space in content is not problematic.
+ */
+ static Set<WhitespaceChecks> checkWhitespace(String string) {
+ // Start with empty result set.
+ Set<WhitespaceChecks> checks = new HashSet<>();
+ // No need to check empty strings.
+ if (string.isEmpty()) {
+ return checks;
+ }
+ // Maximum common indentation.
+ int outdent = 0;
+ // No need to check indentation if opting out (last line is empty.)
+ char lastChar = string.charAt(string.length() - 1);
+ boolean optOut = lastChar == '\n' || lastChar == '\r';
+ // Split string based at line terminators.
+ String[] lines = string.split("\\R");
+ int length = lines.length;
+ // Extract last line.
+ String lastLine = lines[length - 1];
+ if (!optOut) {
+ // Prime with the last line indentation (may be blank.)
+ outdent = indent(lastLine);
+ for (String line : lines) {
+ // Blanks lines have no influence (last line accounted for.)
+ if (!line.isBlank()) {
+ outdent = Integer.min(outdent, indent(line));
+ if (outdent == 0) {
+ break;
+ }
+ }
+ }
+ }
+ // Last line is representative.
+ String start = lastLine.substring(0, outdent);
+ for (String line : lines) {
+ // Fail if a line does not have the same indentation.
+ if (!line.isBlank() && !line.startsWith(start)) {
+ // Mix of different white space
+ checks.add(WhitespaceChecks.INCONSISTENT);
+ }
+ // Line has content even after indent is removed.
+ if (outdent < line.length()) {
+ // Is the last character a white space.
+ lastChar = line.charAt(line.length() - 1);
+ if (Character.isWhitespace(lastChar)) {
+ // Has trailing white space.
+ checks.add(WhitespaceChecks.TRAILING);
+ }
+ }
+ }
+ return checks;
+ }
+
+ /** Invoke String::stripIndent through reflection.
+ */
+ static String stripIndent(String string) {
+ try {
+ string = (String)stripIndent.invoke(string);
+ } catch (InvocationTargetException | IllegalAccessException ex) {
+ throw new RuntimeException(ex);
+ }
+ return string;
+ }
+
+ /** Invoke String::translateEscapes through reflection.
+ */
+ static String translateEscapes(String string) {
+ try {
+ string = (String)translateEscapes.invoke(string);
+ } catch (InvocationTargetException | IllegalAccessException ex) {
+ throw new RuntimeException(ex);
+ }
+ return string;
+ }
+ }
+
+ /** Test for EOLN.
+ */
+ private boolean isEOLN() {
+ return reader.ch == LF || reader.ch == CR;
+ }
+
+ /** Test for CRLF.
+ */
+ private boolean isCRLF() {
+ return reader.ch == CR && reader.peekChar() == LF;
+ }
+
+ /** Count and skip repeated occurances of the specified character.
+ */
+ private int countChar(char ch, int max) {
+ int count = 0;
+ for ( ; count < max && reader.bp < reader.buflen && reader.ch == ch; count++) {
+ reader.scanChar();
+ }
+ return count;
+ }
+
+ /** Scan a string literal or text block.
+ */
+ private void scanString(int pos) {
+ // Clear flags.
+ shouldStripIndent = false;
+ shouldTranslateEscapes = false;
+ // Check if text block string methods are present.
+ boolean hasTextBlockSupport = TextBlockSupport.hasSupport();
+ // Track the end of first line for error recovery.
+ int firstEOLN = -1;
+ // Attempt to scan for up to 3 double quotes.
+ int openCount = countChar('\"', 3);
+ switch (openCount) {
+ case 1: // Starting a string literal.
+ break;
+ case 2: // Starting an empty string literal.
+ // Start again but only consume one quote.
+ reader.reset(pos);
+ openCount = countChar('\"', 1);
+ break;
+ case 3: // Starting a text block.
+ // Check if preview feature is enabled for text blocks.
+ checkSourceLevel(pos, Feature.TEXT_BLOCKS);
+ // Only proceed if text block string methods are present.
+ if (hasTextBlockSupport) {
+ // Indicate that the final string should have incidental indentation removed.
+ shouldStripIndent = true;
+ // Verify the open delimiter sequence.
+ boolean hasOpenEOLN = false;
+ while (reader.bp < reader.buflen && Character.isWhitespace(reader.ch)) {
+ hasOpenEOLN = isEOLN();
+ if (hasOpenEOLN) {
+ break;
+ }
+ reader.scanChar();
+ }
+ // Error if the open delimiter sequence not is """<Whitespace>*<LineTerminator>.
+ if (!hasOpenEOLN) {
+ lexError(reader.bp, Errors.IllegalTextBlockOpen);
+ return;
+ }
+ // Skip line terminator.
+ int start = reader.bp;
+ if (isCRLF()) {
+ reader.scanChar();
+ }
+ reader.scanChar();
+ processLineTerminator(start, reader.bp);
+ } else {
+ // No text block string methods are present, so reset and treat like string literal.
+ reader.reset(pos);
+ openCount = countChar('\"', 1);
+ }
+ break;
+ }
+ // While characters are available.
+ while (reader.bp < reader.buflen) {
+ // If possible close delimiter sequence.
+ if (reader.ch == '\"') {
+ // Check to see if enough double quotes are present.
+ int closeCount = countChar('\"', openCount);
+ if (openCount == closeCount) {
+ // Good result.
+ tk = Tokens.TokenKind.STRINGLITERAL;
+ return;
+ }
+ // False alarm, add double quotes to string buffer.
+ reader.repeat('\"', closeCount);
+ } else if (isEOLN()) {
+ // Line terminator in string literal is an error.
+ // Fall out to unclosed string literal error.
+ if (openCount == 1) {
+ break;
+ }
+ // Add line terminator to string buffer.
+ int start = reader.bp;
+ if (isCRLF()) {
+ reader.scanChar();
+ }
+ reader.putChar('\n', true);
+ processLineTerminator(start, reader.bp);
+ // Record first line terminator for error recovery.
+ if (firstEOLN == -1) {
+ firstEOLN = reader.bp;
+ }
+ } else if (reader.ch == '\\') {
+ // Handle escape sequences.
+ if (hasTextBlockSupport) {
+ // Indicate that the final string should have escapes translated.
+ shouldTranslateEscapes = true;
+ // Validate escape sequence and add to string buffer.
+ scanLitCharRaw(pos);
+ } else {
+ // Translate escape sequence and add result to string buffer.
+ scanLitChar(pos);
+ }
+ } else {
+ // Add character to string buffer.
+ reader.putChar(true);
+ }
+ }
+ // String ended without close delimiter sequence.
+ lexError(pos, openCount == 1 ? Errors.UnclosedStrLit : Errors.UnclosedTextBlock);
+ if (firstEOLN != -1) {
+ // Reset recovery position to point after open delimiter sequence.
+ reader.reset(firstEOLN);
+ }
+ }
+
private void scanDigits(int pos, int digitRadix) {
char saveCh;
int savePos;
@@ -624,7 +953,7 @@
lexError(pos, Errors.EmptyCharLit);
reader.scanChar();
} else {
- if (reader.ch == CR || reader.ch == LF)
+ if (isEOLN())
lexError(pos, Errors.IllegalLineEndInCharLit);
scanLitChar(pos);
if (reader.ch == '\'') {
@@ -636,17 +965,9 @@
}
break loop;
case '\"':
- reader.scanChar();
- while (reader.ch != '\"' && reader.ch != CR && reader.ch != LF && reader.bp < reader.buflen)
- scanLitChar(pos);
- if (reader.ch == '\"') {
- tk = TokenKind.STRINGLITERAL;
- reader.scanChar();
- } else {
- lexError(pos, Errors.UnclosedStrLit);
- }
+ scanString(pos);
break loop;
- default:
+ default:
if (isSpecial(reader.ch)) {
scanOperator();
} else {
@@ -695,7 +1016,34 @@
switch (tk.tag) {
case DEFAULT: return new Token(tk, pos, endPos, comments);
case NAMED: return new NamedToken(tk, pos, endPos, name, comments);
- case STRING: return new StringToken(tk, pos, endPos, reader.chars(), comments);
+ case STRING: {
+ // Get characters from string buffer.
+ String string = reader.chars();
+ // If a text block.
+ if (shouldStripIndent) {
+ // Verify that the incidental indentation is consistent.
+ if (lint.isEnabled(LintCategory.TEXT_BLOCKS)) {
+ Set<TextBlockSupport.WhitespaceChecks> checks =
+ TextBlockSupport.checkWhitespace(string);
+ if (checks.contains(TextBlockSupport.WhitespaceChecks.INCONSISTENT)) {
+ lexWarning(LintCategory.TEXT_BLOCKS, pos,
+ Warnings.InconsistentWhiteSpaceIndentation);
+ }
+ if (checks.contains(TextBlockSupport.WhitespaceChecks.TRAILING)) {
+ lexWarning(LintCategory.TEXT_BLOCKS, pos,
+ Warnings.TrailingWhiteSpaceWillBeRemoved);
+ }
+ }
+ // Remove incidental indentation.
+ string = TextBlockSupport.stripIndent(string);
+ }
+ // Translate escape sequences if present.
+ if (shouldTranslateEscapes) {
+ string = TextBlockSupport.translateEscapes(string);
+ }
+ // Build string token.
+ return new StringToken(tk, pos, endPos, string, comments);
+ }
case NUMERIC: return new NumericToken(tk, pos, endPos, reader.chars(), radix, comments);
default: throw new AssertionError();
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/ScannerFactory.java Fri Jun 07 09:38:40 2019 -0700
@@ -27,6 +27,7 @@
import java.nio.CharBuffer;
+import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Preview;
import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.util.Context;
@@ -59,6 +60,7 @@
final Source source;
final Preview preview;
final Tokens tokens;
+ final Lint lint;
/** Create a new scanner factory. */
protected ScannerFactory(Context context) {
@@ -68,6 +70,7 @@
this.source = Source.instance(context);
this.preview = Preview.instance(context);
this.tokens = Tokens.instance(context);
+ this.lint = Lint.instance(context);
}
public Scanner newScanner(CharSequence input, boolean keepDocComments) {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/UnicodeReader.java Fri Jun 07 09:38:40 2019 -0700
@@ -154,6 +154,21 @@
return new String(sbuf, 0, sp);
}
+ /** Add 'count' copies of the character 'ch' to the string buffer.
+ */
+ protected void repeat(char ch, int count) {
+ for ( ; 0 < count; count--) {
+ putChar(ch, false);
+ }
+ }
+
+ /** Reset the scan buffer pointer to 'pos'.
+ */
+ protected void reset(int pos) {
+ bp = pos - 1;
+ scanChar();
+ }
+
/** Convert unicode escape; bp points to initial '\' character
* (Spec 3.3).
*/
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Fri Jun 07 09:38:40 2019 -0700
@@ -623,6 +623,15 @@
compiler.err.illegal.line.end.in.char.lit=\
illegal line end in character literal
+compiler.err.illegal.text.block.open=\
+ illegal text block open delimiter sequence, missing line terminator
+
+compiler.warn.inconsistent.white.space.indentation=\
+ inconsistent white space indentation
+
+compiler.warn.trailing.white.space.will.be.removed=\
+ trailing white space will be removed
+
compiler.err.illegal.nonascii.digit=\
illegal non-ASCII digit
@@ -1244,6 +1253,9 @@
compiler.err.unclosed.str.lit=\
unclosed string literal
+compiler.err.unclosed.text.block=\
+ unclosed text block
+
# 0: string
compiler.err.unsupported.encoding=\
unsupported encoding: {0}
@@ -2859,6 +2871,9 @@
compiler.misc.feature.private.intf.methods=\
private interface methods
+compiler.misc.feature.text.blocks=\
+ text blocks
+
compiler.misc.feature.multiple.case.labels=\
multiple case labels
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Fri Jun 07 09:38:40 2019 -0700
@@ -243,6 +243,9 @@
javac.opt.Xlint.desc.static=\
Warn about accessing a static member using an instance.
+javac.opt.Xlint.desc.text-blocks=\
+ Warn about inconsistent white space characters in text block indentation.
+
javac.opt.Xlint.desc.try=\
Warn about issues relating to use of try blocks (i.e. try-with-resources).
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java Fri Jun 07 09:38:40 2019 -0700
@@ -560,6 +560,18 @@
native long[] collectCounters();
/**
+ * Get the current number of counters allocated for use by JVMCI. Should be the same value as
+ * the flag {@code JVMCICounterSize}.
+ */
+ native int getCountersSize();
+
+ /**
+ * Attempt to change the size of the counters allocated for JVMCI. This requires a safepoint to
+ * safely reallocate the storage but it's advisable to increase the size in reasonable chunks.
+ */
+ native boolean setCountersSize(int newSize);
+
+ /**
* Determines if {@code metaspaceMethodData} is mature.
*/
native boolean isMature(long metaspaceMethodData);
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java Fri Jun 07 09:38:40 2019 -0700
@@ -46,9 +46,15 @@
*/
private static class DummyCompilerFactory implements JVMCICompilerFactory, JVMCICompiler {
+ private final String reason;
+
+ DummyCompilerFactory(String reason) {
+ this.reason = reason;
+ }
+
@Override
public HotSpotCompilationRequestResult compileMethod(CompilationRequest request) {
- throw new JVMCIError("no JVMCI compiler selected");
+ throw new JVMCIError("no JVMCI compiler selected: " + reason);
}
@Override
@@ -79,8 +85,10 @@
JVMCICompilerFactory factory = null;
String compilerName = Option.Compiler.getString();
if (compilerName != null) {
- if (compilerName.isEmpty() || compilerName.equals("null")) {
- factory = new DummyCompilerFactory();
+ if (compilerName.isEmpty()) {
+ factory = new DummyCompilerFactory(" empty \"\" is specified");
+ } else if (compilerName.equals("null")) {
+ factory = new DummyCompilerFactory("\"null\" is specified");
} else {
for (JVMCICompilerFactory f : getJVMCICompilerFactories()) {
if (f.getCompilerName().equals(compilerName)) {
@@ -93,18 +101,20 @@
}
} else {
// Auto select a single available compiler
+ String reason = "default compiler is not found";
for (JVMCICompilerFactory f : getJVMCICompilerFactories()) {
if (factory == null) {
openJVMCITo(f.getClass().getModule());
factory = f;
} else {
// Multiple factories seen - cancel auto selection
+ reason = "multiple factories seen: \"" + factory.getCompilerName() + "\" and \"" + f.getCompilerName() + "\"";
factory = null;
break;
}
}
if (factory == null) {
- factory = new DummyCompilerFactory();
+ factory = new DummyCompilerFactory(reason);
}
}
factory.onSelection();
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java Fri Jun 07 09:38:40 2019 -0700
@@ -800,6 +800,26 @@
}
/**
+ * @return the current number of per thread counters. May be set through
+ * {@code -XX:JVMCICompilerSize=} command line option or the
+ * {@link #setCountersSize(int)} call.
+ */
+ public int getCountersSize() {
+ return compilerToVm.getCountersSize();
+ }
+
+ /**
+ * Attempt to enlarge the number of per thread counters available. Requires a safepoint so
+ * resizing should be rare to avoid performance effects.
+ *
+ * @param newSize
+ * @return false if the resizing failed
+ */
+ public boolean setCountersSize(int newSize) {
+ return compilerToVm.setCountersSize(newSize);
+ }
+
+ /**
* The offset from the origin of an array to the first element.
*
* @return the offset in bytes
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -507,7 +507,7 @@
@Override
public Annotation[][] getParameterAnnotations() {
- if ((getConstMethodFlags() & config().constMethodHasParameterAnnotations) == 0) {
+ if ((getConstMethodFlags() & config().constMethodHasParameterAnnotations) == 0 || isClassInitializer()) {
return new Annotation[signature.getParameterCount(false)][0];
}
return runtime().reflection.getParameterAnnotations(this);
@@ -515,7 +515,7 @@
@Override
public Annotation[] getAnnotations() {
- if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0) {
+ if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0 || isClassInitializer()) {
return new Annotation[0];
}
return runtime().reflection.getMethodAnnotations(this);
@@ -523,7 +523,7 @@
@Override
public Annotation[] getDeclaredAnnotations() {
- if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0) {
+ if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0 || isClassInitializer()) {
return new Annotation[0];
}
return runtime().reflection.getMethodDeclaredAnnotations(this);
@@ -531,7 +531,7 @@
@Override
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
- if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0) {
+ if ((getConstMethodFlags() & config().constMethodHasMethodAnnotations) == 0 || isClassInitializer()) {
return null;
}
return runtime().reflection.getMethodAnnotation(this, annotationClass);
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/SharedLibraryJVMCIReflection.java Fri Jun 07 09:38:40 2019 -0700
@@ -140,7 +140,8 @@
@Override
Annotation[] getAnnotations(HotSpotResolvedObjectTypeImpl holder) {
- return getClassAnnotations(holder.getName());
+ Annotation[] annotations = getClassAnnotations(holder.getName());
+ return annotations == null ? new Annotation[0] : annotations;
}
@Override
@@ -155,7 +156,11 @@
@Override
Annotation[][] getParameterAnnotations(HotSpotResolvedJavaMethodImpl javaMethod) {
- return getParameterAnnotations(javaMethod.getDeclaringClass().getName(), javaMethod.getName());
+ Annotation[][] annotations = getParameterAnnotations(javaMethod.getDeclaringClass().getName(), javaMethod.getName());
+ if (annotations == null) {
+ return new Annotation[javaMethod.signature.getParameterCount(false)][0];
+ }
+ return annotations;
}
@Override
@@ -170,7 +175,8 @@
@Override
Annotation[] getMethodAnnotations(HotSpotResolvedJavaMethodImpl javaMethod) {
- return getMethodAnnotationsInternal(javaMethod);
+ Annotation[] annotations = getMethodAnnotationsInternal(javaMethod);
+ return annotations == null ? new Annotation[0] : annotations;
}
@Override
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java Fri Jun 07 09:38:40 2019 -0700
@@ -22,8 +22,12 @@
*/
package jdk.vm.ci.hotspot;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Formatter;
+import java.util.List;
import java.util.Objects;
/**
@@ -32,12 +36,8 @@
@SuppressWarnings("serial")
final class TranslatedException extends Exception {
- private TranslatedException(String message) {
- super(message);
- }
-
- private TranslatedException(String message, Throwable cause) {
- super(message, cause);
+ private TranslatedException(String message, Throwable translationFailure) {
+ super("[" + translationFailure + "]" + Objects.toString(message, ""));
}
/**
@@ -49,27 +49,68 @@
return this;
}
- private static Throwable create(String className, String message) {
+ /**
+ * Prints a stack trace for {@code throwable} and returns {@code true}. Used to print stack
+ * traces only when assertions are enabled.
+ */
+ private static boolean printStackTrace(Throwable throwable) {
+ throwable.printStackTrace();
+ return true;
+ }
+
+ private static Throwable initCause(Throwable throwable, Throwable cause) {
+ if (cause != null) {
+ try {
+ throwable.initCause(cause);
+ } catch (IllegalStateException e) {
+ // Cause could not be set or overwritten.
+ assert printStackTrace(e);
+ }
+ }
+ return throwable;
+ }
+
+ private static Throwable create(String className, String message, Throwable cause) {
// Try create with reflection first.
try {
Class<?> cls = Class.forName(className);
+ if (cause != null) {
+ // Handle known exception types whose cause must be set in the constructor
+ if (cls == InvocationTargetException.class) {
+ return new InvocationTargetException(cause, message);
+ }
+ if (cls == ExceptionInInitializerError.class) {
+ return new ExceptionInInitializerError(cause);
+ }
+ }
if (message == null) {
- return (Throwable) cls.getConstructor().newInstance();
+ return initCause((Throwable) cls.getConstructor().newInstance(), cause);
}
cls.getDeclaredConstructor(String.class);
- return (Throwable) cls.getConstructor(String.class).newInstance(message);
- } catch (Throwable ignore) {
+ return initCause((Throwable) cls.getConstructor(String.class).newInstance(message), cause);
+ } catch (Throwable translationFailure) {
+ if (className.equals(TranslatedException.class.getName())) {
+ // Chop the class name when boxing another TranslatedException
+ return initCause(new TranslatedException(message, translationFailure), cause);
+ }
+ return initCause(new TranslatedException(null, translationFailure), cause);
}
+ }
- if (className.equals(TranslatedException.class.getName())) {
- // Chop the class name when boxing another TranslatedException
- return new TranslatedException(message);
- }
+ /**
+ * Encodes an exception message to distinguish a null message from an empty message.
+ *
+ * @return {@code value} with a space prepended iff {@code value != null}
+ */
+ private static String encodeMessage(String value) {
+ return value != null ? ' ' + value : value;
+ }
- if (message == null) {
- return new TranslatedException(className);
+ private static String decodeMessage(String value) {
+ if (value.length() == 0) {
+ return null;
}
- return new TranslatedException(className + ": " + message);
+ return value.substring(1);
}
private static String encodedString(String value) {
@@ -78,21 +119,28 @@
/**
* Encodes {@code throwable} including its stack and causes as a string. The encoding format of
- * a single exception with its cause is:
+ * a single exception is:
*
* <pre>
* <exception class name> '|' <exception message> '|' <stack size> '|' [<class> '|' <method> '|' <file> '|' <line> '|' ]*
* </pre>
*
- * Each cause is appended after the exception is it the cause of.
+ * Each exception is encoded before the exception it causes.
*/
@VMEntryPoint
static String encodeThrowable(Throwable throwable) throws Throwable {
try {
Formatter enc = new Formatter();
- Throwable current = throwable;
- do {
- enc.format("%s|%s|", current.getClass().getName(), encodedString(current.getMessage()));
+ List<Throwable> throwables = new ArrayList<>();
+ for (Throwable current = throwable; current != null; current = current.getCause()) {
+ throwables.add(current);
+ }
+
+ // Encode from inner most cause outwards
+ Collections.reverse(throwables);
+
+ for (Throwable current : throwables) {
+ enc.format("%s|%s|", current.getClass().getName(), encodedString(encodeMessage(current.getMessage())));
StackTraceElement[] stackTrace = current.getStackTrace();
if (stackTrace == null) {
stackTrace = new StackTraceElement[0];
@@ -105,13 +153,14 @@
encodedString(frame.getFileName()), frame.getLineNumber());
}
}
- current = current.getCause();
- } while (current != null);
+ }
return enc.toString();
} catch (Throwable e) {
+ assert printStackTrace(e);
try {
return e.getClass().getName() + "|" + encodedString(e.getMessage()) + "|0|";
} catch (Throwable e2) {
+ assert printStackTrace(e2);
return "java.lang.Throwable|too many errors during encoding|0|";
}
}
@@ -146,12 +195,12 @@
try {
int i = 0;
String[] parts = encodedThrowable.split("\\|");
- Throwable parent = null;
- Throwable result = null;
+ Throwable cause = null;
+ Throwable throwable = null;
while (i != parts.length) {
String exceptionClassName = parts[i++];
- String exceptionMessage = parts[i++];
- Throwable throwable = create(exceptionClassName, exceptionMessage);
+ String exceptionMessage = decodeMessage(parts[i++]);
+ throwable = create(exceptionClassName, exceptionMessage, cause);
int stackTraceDepth = Integer.parseInt(parts[i++]);
StackTraceElement[] suffix = getStackTraceSuffix();
@@ -168,16 +217,12 @@
}
System.arraycopy(suffix, 0, stackTrace, stackTraceDepth, suffix.length);
throwable.setStackTrace(stackTrace);
- if (parent != null) {
- parent.initCause(throwable);
- } else {
- result = throwable;
- }
- parent = throwable;
+ cause = throwable;
}
- return result;
- } catch (Throwable t) {
- return new TranslatedException("Error decoding exception: " + encodedThrowable, t);
+ return throwable;
+ } catch (Throwable translationFailure) {
+ assert printStackTrace(translationFailure);
+ return new TranslatedException("Error decoding exception: " + encodedThrowable, translationFailure);
}
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/StandardDoclet.java Fri Jun 07 09:38:40 2019 -0700
@@ -36,7 +36,7 @@
* This doclet generates HTML-formatted documentation for the specified modules,
* packages and types.
*
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRoot}/../specs/javadoc/doc-comment-spec.html">
* Documentation Comment Specification for the Standard Doclet</a>
*/
public class StandardDoclet implements Doclet {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractExecutableMemberWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -73,19 +73,6 @@
super(writer);
}
- /**
- * Add the type parameters for the executable member.
- *
- * @param member the member to write type parameters for.
- * @param htmltree the content tree to which the parameters will be added.
- */
- protected void addTypeParameters(ExecutableElement member, Content htmltree) {
- Content typeParameters = getTypeParameters(member);
- if (!typeParameters.isEmpty()) {
- htmltree.add(typeParameters);
- htmltree.add(Entity.NO_BREAK_SPACE);
- }
- }
/**
* Get the type parameters for the executable member.
@@ -134,7 +121,7 @@
writer.getDocLink(context, te, ee,
name(ee), false));
Content code = HtmlTree.CODE(memberLink);
- addParameters(ee, false, code, name(ee).length() - 1);
+ addParameters(ee, code);
tdSummary.add(code);
}
@@ -174,7 +161,7 @@
*
* @param member the member to write receiver annotations for.
* @param rcvrType the receiver type.
- * @param descList list of annotation description.
+ * @param annotationMirrors list of annotation descriptions.
* @param tree the content tree to which the information will be added.
*/
protected void addReceiverAnnotations(ExecutableElement member, TypeMirror rcvrType,
@@ -195,8 +182,16 @@
* @param member the member to write parameters for.
* @param htmltree the content tree to which the parameters information will be added.
*/
- protected void addParameters(ExecutableElement member, Content htmltree, int indentSize) {
- addParameters(member, true, htmltree, indentSize);
+ protected void addParameters(ExecutableElement member, Content htmltree) {
+ Content paramTree = getParameters(member, false);
+ if (paramTree.isEmpty()) {
+ htmltree.add("()");
+ } else {
+ htmltree.add(Entity.ZERO_WIDTH_SPACE);
+ htmltree.add("(");
+ htmltree.add(paramTree);
+ paramTree.add(")");
+ }
}
/**
@@ -204,19 +199,17 @@
*
* @param member the member to write parameters for.
* @param includeAnnotations true if annotation information needs to be added.
- * @param htmltree the content tree to which the parameters information will be added.
+ * @return the content tree containing the parameter information
*/
- protected void addParameters(ExecutableElement member,
- boolean includeAnnotations, Content htmltree, int indentSize) {
+ protected Content getParameters(ExecutableElement member, boolean includeAnnotations) {
Content paramTree = new ContentBuilder();
String sep = "";
List<? extends VariableElement> parameters = member.getParameters();
- CharSequence indent = makeSpace(indentSize + 1);
TypeMirror rcvrType = member.getReceiverType();
if (includeAnnotations && rcvrType != null && utils.isAnnotated(rcvrType)) {
List<? extends AnnotationMirror> annotationMirrors = rcvrType.getAnnotationMirrors();
addReceiverAnnotations(member, rcvrType, annotationMirrors, paramTree);
- sep = "," + DocletConstants.NL + indent;
+ sep = "," + DocletConstants.NL;
}
int paramstart;
for (paramstart = 0; paramstart < parameters.size(); paramstart++) {
@@ -226,11 +219,9 @@
if (param.getKind() != ElementKind.INSTANCE_INIT) {
if (includeAnnotations) {
boolean foundAnnotations =
- writer.addAnnotationInfo(indent.length(),
- member, param, paramTree);
+ writer.addAnnotationInfo(param, paramTree);
if (foundAnnotations) {
paramTree.add(DocletConstants.NL);
- paramTree.add(indent);
}
}
addParam(member, param,
@@ -242,54 +233,42 @@
for (int i = paramstart + 1; i < parameters.size(); i++) {
paramTree.add(",");
paramTree.add(DocletConstants.NL);
- paramTree.add(indent);
if (includeAnnotations) {
boolean foundAnnotations =
- writer.addAnnotationInfo(indent.length(), member, parameters.get(i),
+ writer.addAnnotationInfo(parameters.get(i),
paramTree);
if (foundAnnotations) {
paramTree.add(DocletConstants.NL);
- paramTree.add(indent);
}
}
addParam(member, parameters.get(i), (i == parameters.size() - 1) && member.isVarArgs(),
paramTree);
}
- if (paramTree.isEmpty()) {
- htmltree.add("()");
- } else {
- htmltree.add(Entity.ZERO_WIDTH_SPACE);
- htmltree.add("(");
- htmltree.add(paramTree);
- paramTree.add(")");
- }
+
+ return paramTree;
}
/**
- * Add exceptions for the executable member.
+ * Get a content tree containing the exception information for the executable member.
*
* @param member the member to write exceptions for.
- * @param htmltree the content tree to which the exceptions information will be added.
+ * @return the content tree containing the exceptions information.
*/
- protected void addExceptions(ExecutableElement member, Content htmltree, int indentSize) {
+ protected Content getExceptions(ExecutableElement member) {
List<? extends TypeMirror> exceptions = member.getThrownTypes();
+ Content htmltree = new ContentBuilder();
if (!exceptions.isEmpty()) {
- CharSequence indent = makeSpace(indentSize + 1 - 7);
- htmltree.add(DocletConstants.NL);
- htmltree.add(indent);
- htmltree.add("throws ");
- indent = makeSpace(indentSize + 1);
Content link = writer.getLink(new LinkInfoImpl(configuration, MEMBER, exceptions.get(0)));
htmltree.add(link);
for(int i = 1; i < exceptions.size(); i++) {
htmltree.add(",");
htmltree.add(DocletConstants.NL);
- htmltree.add(indent);
Content exceptionLink = writer.getLink(new LinkInfoImpl(configuration, MEMBER,
exceptions.get(i)));
htmltree.add(exceptionLink);
}
}
+ return htmltree;
}
protected TypeElement implementsMethodInIntfac(ExecutableElement method,
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -46,12 +46,14 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.Links;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.Content;
import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static javax.lang.model.element.Modifier.ABSTRACT;
@@ -219,55 +221,6 @@
*/
protected abstract Content getDeprecatedLink(Element member);
- /**
- * Add the member name to the content tree.
- *
- * @param name the member name to be added to the content tree.
- * @param htmltree the content tree to which the name will be added.
- */
- protected void addName(String name, Content htmltree) {
- htmltree.add(name);
- }
-
- /**
- * Add the modifier for the member. The modifiers are ordered as specified
- * by <em>The Java Language Specification</em>.
- *
- * @param member the member for which the modifier will be added.
- * @param htmltree the content tree to which the modifier information will be added.
- */
- protected void addModifiers(Element member, Content htmltree) {
- Set<Modifier> set = new TreeSet<>(member.getModifiers());
-
- // remove the ones we really don't need
- set.remove(NATIVE);
- set.remove(SYNCHRONIZED);
- set.remove(STRICTFP);
-
- // According to JLS, we should not be showing public modifier for
- // interface methods.
- if ((utils.isField(member) || utils.isMethod(member))
- && ((writer instanceof ClassWriterImpl
- && utils.isInterface(((ClassWriterImpl) writer).getTypeElement()) ||
- writer instanceof AnnotationTypeWriterImpl) )) {
- // Remove the implicit abstract and public modifiers
- if (utils.isMethod(member) &&
- (utils.isInterface(member.getEnclosingElement()) ||
- utils.isAnnotationType(member.getEnclosingElement()))) {
- set.remove(ABSTRACT);
- set.remove(PUBLIC);
- }
- if (!utils.isMethod(member)) {
- set.remove(PUBLIC);
- }
- }
- if (!set.isEmpty()) {
- String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
- htmltree.add(mods);
- htmltree.add(Entity.NO_BREAK_SPACE);
- }
- }
-
protected CharSequence makeSpace(int len) {
if (len <= 0) {
return "";
@@ -551,16 +504,235 @@
}
/**
- * Get the member tree to be documented.
- *
- * @param memberTree the content tree of member to be documented
- * @param isLastContent true if the content to be added is the last content
- * @return a content tree that will be added to the class documentation
+ * A content builder for member signatures.
*/
- public Content getMemberTree(Content memberTree, boolean isLastContent) {
- if (isLastContent)
- return HtmlTree.LI(HtmlStyle.blockListLast, memberTree);
- else
- return HtmlTree.LI(HtmlStyle.blockList, memberTree);
+ class MemberSignature {
+
+ private Element element;
+ private Content typeParameters;
+ private Content returnType;
+ private Content parameters;
+ private Content exceptions;
+
+ // Threshold for length of type parameters before switching from inline to block representation.
+ private final static int TYPE_PARAMS_MAX_INLINE_LENGTH = 50;
+
+ // Threshold for combined length of modifiers, type params and return type before breaking
+ // it up with a line break before the return type.
+ private final static int RETURN_TYPE_MAX_LINE_LENGTH = 50;
+
+ /**
+ * Create a new member signature builder.
+ *
+ * @param element The element for which to create a signature.
+ */
+ MemberSignature(Element element) {
+ this.element = element;
+ }
+
+ /**
+ * Add the type parameters for an executable member.
+ *
+ * @param typeParameters the content tree containing the type parameters to add.
+ * @return this MemberSignature instance
+ */
+ MemberSignature addTypeParameters(Content typeParameters) {
+ this.typeParameters = typeParameters;
+ return this;
+ }
+
+ /**
+ * Add the return type for an executable member.
+ *
+ * @param returnType the content tree containing the return type to add.
+ * @return this MemberSignature instance
+ */
+ MemberSignature addReturnType(Content returnType) {
+ this.returnType = returnType;
+ return this;
+ }
+
+ /**
+ * Add the type information for a non-executable member.
+ *
+ * @param type the type of the member.
+ * @return this MemberSignature instance
+ */
+ MemberSignature addType(TypeMirror type) {
+ this.returnType = writer.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.MEMBER, type));
+ return this;
+ }
+
+ /**
+ * Add the parameter information of an executable member.
+ *
+ * @param paramTree the content tree containing the parameter information.
+ * @return this MemberSignature instance
+ */
+ MemberSignature addParameters(Content paramTree) {
+ this.parameters = paramTree;
+ return this;
+ }
+
+ /**
+ * Add the exception information of an executable member.
+ *
+ * @param exceptionTree the content tree containing the exception information
+ * @return this MemberSignature instance
+ */
+ MemberSignature addExceptions(Content exceptionTree) {
+ this.exceptions = exceptionTree;
+ return this;
+ }
+
+ /**
+ * Return a HTML tree containing the member signature.
+ *
+ * @return a HTML tree containing the member signature
+ */
+ Content toContent() {
+ Content content = new ContentBuilder();
+ // Position of last line separator.
+ int lastLineSeparator = 0;
+
+ // Annotations
+ Content annotationInfo = writer.getAnnotationInfo(element.getAnnotationMirrors(), true);
+ if (!annotationInfo.isEmpty()) {
+ content.add(HtmlTree.SPAN(HtmlStyle.annotations, annotationInfo));
+ lastLineSeparator = content.charCount();
+ }
+
+ // Modifiers
+ appendModifiers(content);
+
+ // Type parameters
+ if (typeParameters != null && !typeParameters.isEmpty()) {
+ lastLineSeparator = appendTypeParameters(content, lastLineSeparator);
+ }
+
+ // Return type
+ if (returnType != null) {
+ content.add(HtmlTree.SPAN(HtmlStyle.returnType, returnType));
+ content.add(Entity.NO_BREAK_SPACE);
+ }
+
+ // Name
+ HtmlTree nameSpan = new HtmlTree(HtmlTag.SPAN);
+ nameSpan.setStyle(HtmlStyle.memberName);
+ if (configuration.linksource) {
+ Content name = new StringContent(name(element));
+ writer.addSrcLink(element, name, nameSpan);
+ } else {
+ nameSpan.add(name(element));
+ }
+ content.add(nameSpan);
+
+
+ // Parameters and exceptions
+ if (parameters != null) {
+ appendParametersAndExceptions(content, lastLineSeparator);
+ }
+
+ return HtmlTree.DIV(HtmlStyle.memberSignature, content);
+ }
+
+ /**
+ * Add the modifier for the member. The modifiers are ordered as specified
+ * by <em>The Java Language Specification</em>.
+ *
+ * @param htmltree the content tree to which the modifier information will be added.
+ */
+ private void appendModifiers(Content htmltree) {
+ Set<Modifier> set = new TreeSet<>(element.getModifiers());
+
+ // remove the ones we really don't need
+ set.remove(NATIVE);
+ set.remove(SYNCHRONIZED);
+ set.remove(STRICTFP);
+
+ // According to JLS, we should not be showing public modifier for
+ // interface methods.
+ if ((utils.isField(element) || utils.isMethod(element))
+ && ((writer instanceof ClassWriterImpl
+ && utils.isInterface(((ClassWriterImpl) writer).getTypeElement()) ||
+ writer instanceof AnnotationTypeWriterImpl) )) {
+ // Remove the implicit abstract and public modifiers
+ if (utils.isMethod(element) &&
+ (utils.isInterface(element.getEnclosingElement()) ||
+ utils.isAnnotationType(element.getEnclosingElement()))) {
+ set.remove(ABSTRACT);
+ set.remove(PUBLIC);
+ }
+ if (!utils.isMethod(element)) {
+ set.remove(PUBLIC);
+ }
+ }
+ if (!set.isEmpty()) {
+ String mods = set.stream().map(Modifier::toString).collect(Collectors.joining(" "));
+ htmltree.add(HtmlTree.SPAN(HtmlStyle.modifiers, new StringContent(mods)));
+ htmltree.add(Entity.NO_BREAK_SPACE);
+ }
+ }
+
+ /**
+ * Append the type parameter information to the HTML tree.
+ *
+ * @param htmltree the HTML tree
+ * @param lastLineSeparator index of last line separator in HTML tree
+ * @return the new index of the last line separator
+ */
+ private int appendTypeParameters(Content htmltree, int lastLineSeparator) {
+ // Apply different wrapping strategies for type parameters
+ // depending of combined length of type parameters and return type.
+ int typeParamLength = typeParameters.charCount();
+
+ if (typeParamLength >= TYPE_PARAMS_MAX_INLINE_LENGTH) {
+ htmltree.add(HtmlTree.SPAN(HtmlStyle.typeParametersLong, typeParameters));
+ } else {
+ htmltree.add(HtmlTree.SPAN(HtmlStyle.typeParameters, typeParameters));
+ }
+
+ int lineLength = htmltree.charCount() - lastLineSeparator;
+ int newLastLineSeparator = lastLineSeparator;
+
+ // sum below includes length of modifiers plus type params added above
+ if (lineLength + returnType.charCount()> RETURN_TYPE_MAX_LINE_LENGTH) {
+ htmltree.add(DocletConstants.NL);
+ newLastLineSeparator = htmltree.charCount();
+ } else {
+ htmltree.add(Entity.NO_BREAK_SPACE);
+ }
+
+ return newLastLineSeparator;
+ }
+
+ /**
+ * Append the parameters and exceptions information to the HTML tree.
+ *
+ * @param htmltree the HTML tree
+ * @param lastLineSeparator the index of the last line separator in HTML tree
+ */
+ private void appendParametersAndExceptions(Content htmltree, int lastLineSeparator) {
+ // Record current position for indentation of exceptions
+ int indentSize = htmltree.charCount() - lastLineSeparator;
+
+ if (parameters.isEmpty()) {
+ htmltree.add("()");
+ } else {
+ parameters.add(")");
+ htmltree.add(Entity.ZERO_WIDTH_SPACE);
+ htmltree.add("(");
+ htmltree.add(HtmlTree.SPAN(HtmlStyle.arguments, parameters));
+ }
+
+ // Exceptions
+ if (exceptions != null && !exceptions.isEmpty()) {
+ CharSequence indent = makeSpace(indentSize + 1 - 7);
+ htmltree.add(DocletConstants.NL);
+ htmltree.add(indent);
+ htmltree.add("throws ");
+ htmltree.add(HtmlTree.SPAN(HtmlStyle.exceptions, exceptions));
+ }
+ }
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeFieldWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -31,11 +31,8 @@
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeFieldWriter;
@@ -132,21 +129,9 @@
* {@inheritDoc}
*/
public Content getSignature(Element member) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(member, pre);
- addModifiers(member, pre);
- Content link =
- writer.getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.MEMBER, getType(member)));
- pre.add(link);
- pre.add(Entity.NO_BREAK_SPACE);
- if (configuration.linksource) {
- Content memberName = new StringContent(name(member));
- writer.addSrcLink(member, memberName, pre);
- } else {
- addName(name(member), pre);
- }
- return pre;
+ return new MemberSignature(member)
+ .addType(getType(member))
+ .toContent();
}
/**
@@ -183,9 +168,8 @@
/**
* {@inheritDoc}
*/
- public Content getAnnotationDoc(Content annotationDocTree,
- boolean isLastContent) {
- return getMemberTree(annotationDocTree, isLastContent);
+ public Content getAnnotationDoc(Content annotationDocTree) {
+ return getMemberTree(annotationDocTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -31,11 +31,8 @@
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
-import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.AnnotationTypeRequiredMemberWriter;
@@ -136,21 +133,9 @@
* {@inheritDoc}
*/
public Content getSignature(Element member) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(member, pre);
- addModifiers(member, pre);
- Content link =
- writer.getLink(new LinkInfoImpl(configuration,
- LinkInfoImpl.Kind.MEMBER, getType(member)));
- pre.add(link);
- pre.add(Entity.NO_BREAK_SPACE);
- if (configuration.linksource) {
- Content memberName = new StringContent(name(member));
- writer.addSrcLink(member, memberName, pre);
- } else {
- addName(name(member), pre);
- }
- return pre;
+ return new MemberSignature(member)
+ .addType(getType(member))
+ .toContent();
}
/**
@@ -185,9 +170,8 @@
/**
* {@inheritDoc}
*/
- public Content getAnnotationDoc(Content annotationDocTree,
- boolean isLastContent) {
- return getMemberTree(annotationDocTree, isLastContent);
+ public Content getAnnotationDoc(Content annotationDocTree) {
+ return getMemberTree(annotationDocTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstructorWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -37,7 +37,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.ConstructorWriter;
@@ -152,20 +151,10 @@
*/
@Override
public Content getSignature(ExecutableElement constructor) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(constructor, pre);
- int annotationLength = pre.charCount();
- addModifiers(constructor, pre);
- if (configuration.linksource) {
- Content constructorName = new StringContent(name(constructor));
- writer.addSrcLink(constructor, constructorName, pre);
- } else {
- addName(name(constructor), pre);
- }
- int indent = pre.charCount() - annotationLength;
- addParameters(constructor, pre, indent);
- addExceptions(constructor, pre, indent);
- return pre;
+ return new MemberSignature(constructor)
+ .addParameters(getParameters(constructor, true))
+ .addExceptions(getExceptions(constructor))
+ .toContent();
}
/**
@@ -205,9 +194,8 @@
* {@inheritDoc}
*/
@Override
- public Content getConstructorDoc(Content constructorDocTree,
- boolean isLastContent) {
- return getMemberTree(constructorDocTree, isLastContent);
+ public Content getConstructorDoc(Content constructorDocTree) {
+ return getMemberTree(constructorDocTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/EnumConstantWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -32,9 +32,7 @@
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
-import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -118,20 +116,9 @@
*/
@Override
public Content getSignature(VariableElement enumConstant) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(enumConstant, pre);
- addModifiers(enumConstant, pre);
- Content enumConstantLink = writer.getLink(new LinkInfoImpl(
- configuration, LinkInfoImpl.Kind.MEMBER, enumConstant.asType()));
- pre.add(enumConstantLink);
- pre.add(" ");
- if (configuration.linksource) {
- Content enumConstantName = new StringContent(name(enumConstant));
- writer.addSrcLink(enumConstant, enumConstantName, pre);
- } else {
- addName(name(enumConstant), pre);
- }
- return pre;
+ return new MemberSignature(enumConstant)
+ .addType(enumConstant.asType())
+ .toContent();
}
/**
@@ -173,9 +160,8 @@
* {@inheritDoc}
*/
@Override
- public Content getEnumConstants(Content enumConstantsTree,
- boolean isLastContent) {
- return getMemberTree(enumConstantsTree, isLastContent);
+ public Content getEnumConstants(Content enumConstantsTree) {
+ return getMemberTree(enumConstantsTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/FieldWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -35,7 +35,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
@@ -121,20 +120,9 @@
*/
@Override
public Content getSignature(VariableElement field) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(field, pre);
- addModifiers(field, pre);
- Content fieldlink = writer.getLink(new LinkInfoImpl(
- configuration, LinkInfoImpl.Kind.MEMBER, field.asType()));
- pre.add(fieldlink);
- pre.add(" ");
- if (configuration.linksource) {
- Content fieldName = new StringContent(name(field));
- writer.addSrcLink(field, fieldName, pre);
- } else {
- addName(name(field), pre);
- }
- return pre;
+ return new MemberSignature(field)
+ .addType(field.asType())
+ .toContent();
}
/**
@@ -176,9 +164,8 @@
* {@inheritDoc}
*/
@Override
- public Content getFieldDoc(Content fieldTree,
- boolean isLastContent) {
- return getMemberTree(fieldTree, isLastContent);
+ public Content getFieldDoc(Content fieldTree) {
+ return getMemberTree(fieldTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@@ -197,6 +198,14 @@
protected Script mainBodyScript;
/**
+ * A table of the anchors used for at-index and related tags,
+ * so that they can be made unique by appending a suitable suffix.
+ * (Ideally, javadoc should be tracking all id's generated in a file
+ * to avoid generating duplicates.)
+ */
+ Map<String, Integer> indexAnchorTable = new HashMap<>();
+
+ /**
* Constructor to construct the HtmlStandardWriter object.
*
* @param configuration the configuration for this doclet
@@ -1715,20 +1724,7 @@
* added
*/
public void addAnnotationInfo(PackageElement packageElement, Content htmltree) {
- addAnnotationInfo(packageElement, packageElement.getAnnotationMirrors(), htmltree);
- }
-
- /**
- * Add the annotation types of the executable receiver.
- *
- * @param method the executable to write the receiver annotations for.
- * @param descList a list of annotation mirrors.
- * @param htmltree the documentation tree to which the annotation info will be
- * added
- */
- public void addReceiverAnnotationInfo(ExecutableElement method, List<AnnotationMirror> descList,
- Content htmltree) {
- addAnnotationInfo(0, method, descList, false, htmltree);
+ addAnnotationInfo(packageElement.getAnnotationMirrors(), htmltree);
}
/*
@@ -1739,7 +1735,7 @@
List<? extends AnnotationMirror> annotationMirrors, Content htmltree) {
TypeMirror rcvrType = method.getReceiverType();
List<? extends AnnotationMirror> annotationMirrors1 = rcvrType.getAnnotationMirrors();
- addAnnotationInfo(0, method, annotationMirrors1, false, htmltree);
+ htmltree.add(getAnnotationInfo(annotationMirrors1, false));
}
/**
@@ -1749,97 +1745,65 @@
* @param htmltree the content tree to which the annotation types will be added
*/
public void addAnnotationInfo(Element element, Content htmltree) {
- addAnnotationInfo(element, element.getAnnotationMirrors(), htmltree);
+ addAnnotationInfo(element.getAnnotationMirrors(), htmltree);
}
/**
* Add the annotatation types for the given element and parameter.
*
- * @param indent the number of spaces to indent the parameters.
- * @param element the element to write annotations for.
* @param param the parameter to write annotations for.
* @param tree the content tree to which the annotation types will be added
*/
- public boolean addAnnotationInfo(int indent, Element element, VariableElement param,
- Content tree) {
- return addAnnotationInfo(indent, element, param.getAnnotationMirrors(), false, tree);
+ public boolean addAnnotationInfo(VariableElement param, Content tree) {
+ Content annotaionInfo = getAnnotationInfo(param.getAnnotationMirrors(), false);
+ if (annotaionInfo.isEmpty()) {
+ return false;
+ }
+ tree.add(annotaionInfo);
+ return true;
}
/**
* Adds the annotatation types for the given Element.
*
- * @param element the element to write annotations for.
- * @param descList a list of annotation mirrors.
- * @param htmltree the documentation tree to which the annotation info will be
- * added
- */
- private void addAnnotationInfo(Element element, List<? extends AnnotationMirror> descList,
- Content htmltree) {
- addAnnotationInfo(0, element, descList, true, htmltree);
- }
-
- /**
- * Adds the annotation types for the given element.
- *
- * @param indent the number of extra spaces to indent the annotations.
- * @param element the element to write annotations for.
* @param descList a list of annotation mirrors.
* @param htmltree the documentation tree to which the annotation info will be
* added
*/
- private boolean addAnnotationInfo(int indent, Element element,
- List<? extends AnnotationMirror> descList, boolean lineBreak, Content htmltree) {
- List<Content> annotations = getAnnotations(indent, descList, lineBreak);
+ private void addAnnotationInfo(List<? extends AnnotationMirror> descList, Content htmltree) {
+ htmltree.add(getAnnotationInfo(descList, true));
+ }
+
+ /**
+ * Return a content tree containing the annotation types for the given element.
+ *
+ * @param descList a list of annotation mirrors.
+ * @return the documentation tree containing the annotation info.
+ */
+ Content getAnnotationInfo(List<? extends AnnotationMirror> descList, boolean lineBreak) {
+ List<Content> annotations = getAnnotations(descList, lineBreak);
String sep = "";
- if (annotations.isEmpty()) {
- return false;
- }
+ ContentBuilder builder = new ContentBuilder();
for (Content annotation: annotations) {
- htmltree.add(sep);
- htmltree.add(annotation);
+ builder.add(sep);
+ builder.add(annotation);
if (!lineBreak) {
sep = " ";
}
}
- return true;
- }
-
- /**
- * Return the string representations of the annotation types for
- * the given doc.
- *
- * @param indent the number of extra spaces to indent the annotations.
- * @param descList a list of annotation mirrors.
- * @param linkBreak if true, add new line between each member value.
- * @return a list of strings representing the annotations being
- * documented.
- */
- private List<Content> getAnnotations(int indent, List<? extends AnnotationMirror> descList, boolean linkBreak) {
- return getAnnotations(indent, descList, linkBreak, true);
- }
-
- private List<Content> getAnnotations(int indent, AnnotationMirror amirror, boolean linkBreak) {
- List<AnnotationMirror> descList = new ArrayList<>();
- descList.add(amirror);
- return getAnnotations(indent, descList, linkBreak, true);
+ return builder;
}
/**
* Return the string representations of the annotation types for
* the given doc.
*
- * A {@code null} {@code elementType} indicates that all the
- * annotations should be returned without any filtering.
- *
- * @param indent the number of extra spaces to indent the annotations.
* @param descList a list of annotation mirrors.
* @param linkBreak if true, add new line between each member value.
- * @param isJava5DeclarationLocation
* @return a list of strings representing the annotations being
* documented.
*/
- public List<Content> getAnnotations(int indent, List<? extends AnnotationMirror> descList,
- boolean linkBreak, boolean isJava5DeclarationLocation) {
+ public List<Content> getAnnotations(List<? extends AnnotationMirror> descList, boolean linkBreak) {
List<Content> results = new ArrayList<>();
ContentBuilder annotation;
for (AnnotationMirror aDesc : descList) {
@@ -1853,11 +1817,6 @@
(!isAnnotationDocumented && !isContainerDocumented)) {
continue;
}
- /* TODO: check logic here to correctly handle declaration
- * and type annotations.
- if (utils.isDeclarationAnnotation(annotationElement, isJava5DeclarationLocation)) {
- continue;
- }*/
annotation = new ContentBuilder();
isAnnotationDocumented = false;
LinkInfoImpl linkInfo = new LinkInfoImpl(configuration,
@@ -1900,9 +1859,7 @@
new SimpleAnnotationValueVisitor9<Void, List<AnnotationValue>>() {
@Override
public Void visitArray(List<? extends AnnotationValue> vals, List<AnnotationValue> annotationTypeValues) {
- for (AnnotationValue av : vals) {
- annotationTypeValues.add(av);
- }
+ annotationTypeValues.addAll(vals);
return null;
}
}.visit(a, annotationTypeValues);
@@ -1917,13 +1874,11 @@
// If the container has 1 or more value defined and if the
// repeatable type annotation is not documented, print the container.
else {
- addAnnotations(annotationElement, linkInfo, annotation, pairs,
- indent, false);
+ addAnnotations(annotationElement, linkInfo, annotation, pairs, false);
}
}
else {
- addAnnotations(annotationElement, linkInfo, annotation, pairs,
- indent, linkBreak);
+ addAnnotations(annotationElement, linkInfo, annotation, pairs, linkBreak);
}
annotation.add(linkBreak ? DocletConstants.NL : "");
results.add(annotation);
@@ -1938,13 +1893,12 @@
* @param linkInfo the information about the link
* @param annotation the annotation string to which the annotation will be added
* @param map annotation type element to annotation value pairs
- * @param indent the number of extra spaces to indent the annotations.
* @param linkBreak if true, add new line between each member value
*/
private void addAnnotations(TypeElement annotationDoc, LinkInfoImpl linkInfo,
ContentBuilder annotation,
Map<? extends ExecutableElement, ? extends AnnotationValue> map,
- int indent, boolean linkBreak) {
+ boolean linkBreak) {
linkInfo.label = new StringContent("@");
linkInfo.label.add(annotationDoc.getSimpleName());
annotation.add(getLink(linkInfo));
@@ -1961,7 +1915,7 @@
if (linkBreak) {
annotation.add(DocletConstants.NL);
int spaces = annotationDoc.getSimpleName().length() + 2;
- for (int k = 0; k < (spaces + indent); k++) {
+ for (int k = 0; k < (spaces); k++) {
annotation.add(" ");
}
}
@@ -2074,7 +2028,7 @@
}
@Override
public Content visitAnnotation(AnnotationMirror a, Void p) {
- List<Content> list = getAnnotations(0, a, false);
+ List<Content> list = getAnnotations(List.of(a), false);
ContentBuilder buf = new ContentBuilder();
for (Content c : list) {
buf.add(c);
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -87,10 +87,7 @@
*/
public Content getFieldsContentHeader(boolean isLastContent) {
HtmlTree li = new HtmlTree(HtmlTag.LI);
- if (isLastContent)
- li.setStyle(HtmlStyle.blockListLast);
- else
- li.setStyle(HtmlStyle.blockList);
+ li.setStyle(HtmlStyle.blockList);
return li;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -77,10 +77,7 @@
*/
public Content getMethodsContentHeader(boolean isLastContent) {
HtmlTree li = new HtmlTree(HtmlTag.LI);
- if (isLastContent)
- li.setStyle(HtmlStyle.blockListLast);
- else
- li.setStyle(HtmlStyle.blockList);
+ li.setStyle(HtmlStyle.blockList);
return li;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/LinkFactoryImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -41,6 +41,7 @@
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.links.LinkFactory;
import jdk.javadoc.internal.doclets.toolkit.util.links.LinkInfo;
@@ -134,7 +135,7 @@
* {@inheritDoc}
*/
@Override
- protected Content getTypeParameterLinks(LinkInfo linkInfo, boolean isClassLabel){
+ protected Content getTypeParameterLinks(LinkInfo linkInfo, boolean isClassLabel) {
Content links = newContent();
List<TypeMirror> vars = new ArrayList<>();
TypeMirror ctype = linkInfo.type != null
@@ -164,6 +165,9 @@
if (many) {
links.add(",");
links.add(Entity.ZERO_WIDTH_SPACE);
+ if (((LinkInfoImpl) linkInfo).getContext() == LinkInfoImpl.Kind.MEMBER_TYPE_PARAMS) {
+ links.add(DocletConstants.NL);
+ }
}
links.add(getTypeParameterLink(linkInfo, t));
many = true;
@@ -186,7 +190,6 @@
typeLinkInfo.excludeTypeBounds = linkInfo.excludeTypeBounds;
typeLinkInfo.excludeTypeParameterLinks = linkInfo.excludeTypeParameterLinks;
typeLinkInfo.linkToSelf = linkInfo.linkToSelf;
- typeLinkInfo.isJava5DeclarationLocation = false;
return getLink(typeLinkInfo);
}
@@ -218,7 +221,7 @@
if (annotations.isEmpty())
return links;
- List<Content> annos = m_writer.getAnnotations(0, annotations, false, linkInfo.isJava5DeclarationLocation);
+ List<Content> annos = m_writer.getAnnotations(annotations, false);
boolean isFirst = true;
for (Content anno : annos) {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -36,7 +36,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
@@ -140,23 +139,12 @@
*/
@Override
public Content getSignature(ExecutableElement method) {
- HtmlTree pre = new HtmlTree(HtmlTag.PRE);
- pre.setStyle(HtmlStyle.methodSignature);
- writer.addAnnotationInfo(method, pre);
- int annotationLength = pre.charCount();
- addModifiers(method, pre);
- addTypeParameters(method, pre);
- addReturnType(method, pre);
- if (configuration.linksource) {
- Content methodName = new StringContent(name(method));
- writer.addSrcLink(method, methodName, pre);
- } else {
- addName(name(method), pre);
- }
- int indent = pre.charCount() - annotationLength;
- addParameters(method, pre, indent);
- addExceptions(method, pre, indent);
- return pre;
+ return new MemberSignature(method)
+ .addTypeParameters(getTypeParameters(method))
+ .addReturnType(getReturnType(method))
+ .addParameters(getParameters(method, true))
+ .addExceptions(getExceptions(method))
+ .toContent();
}
/**
@@ -220,9 +208,8 @@
* {@inheritDoc}
*/
@Override
- public Content getMethodDoc(Content methodDocTree,
- boolean isLastContent) {
- return getMemberTree(methodDocTree, isLastContent);
+ public Content getMethodDoc(Content methodDocTree) {
+ return getMemberTree(methodDocTree);
}
/**
@@ -399,19 +386,17 @@
}
/**
- * Add the return type.
+ * Get the return type for the given method.
*
* @param method the method being documented.
- * @param htmltree the content tree to which the return type will be added
+ * @return content containing the return type
*/
- protected void addReturnType(ExecutableElement method, Content htmltree) {
+ protected Content getReturnType(ExecutableElement method) {
TypeMirror type = utils.getReturnType(method);
if (type != null) {
- Content linkContent = writer.getLink(
- new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
- htmltree.add(linkContent);
- htmltree.add(Entity.NO_BREAK_SPACE);
+ return writer.getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.RETURN_TYPE, type));
}
+ return new ContentBuilder();
}
@Override
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PropertyWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -32,7 +32,6 @@
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
@@ -114,21 +113,9 @@
*/
@Override
public Content getSignature(ExecutableElement property) {
- Content pre = new HtmlTree(HtmlTag.PRE);
- writer.addAnnotationInfo(property, pre);
- addModifiers(property, pre);
- Content propertylink = writer.getLink(new LinkInfoImpl(
- configuration, LinkInfoImpl.Kind.MEMBER,
- utils.getReturnType(property)));
- pre.add(propertylink);
- pre.add(" ");
- if (configuration.linksource) {
- Content propertyName = new StringContent(name(property));
- writer.addSrcLink(property, propertyName, pre);
- } else {
- addName(name(property), pre);
- }
- return pre;
+ return new MemberSignature(property)
+ .addType(utils.getReturnType(property))
+ .toContent();
}
/**
@@ -189,9 +176,8 @@
* {@inheritDoc}
*/
@Override
- public Content getPropertyDoc(Content propertyDocTree,
- boolean isLastContent) {
- return getMemberTree(propertyDocTree, isLastContent);
+ public Content getPropertyDoc(Content propertyDocTree) {
+ return getMemberTree(propertyDocTree);
}
/**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java Fri Jun 07 09:38:40 2019 -0700
@@ -409,11 +409,16 @@
}
private Content createAnchorAndSearchIndex(Element element, String tagText, String desc){
- String anchorName = htmlWriter.links.getName(tagText);
Content result = null;
if (isFirstSentence && inSummary) {
result = new StringContent(tagText);
} else {
+ String anchorName = htmlWriter.links.getName(tagText);
+ int count = htmlWriter.indexAnchorTable.computeIfAbsent(anchorName, s -> 0);
+ htmlWriter.indexAnchorTable.put(anchorName, count + 1);
+ if (count > 0) {
+ anchorName += "-" + count;
+ }
result = HtmlTree.A_ID(HtmlStyle.searchTagResult, anchorName, new StringContent(tagText));
if (configuration.createindex && !tagText.isEmpty()) {
SearchIndexItem si = new SearchIndexItem();
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, 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
@@ -41,10 +41,11 @@
allClassesContainer,
allPackagesContainer,
altColor,
+ annotations,
+ arguments,
bar,
block,
blockList,
- blockListLast,
bottomNav,
circle,
classUseContainer,
@@ -70,6 +71,7 @@
detail,
docSummary,
emphasizedPhrase,
+ exceptions,
externalLink,
fieldDetails,
fieldSummary,
@@ -91,12 +93,15 @@
legalCopy,
mainContainer,
memberDetails,
+ memberName,
memberNameLabel,
memberNameLink,
+ memberSignature,
memberSummary,
methodDetails,
methodSignature,
methodSummary,
+ modifiers,
moduleDescription,
moduleLabelInPackage,
moduleLabelInType,
@@ -122,6 +127,7 @@
providesSummary,
requiresSummary,
returnLabel,
+ returnType,
rightContainer,
rightIframe,
rowColor,
@@ -147,6 +153,8 @@
topNav,
typeNameLabel,
typeNameLink,
+ typeParameters,
+ typeParametersLong,
typeSummary,
useSummary,
usesSummary
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/RawHtml.java Fri Jun 07 09:38:40 2019 -0700
@@ -112,6 +112,11 @@
state = State.ENTITY;
count++;
break;
+ case '\r':
+ case '\n':
+ // Windows uses "\r\n" as line separator while UNIX uses "\n".
+ // Ignore line separators to get consistent results across platforms.
+ break;
default:
count++;
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeFieldWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.Element;
import javax.lang.model.element.TypeElement;
@@ -87,10 +85,9 @@
* Get the annotation type documentation.
*
* @param annotationDocTree the content tree representing annotation type documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the annotation type documentation
*/
- public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
+ public Content getAnnotationDoc(Content annotationDocTree);
/**
* Get the signature for the given member.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AnnotationTypeRequiredMemberWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -87,10 +87,9 @@
* Get the annotation type documentation.
*
* @param annotationDocTree the content tree representing annotation type documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the annotation type documentation
*/
- public Content getAnnotationDoc(Content annotationDocTree, boolean isLastContent);
+ public Content getAnnotationDoc(Content annotationDocTree);
/**
* Get the signature for the given member.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/ConstructorWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
@@ -109,10 +107,9 @@
* Get the constructor documentation.
*
* @param constructorDocTree the content tree representing constructor documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the constructor documentation
*/
- public Content getConstructorDoc(Content constructorDocTree, boolean isLastContent);
+ public Content getConstructorDoc(Content constructorDocTree);
/**
* Let the writer know whether a non public constructor was found.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/EnumConstantWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
@@ -108,10 +106,9 @@
* Get the enum constants documentation.
*
* @param enumConstantsTree the content tree representing enum constants documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the enum constants documentation
*/
- public Content getEnumConstants(Content enumConstantsTree, boolean isLastContent);
+ public Content getEnumConstants(Content enumConstantsTree);
/**
* Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/FieldWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
@@ -110,10 +108,9 @@
* Get the field documentation.
*
* @param fieldDocTree the content tree representing field documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the field documentation
*/
- public Content getFieldDoc(Content fieldDocTree, boolean isLastContent);
+ public Content getFieldDoc(Content fieldDocTree);
/**
* Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MethodWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
@@ -111,10 +109,9 @@
* Get the method documentation.
*
* @param methodDocTree the content tree representing method documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the method documentation
*/
- public Content getMethodDoc(Content methodDocTree, boolean isLastContent);
+ public Content getMethodDoc(Content methodDocTree);
/**
* Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,8 +25,6 @@
package jdk.javadoc.internal.doclets.toolkit;
-import java.io.*;
-
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
@@ -109,10 +107,9 @@
* Get the property documentation.
*
* @param propertyDocTree the content tree representing property documentation
- * @param isLastContent true if the content to be added is the last content
* @return content tree for the property documentation
*/
- public Content getPropertyDoc(Content propertyDocTree, boolean isLastContent);
+ public Content getPropertyDoc(Content propertyDocTree);
/**
* Gets the member header tree.
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeFieldBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -142,7 +142,6 @@
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
Content detailsTree = writer.getMemberTreeHeader();
- Element lastElement = members.get(members.size() - 1);
for (Element member : members) {
currentMember = member;
Content annotationDocTree = writer.getAnnotationDocTreeHeader(currentMember,
@@ -153,8 +152,7 @@
buildMemberComments(annotationDocTree);
buildTagInfo(annotationDocTree);
- detailsTree.add(writer.getAnnotationDoc(
- annotationDocTree, currentMember == lastElement));
+ detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
}
memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -144,7 +144,7 @@
writer.addAnnotationDetailsMarker(memberDetailsTree);
Content annotationDetailsTreeHeader = writer.getAnnotationDetailsTreeHeader(typeElement);
Content detailsTree = writer.getMemberTreeHeader();
- Element lastMember = members.get((members.size() - 1));
+
for (Element member : members) {
currentMember = member;
Content annotationDocTree = writer.getAnnotationDocTreeHeader(
@@ -152,8 +152,7 @@
buildAnnotationTypeMemberChildren(annotationDocTree);
- detailsTree.add(writer.getAnnotationDoc(
- annotationDocTree, currentMember == lastMember));
+ detailsTree.add(writer.getAnnotationDoc(annotationDocTree));
}
memberDetailsTree.add(writer.getAnnotationDetails(annotationDetailsTreeHeader, detailsTree));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ConstructorBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -139,7 +139,6 @@
memberDetailsTree);
Content constructorDetailsTree = writer.getMemberTreeHeader();
- Element lastElement = constructors.get(constructors.size() - 1);
for (Element contructor : constructors) {
currentConstructor = (ExecutableElement)contructor;
Content constructorDocTree = writer.getConstructorDocTreeHeader(currentConstructor, constructorDetailsTree);
@@ -149,8 +148,7 @@
buildConstructorComments(constructorDocTree);
buildTagInfo(constructorDocTree);
- constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree,
- currentConstructor == lastElement));
+ constructorDetailsTree.add(writer.getConstructorDoc(constructorDocTree));
}
memberDetailsTree.add(
writer.getConstructorDetails(constructorDetailsTreeHeader, constructorDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/EnumConstantBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -126,7 +126,7 @@
Content enumConstantsDetailsTreeHeader = writer.getEnumConstantsDetailsTreeHeader(typeElement,
memberDetailsTree);
Content enumConstantsDetailsTree = writer.getMemberTreeHeader();
- Element lastElement = enumConstants.get(enumConstants.size() - 1);
+
for (Element enumConstant : enumConstants) {
currentElement = (VariableElement)enumConstant;
Content enumConstantsTree = writer.getEnumConstantsTreeHeader(currentElement,
@@ -137,8 +137,7 @@
buildEnumConstantComments(enumConstantsTree);
buildTagInfo(enumConstantsTree);
- enumConstantsDetailsTree.add(writer.getEnumConstants(
- enumConstantsTree, currentElement == lastElement));
+ enumConstantsDetailsTree.add(writer.getEnumConstants(enumConstantsTree));
}
memberDetailsTree.add(
writer.getEnumConstantsDetails(enumConstantsDetailsTreeHeader, enumConstantsDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/FieldBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -128,7 +128,6 @@
Content fieldDetailsTreeHeader = writer.getFieldDetailsTreeHeader(typeElement, memberDetailsTree);
Content fieldDetailsTree = writer.getMemberTreeHeader();
- Element lastElement = fields.get(fields.size() - 1);
for (Element element : fields) {
currentElement = (VariableElement)element;
Content fieldDocTree = writer.getFieldDocTreeHeader(currentElement, fieldDetailsTree);
@@ -138,8 +137,7 @@
buildFieldComments(fieldDocTree);
buildTagInfo(fieldDocTree);
- fieldDetailsTree.add(writer.getFieldDoc(
- fieldDocTree, currentElement == lastElement));
+ fieldDetailsTree.add(writer.getFieldDoc(fieldDocTree));
}
memberDetailsTree.add(
writer.getFieldDetails(fieldDetailsTreeHeader, fieldDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MethodBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -130,7 +130,6 @@
memberDetailsTree);
Content methodDetailsTree = writer.getMemberTreeHeader();
- Element lastElement = methods.get(methods.size() - 1);
for (Element method : methods) {
currentMethod = (ExecutableElement)method;
Content methodDocTree = writer.getMethodDocTreeHeader(currentMethod, methodDetailsTree);
@@ -140,8 +139,7 @@
buildMethodComments(methodDocTree);
buildTagInfo(methodDocTree);
- methodDetailsTree.add(writer.getMethodDoc(
- methodDocTree, currentMethod == lastElement));
+ methodDetailsTree.add(writer.getMethodDoc(methodDocTree));
}
memberDetailsTree.add(writer.getMethodDetails(methodDetailsTreeHeader, methodDetailsTree));
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/PropertyBuilder.java Fri Jun 07 09:38:40 2019 -0700
@@ -128,7 +128,7 @@
Content propertyDetailsTreeHeader = writer.getPropertyDetailsTreeHeader(typeElement,
memberDetailsTree);
Content propertyDetailsTree = writer.getMemberTreeHeader();
- Element lastElement = properties.get(properties.size() - 1);
+
for (Element property : properties) {
currentProperty = (ExecutableElement)property;
Content propertyDocTree = writer.getPropertyDocTreeHeader(currentProperty,
@@ -138,8 +138,7 @@
buildPropertyComments(propertyDocTree);
buildTagInfo(propertyDocTree);
- propertyDetailsTree.add(writer.getPropertyDoc(
- propertyDocTree, currentProperty == lastElement));
+ propertyDetailsTree.add(writer.getPropertyDoc(propertyDocTree));
}
memberDetailsTree.add(
writer.getPropertyDetails(propertyDetailsTreeHeader, propertyDetailsTree));
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css Fri Jun 07 09:38:40 2019 -0700
@@ -1,4 +1,4 @@
-/*
+/*
* Javadoc style sheet
*/
@@ -165,7 +165,7 @@
height:2.8em;
padding-top:10px;
overflow:hidden;
- font-size:12px;
+ font-size:12px;
}
.bottomNav {
margin-top:10px;
@@ -371,11 +371,11 @@
div.inheritance div.inheritance {
margin-left:2em;
}
-ul.blockList, ul.blockListLast {
+ul.blockList {
margin:10px 0 10px 0;
padding:0;
}
-ul.blockList li.blockList, ul.blockList li.blockListLast {
+ul.blockList li.blockList {
list-style:none;
margin-bottom:15px;
line-height:1.4;
@@ -533,9 +533,9 @@
th.colFirst a:link, th.colFirst a:visited,
th.colSecond a:link, th.colSecond a:visited,
th.colConstructorName a:link, th.colConstructorName a:visited,
-th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,
-.constantValuesContainer td a:link, .constantValuesContainer td a:visited,
-.allClassesContainer td a:link, .allClassesContainer td a:visited,
+th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,
+.constantValuesContainer td a:link, .constantValuesContainer td a:visited,
+.allClassesContainer td a:link, .allClassesContainer td a:visited,
.allPackagesContainer td a:link, .allPackagesContainer td a:visited {
font-weight:bold;
}
@@ -571,6 +571,26 @@
td.colLast a {
padding-bottom:3px;
}
+div.memberSignature {
+ font-family:'DejaVu Sans Mono', monospace;
+ font-size:14px;
+ margin-top:6px;
+ margin-bottom:14px;
+ white-space: pre-wrap;
+}
+div.memberSignature span.annotations {
+ white-space: pre-wrap;
+}
+div.memberSignature span.typeParametersLong,
+div.memberSignature span.arguments,
+div.memberSignature span.exceptions {
+ display: inline-block;
+ vertical-align: top;
+ white-space: pre;
+}
+div.memberSignature span.typeParameters {
+ white-space: normal;
+}
/*
* Styles for formatting effect.
*/
@@ -616,12 +636,12 @@
* Styles for IFRAME.
*/
.mainContainer {
- margin:0 auto;
- padding:0;
- height:100%;
- width:100%;
- position:fixed;
- top:0;
+ margin:0 auto;
+ padding:0;
+ height:100%;
+ width:100%;
+ position:fixed;
+ top:0;
left:0;
}
.leftContainer {
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java Fri Jun 07 09:38:40 2019 -0700
@@ -3032,11 +3032,11 @@
*/
public TreePath getTreePath(Element e) {
DocCommentDuo duo = dcTreeCache.get(e);
- if (isValidDuo(duo) && duo.treePath != null) {
+ if (duo != null && duo.treePath != null) {
return duo.treePath;
}
duo = configuration.cmtUtils.getSyntheticCommentDuo(e);
- if (isValidDuo(duo) && duo.treePath != null) {
+ if (duo != null && duo.treePath != null) {
return duo.treePath;
}
Map<Element, TreePath> elementToTreePath = configuration.workArounds.getElementToTreePath();
@@ -3062,20 +3062,20 @@
ElementKind kind = element.getKind();
if (kind == ElementKind.PACKAGE || kind == ElementKind.OTHER) {
duo = dcTreeCache.get(element); // local cache
- if (!isValidDuo(duo) && kind == ElementKind.PACKAGE) {
+ if (duo == null && kind == ElementKind.PACKAGE) {
// package-info.java
duo = getDocCommentTuple(element);
}
- if (!isValidDuo(duo)) {
+ if (duo == null) {
// package.html or overview.html
duo = configuration.cmtUtils.getHtmlCommentDuo(element); // html source
}
} else {
duo = configuration.cmtUtils.getSyntheticCommentDuo(element);
- if (!isValidDuo(duo)) {
+ if (duo == null) {
duo = dcTreeCache.get(element); // local cache
}
- if (!isValidDuo(duo)) {
+ if (duo == null) {
duo = getDocCommentTuple(element); // get the real mccoy
}
}
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/links/LinkInfo.java Fri Jun 07 09:38:40 2019 -0700
@@ -72,12 +72,6 @@
public boolean isTypeBound = false;
/**
- * Whether the document element is in a Java 5 declaration
- * location or not.
- */
- public boolean isJava5DeclarationLocation = true;
-
- /**
* The label for the link.
*/
public Content label;
@@ -161,7 +155,6 @@
", type=" + type +
", isVarArg=" + isVarArg +
", isTypeBound=" + isTypeBound +
- ", isJava5DeclarationLocation=" + isJava5DeclarationLocation +
", label=" + label +
", isStrong=" + isStrong +
", includeTypeInClassLinkLabel=" + includeTypeInClassLinkLabel +
--- a/src/jdk.javadoc/share/classes/module-info.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.javadoc/share/classes/module-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -48,7 +48,7 @@
* @provides javax.tools.DocumentationTool
* @provides javax.tools.Tool
*
- * @see <a href="{@docRoot}/../specs/doc-comment-spec.html">
+ * @see <a href="{@docRoot}/../specs/javadoc/doc-comment-spec.html">
* Documentation Comment Specification for the Standard Doclet</a>
*
* @moduleGraph
--- a/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -30,6 +30,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Set;
import com.sun.tools.classfile.AccessFlags;
import com.sun.tools.classfile.Attribute;
@@ -471,6 +472,9 @@
setPendingNewline(false);
}
+ private static final int DEFAULT_ALLOWED_MAJOR_VERSION = 52;
+ private static final int DEFAULT_ALLOWED_MINOR_VERSION = 0;
+
protected void writeMethod(Method m) {
if (!options.checkAccess(m.access_flags))
return;
@@ -504,11 +508,24 @@
}
}
- writeModifiers(flags.getMethodModifiers());
+ Set<String> modifiers = flags.getMethodModifiers();
+
+ String name = getName(m);
+ if (classFile.isInterface() &&
+ (!flags.is(AccessFlags.ACC_ABSTRACT)) && !name.equals("<clinit>")) {
+ if (classFile.major_version > DEFAULT_ALLOWED_MAJOR_VERSION ||
+ (classFile.major_version == DEFAULT_ALLOWED_MAJOR_VERSION && classFile.minor_version >= DEFAULT_ALLOWED_MINOR_VERSION)) {
+ if (!flags.is(AccessFlags.ACC_STATIC | AccessFlags.ACC_PRIVATE)) {
+ modifiers.add("default");
+ }
+ }
+ }
+
+ writeModifiers(modifiers);
if (methodType != null) {
print(new JavaTypePrinter(false).printTypeArgs(methodType.typeParamTypes));
}
- switch (getName(m)) {
+ switch (name) {
case "<init>":
print(getJavaName(classFile));
print(getJavaParameterTypes(d, flags));
@@ -519,7 +536,7 @@
default:
print(getJavaReturnType(d));
print(" ");
- print(getName(m));
+ print(name);
print(getJavaParameterTypes(d, flags));
break;
}
--- a/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/doc-files/signature.html Fri Jun 07 09:38:40 2019 -0700
@@ -1,6 +1,6 @@
<!DOCTYPE HTML>
<!--
- Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2018, 2019, 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
@@ -41,6 +41,7 @@
</HEAD>
<BODY style="background-color:white">
<div role="main">
+<h1>JDI Type Signatures</h1>
<Table Border="0">
<caption style="font-size:x-large"><b>JDI Type Signatures</b></caption>
<thead>
--- a/src/jdk.jdi/share/classes/module-info.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jdi/share/classes/module-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -46,7 +46,7 @@
* This module includes a simple command-line debugger,
* <em>{@index jdb jdb tool}</em>.
*
- * <h3>Global Exceptions</h3>
+ * <h2>Global Exceptions</h2>
* <p>
* This section documents exceptions which apply to the entire API and are thus
* not documented on individual methods.
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MirrorEvent.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
package jdk.jfr.internal;
import java.lang.annotation.Retention;
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java Fri Jun 07 09:38:40 2019 -0700
@@ -315,7 +315,7 @@
private void dumpMemoryToDestination(PlatformRecording recording) {
WriteableUserPath dest = recording.getDestination();
if (dest != null) {
- MetadataRepository.getInstance().setOutput(dest.getText());
+ MetadataRepository.getInstance().setOutput(dest.getRealPathText());
recording.clearDestination();
}
}
@@ -406,7 +406,7 @@
event.id = r.getId();
event.name = r.getName();
WriteableUserPath p = r.getDestination();
- event.destination = p == null ? null : p.getText();
+ event.destination = p == null ? null : p.getRealPathText();
Duration d = r.getDuration();
event.recordingDuration = d == null ? Long.MAX_VALUE : d.toMillis();
Duration age = r.getMaxAge();
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java Fri Jun 07 09:38:40 2019 -0700
@@ -132,7 +132,7 @@
options.add("duration=" + Utils.formatTimespan(duration, ""));
}
if (destination != null) {
- options.add("filename=" + destination.getText());
+ options.add("filename=" + destination.getRealPathText());
}
String optionText = options.toString();
if (optionText.length() != 0) {
@@ -165,7 +165,7 @@
if (dest != null) {
try {
dumpStopped(dest);
- Logger.log(LogTag.JFR, LogLevel.INFO, "Wrote recording \"" + getName() + "\" (" + getId() + ") to " + dest.getText());
+ Logger.log(LogTag.JFR, LogLevel.INFO, "Wrote recording \"" + getName() + "\" (" + getId() + ") to " + dest.getRealPathText());
notifyIfStateChanged(newState, oldState);
close(); // remove if copied out
} catch(IOException e) {
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/WriteableUserPath.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/WriteableUserPath.java Fri Jun 07 09:38:40 2019 -0700
@@ -50,7 +50,8 @@
private final AccessControlContext controlContext;
private final Path original;
private final Path real;
- private final String text;
+ private final String realPathText;
+ private final String originalText;
// Not to ensure security, but to help
// against programming errors
@@ -68,8 +69,9 @@
BufferedWriter fw = Files.newBufferedWriter(path);
fw.close();
this.original = path;
+ this.originalText = path.toString();
this.real = path.toRealPath();
- this.text = real.toString();
+ this.realPathText = real.toString();
}
/**
@@ -85,15 +87,25 @@
}
/**
- * Returns a string representation of the path.
+ * Returns a string representation of the real path.
*
* @return path as text
*/
- public String getText() {
- return text;
+ public String getRealPathText() {
+ return realPathText;
}
/**
+ * Returns a string representation of the original path.
+ *
+ * @return path as text
+ */
+ public String getOriginalText() {
+ return originalText;
+ }
+
+
+ /**
* Returns a potentially malicious path where the user may have implemented
* their own version of Path. This method should never be called in an
* unsafe context and the Path value should never be passed along to other
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/management/ManagementSupport.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/management/ManagementSupport.java Fri Jun 07 09:38:40 2019 -0700
@@ -31,12 +31,16 @@
import java.util.List;
import jdk.jfr.EventType;
+import jdk.jfr.Recording;
import jdk.jfr.internal.JVMSupport;
import jdk.jfr.internal.LogLevel;
import jdk.jfr.internal.LogTag;
import jdk.jfr.internal.Logger;
import jdk.jfr.internal.MetadataRepository;
+import jdk.jfr.internal.PlatformRecording;
+import jdk.jfr.internal.PrivateAccess;
import jdk.jfr.internal.Utils;
+import jdk.jfr.internal.WriteableUserPath;
import jdk.jfr.internal.instrument.JDKEvents;
/**
@@ -86,4 +90,12 @@
public static void logError(String message) {
Logger.log(LogTag.JFR, LogLevel.ERROR, message);
}
+
+ // Get the textual representation when the destination was set, which
+ // requires access to jdk.jfr.internal.PlatformRecording
+ public static String getDestinationOriginalText(Recording recording) {
+ PlatformRecording pr = PrivateAccess.getInstance().getPlatformRecording(recording);
+ WriteableUserPath wup = pr.getDestination();
+ return wup == null ? null : wup.getOriginalText();
+ }
}
--- a/src/jdk.jfr/share/classes/module-info.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/classes/module-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,7 +25,6 @@
/**
* Defines the API for JDK Flight Recorder.
- * <p>
*
* @moduleGraph
* @since 9
--- a/src/jdk.jfr/share/conf/jfr/default.jfc Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/conf/jfr/default.jfc Fri Jun 07 09:38:40 2019 -0700
@@ -140,12 +140,12 @@
<event name="jdk.ExecutionSample">
<setting name="enabled" control="method-sampling-enabled">true</setting>
- <setting name="period" control="method-sampling-interval">20 ms</setting>
+ <setting name="period" control="method-sampling-java-interval">20 ms</setting>
</event>
<event name="jdk.NativeMethodSample">
<setting name="enabled" control="method-sampling-enabled">true</setting>
- <setting name="period" control="method-sampling-interval">20 ms</setting>
+ <setting name="period" control="method-sampling-native-interval">20 ms</setting>
</event>
<event name="jdk.SafepointBegin">
@@ -812,13 +812,42 @@
</condition>
<selection name="method-sampling-interval" default="normal" label="Method Sampling">
- <option label="Off" name="off">999 d</option>
- <option label="Normal" name="normal">20 ms</option>
- <option label="Maximum" name="maximum">10 ms</option>
+ <option label="Off" name="off">off</option>
+ <option label="Normal" name="normal">normal</option>
+ <option label="High" name="high">high</option>
+ <option label="Ludicrous (High Overhead)" name="ludicrous">ludicrous</option>
</selection>
+
+ <condition name="method-sampling-java-interval" true="999 d">
+ <test name="method-sampling-interval" operator="equal" value="off"/>
+ </condition>
+
+ <condition name="method-sampling-java-interval" true="20 ms">
+ <test name="method-sampling-interval" operator="equal" value="normal"/>
+ </condition>
+
+ <condition name="method-sampling-java-interval" true="10 ms">
+ <test name="method-sampling-interval" operator="equal" value="high"/>
+ </condition>
+
+ <condition name="method-sampling-java-interval" true="1 ms">
+ <test name="method-sampling-interval" operator="equal" value="ludicrous"/>
+ </condition>
+
+ <condition name="method-sampling-native-interval" true="999 d">
+ <test name="method-sampling-interval" operator="equal" value="off"/>
+ </condition>
+
+ <condition name="method-sampling-native-interval" true="20 ms">
+ <or>
+ <test name="method-sampling-interval" operator="equal" value="normal"/>
+ <test name="method-sampling-interval" operator="equal" value="high"/>
+ <test name="method-sampling-interval" operator="equal" value="ludicrous"/>
+ </or>
+ </condition>
<condition name="method-sampling-enabled" true="false" false="true">
- <test name="method-sampling-interval" operator="equal" value="999 d"/>
+ <test name="method-sampling-interval" operator="equal" value="off"/>
</condition>
<selection name="thread-dump-interval" default="normal" label="Thread Dump">
--- a/src/jdk.jfr/share/conf/jfr/profile.jfc Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jfr/share/conf/jfr/profile.jfc Fri Jun 07 09:38:40 2019 -0700
@@ -140,12 +140,12 @@
<event name="jdk.ExecutionSample">
<setting name="enabled" control="method-sampling-enabled">true</setting>
- <setting name="period" control="method-sampling-interval">10 ms</setting>
+ <setting name="period" control="method-sampling-java-interval">10 ms</setting>
</event>
<event name="jdk.NativeMethodSample">
<setting name="enabled" control="method-sampling-enabled">true</setting>
- <setting name="period" control="method-sampling-interval">10 ms</setting>
+ <setting name="period" control="method-sampling-native-interval">20 ms</setting>
</event>
<event name="jdk.SafepointBegin">
@@ -812,14 +812,43 @@
<test name="compiler-level" operator="equal" value="all"/>
</condition>
- <selection name="method-sampling-interval" default="maximum" label="Method Sampling">
- <option label="Off" name="off">999 d</option>
- <option label="Normal" name="normal">20 ms</option>
- <option label="Maximum" name="maximum">10 ms</option>
+ <selection name="method-sampling-interval" default="normal" label="Method Sampling">
+ <option label="Off" name="off">off</option>
+ <option label="Normal" name="normal">normal</option>
+ <option label="High" name="high">high</option>
+ <option label="Ludicrous (High Overhead)" name="ludicrous">ludicrous</option>
</selection>
+
+ <condition name="method-sampling-java-interval" true="999 d">
+ <test name="method-sampling-interval" operator="equal" value="off"/>
+ </condition>
+ <condition name="method-sampling-java-interval" true="20 ms">
+ <test name="method-sampling-interval" operator="equal" value="normal"/>
+ </condition>
+
+ <condition name="method-sampling-java-interval" true="10 ms">
+ <test name="method-sampling-interval" operator="equal" value="high"/>
+ </condition>
+
+ <condition name="method-sampling-java-interval" true="1 ms">
+ <test name="method-sampling-interval" operator="equal" value="ludicrous"/>
+ </condition>
+
+ <condition name="method-sampling-native-interval" true="999 d">
+ <test name="method-sampling-interval" operator="equal" value="off"/>
+ </condition>
+
+ <condition name="method-sampling-native-interval" true="20 ms">
+ <or>
+ <test name="method-sampling-interval" operator="equal" value="normal"/>
+ <test name="method-sampling-interval" operator="equal" value="high"/>
+ <test name="method-sampling-interval" operator="equal" value="ludicrous"/>
+ </or>
+ </condition>
+
<condition name="method-sampling-enabled" true="false" false="true">
- <test name="method-sampling-interval" operator="equal" value="999 d"/>
+ <test name="method-sampling-interval" operator="equal" value="off"/>
</condition>
<selection name="thread-dump-interval" default="everyMinute" label="Thread Dump">
--- a/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.jshell/share/classes/jdk/jshell/MaskCommentsAndModifiers.java Fri Jun 07 09:38:40 2019 -0700
@@ -139,10 +139,36 @@
}
}
+ @SuppressWarnings("fallthrough")
private void next() {
switch (c) {
- case '\'':
case '"': {
+ int pos = next - 1;
+ maskModifiers = false;
+ if (str.startsWith("\"\"\"", next - 1)) {
+ //text block/multi-line string literal:
+ int searchPoint = next + 2;
+ int end;
+ while ((end = str.indexOf("\"\"\"", searchPoint)) != (-1)) {
+ if (str.charAt(end - 1) != '\\')
+ break;
+ searchPoint = end + 1;
+ }
+ if (end == (-1)) {
+ openToken = true;
+ end = str.length();
+ } else {
+ end += 3;
+ }
+ write(c);
+ while (next < end) {
+ write(read());
+ }
+ break;
+ }
+ }
+ //intentional fall-through:
+ case '\'': {
maskModifiers = false;
write(c);
int match = c;
@@ -155,37 +181,6 @@
write(c); // write match // line-end
break;
}
- case '`': { // RawString
- maskModifiers = false;
- int backtickCount = 0;
- do {
- write(c);
- ++backtickCount;
- read();
- } while (c == '`');
- while (true) {
- if (c == '`') {
- int cnt = 0;
- do {
- write(c);
- ++cnt;
- read();
- } while (c == '`');
- if (cnt == backtickCount) {
- unread();
- break;
- }
- } else {
- write(c);
- if (c < 0) {
- openToken = true;
- break;
- }
- read();
- }
- }
- break;
- }
case '/':
read();
switch (c) {
--- a/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.management.jfr/share/classes/jdk/management/jfr/RecordingInfo.java Fri Jun 07 09:38:40 2019 -0700
@@ -25,7 +25,6 @@
package jdk.management.jfr;
-import java.nio.file.Path;
import java.time.Duration;
import java.time.Instant;
import java.util.LinkedHashMap;
@@ -37,6 +36,7 @@
import jdk.jfr.Recording;
import jdk.jfr.RecordingState;
+import jdk.jfr.internal.management.ManagementSupport;
/**
* Management representation of a {@code Recording}.
@@ -80,8 +80,7 @@
startTime = s == null ? 0L : s.toEpochMilli();
Instant st = recording.getStopTime();
stopTime = st == null ? 0L : st.toEpochMilli();
- Path p = recording.getDestination();
- destination = p == null ? null : p.toString();
+ destination = ManagementSupport.getDestinationOriginalText(recording);
Duration duration = recording.getDuration();
durationInSeconds = duration == null ? 0 : duration.getSeconds();
settings = recording.getSettings();
--- a/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties Fri Jun 07 09:38:40 2019 -0700
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2019, 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
@@ -136,8 +136,9 @@
rmic.must.only.throw.exception=\
Method {0} is not a valid remote method implementation because it throws {1}; implementations of remote methods may only throw java.lang.Exception or its subclasses.
rmic.jrmp.stubs.deprecated=\
- Warning: generation and use of skeletons and static stubs for JRMP\
+ Warning: {0} has been deprecated and is subject to removal in a future\
+ \nrelease. Generation and use of skeletons and static stubs for JRMP\
\nis deprecated. Skeletons are unnecessary, and static stubs have\
- \nbeen superseded by dynamically generated stubs. Users are\
- \nencouraged to migrate away from using {0} to generate skeletons and static\
+ \nbeen superseded by dynamically generated stubs. Users are encouraged\
+ \nto migrate away from using this tool to generate skeletons and static\
\nstubs. See the documentation for java.rmi.server.UnicastRemoteObject.
--- a/src/jdk.rmic/share/man/rmic.1 Thu Jun 06 15:46:36 2019 +0300
+++ b/src/jdk.rmic/share/man/rmic.1 Fri Jun 07 09:38:40 2019 -0700
@@ -46,10 +46,12 @@
.RE
.SH DESCRIPTION
.PP
-\f[B]Deprecation Note:\f[R] Support for static generation of Java Remote
-Method Protocol (JRMP) stubs and skeletons has been deprecated.
-Oracle recommends that you use dynamically generated JRMP stubs instead,
-eliminating the need to use this tool for JRMP\-based applications.
+\f[B]Deprecation Note:\f[R] The \f[CB]rmic\f[R] tool has been deprecated and
+is subject to removal in a future release. Support for static
+generation of Java Remote Method Protocol (JRMP) stubs and skeletons
+has been deprecated. Applications should use dynamically generated
+JRMP stubs, eliminating the need to use the \f[CB]rmic\f[R] tool for
+JRMP-based applications.
.PP
The \f[CB]rmic\f[R] compiler generates stub and skeleton class files using
the JRMP.
--- a/test/hotspot/gtest/utilities/test_ostream.cpp Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/gtest/utilities/test_ostream.cpp Fri Jun 07 09:38:40 2019 -0700
@@ -49,37 +49,66 @@
return len;
}
-static void do_test_stringStream_dynamic_realloc(bool short_len) {
- stringStream ss(2); // small buffer to force lots of reallocations.
+static void test_stringStream_is_zero_terminated(const stringStream* ss) {
+ ASSERT_EQ(ss->base()[ss->size()], '\0');
+}
+
+
+static void do_test_stringStream(stringStream* ss, bool short_len, size_t expected_cap) {
+ test_stringStream_is_zero_terminated(ss);
size_t written = 0;
for (int i = 0; i < 1000; i ++) {
- written += print_lorem(&ss, short_len);
- ASSERT_EQ(ss.size(), written);
+ written += print_lorem(ss, short_len);
+ if (expected_cap > 0 && written >= expected_cap) {
+ ASSERT_EQ(ss->size(), expected_cap - 1);
+ } else {
+ ASSERT_EQ(ss->size(), written);
+ }
// Internal buffer should always be zero-terminated.
- ASSERT_EQ(ss.base()[ss.size()], '\0');
+ test_stringStream_is_zero_terminated(ss);
}
+ // Reset should zero terminate too
+ ss->reset();
+ ASSERT_EQ(ss->size(), (size_t)0);
+ test_stringStream_is_zero_terminated(ss);
}
TEST_VM(ostream, stringStream_dynamic_realloc_1) {
- do_test_stringStream_dynamic_realloc(false);
+ stringStream ss(2); // dynamic buffer with very small starting size
+ do_test_stringStream(&ss, false, 0);
}
TEST_VM(ostream, stringStream_dynamic_realloc_2) {
- do_test_stringStream_dynamic_realloc(true);
+ stringStream ss(2); // dynamic buffer with very small starting size
+ do_test_stringStream(&ss, true, 0);
+}
+
+TEST_VM(ostream, stringStream_static) {
+ char buffer[128 + 1];
+ char* canary_at = buffer + sizeof(buffer) - 1;
+ *canary_at = 'X';
+ size_t stream_buf_size = sizeof(buffer) - 1;
+ stringStream ss(buffer, stream_buf_size);
+ do_test_stringStream(&ss, false, stream_buf_size);
+ ASSERT_EQ(*canary_at, 'X'); // canary
}
TEST_VM(ostream, bufferedStream_static) {
- char buf[100];
- bufferedStream bs(buf, sizeof(buf));
+ char buf[100 + 1];
+ char* canary_at = buf + sizeof(buf) - 1;
+ *canary_at = 'X';
+ size_t stream_buf_size = sizeof(buf) - 1;
+ bufferedStream bs(buf, stream_buf_size);
size_t written = 0;
for (int i = 0; i < 100; i ++) {
written += print_lorem(&bs, true);
- if (written < sizeof(buf)) {
+ if (written < stream_buf_size) {
ASSERT_EQ(bs.size(), written);
} else {
- ASSERT_EQ(bs.size(), sizeof(buf) - 1);
+ ASSERT_EQ(bs.size(), stream_buf_size - 1);
}
}
+ ASSERT_EQ(*canary_at, 'X'); // canary
}
TEST_VM(ostream, bufferedStream_dynamic_small) {
--- a/test/hotspot/jtreg/ProblemList-graal.txt Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/ProblemList-graal.txt Fri Jun 07 09:38:40 2019 -0700
@@ -52,6 +52,7 @@
compiler/whitebox/EnqueueMethodForCompilationTest.java 8181831 generic-all
compiler/whitebox/MakeMethodNotCompilableTest.java 8181831 generic-all
+compiler/uncommontrap/DeoptReallocFailure.java 8196611 generic-all
gc/arguments/TestNewSizeFlags.java 8196611 generic-all
gc/arguments/TestVerifyBeforeAndAfterGCFlags.java 8196611 generic-all
gc/g1/mixedgc/TestOldGenCollectionUsage.java 8196611 generic-all
@@ -59,16 +60,32 @@
gc/g1/TestPeriodicCollection.java 8196611 generic-all
gc/g1/TestFromCardCacheIndex.java 8196611 generic-all
gc/parallel/TestPrintGCDetailsVerbose.java 8196611 generic-all
-vm/gc/InfiniteList.java 8196611 generic-all
-vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java 8196611 macosx-all
+vm/gc/InfiniteList.java 8196611 generic-all
+
+vmTestbase/gc/lock/jni/jnilock001/TestDescription.java 8196611 generic-all
+vmTestbase/gc/lock/jniref/jnireflock04/TestDescription.java 8196611 generic-all
+vmTestbase/gc/lock/jvmti/alloc/jvmtialloclock02/TestDescription.java 8196611 generic-all
+vmTestbase/gc/lock/malloc/malloclock03/TestDescription.java 8196611 generic-all
vmTestbase/gc/gctests/LargeObjects/large001/large001.java 8196611 generic-all
vmTestbase/gc/gctests/ReferencesGC/ReferencesGC.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except001.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except002.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except003.java 8196611 generic-all
vmTestbase/nsk/stress/except/except004.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except005.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except006.java 8196611 generic-all
vmTestbase/nsk/stress/except/except007.java 8196611 generic-all
vmTestbase/nsk/stress/except/except008.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except009.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except010.java 8196611 generic-all
vmTestbase/nsk/stress/except/except011.java 8196611 generic-all
+vmTestbase/nsk/stress/except/except012.java 8196611 generic-all
+vmTestbase/nsk/jdi/stress/serial/heapwalking001/TestDescription.java 8196611 generic-all
+vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts002/TestDescription.java 8196611 generic-all
vmTestbase/nsk/jdi/VirtualMachine/instanceCounts/instancecounts003/instancecounts003.java 8196611 generic-all
vmTestbase/nsk/jdi/ObjectReference/referringObjects/referringObjects002/referringObjects002.java 8196611 generic-all
+vmTestbase/vm/gc/compact/Humongous_NonbranchyTree/TestDescription.java 8196611 generic-all
+
serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorMultiArrayTest.java 8196611 generic-all
serviceability/tmtools/jstat/GcTest02.java 8196611 generic-all
serviceability/tmtools/jstat/GcCapacityTest.java 8196611 generic-all
@@ -229,8 +246,6 @@
runtime/exceptionMsgs/AbstractMethodError/AbstractMethodErrorTest.java 8222582 generic-all
-serviceability/dcmd/compiler/CodelistTest.java 8220449 generic-all
-
# Graal unit tests
org.graalvm.compiler.core.test.CheckGraalInvariants 8205081
org.graalvm.compiler.core.test.OptionsVerifierTest 8205081
--- a/test/hotspot/jtreg/ProblemList.txt Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/ProblemList.txt Fri Jun 07 09:38:40 2019 -0700
@@ -43,7 +43,6 @@
compiler/ciReplay/TestSAServer.java 8029528 generic-all
compiler/codecache/stress/OverloadCompileQueueTest.java 8166554 generic-all
compiler/codegen/Test6896617.java 8193479 generic-all
-compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8140405 generic-all
compiler/jvmci/compilerToVM/GetFlagValueTest.java 8204459 generic-all
compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
@@ -58,6 +57,9 @@
compiler/runtime/Test8168712.java 8211769,8211771 generic-ppc64,generic-ppc64le,linux-s390x
+compiler/codegen/TestCharVect2.java 8224234 generic-x64
+compiler/c2/cr6340864/TestLongVect.java 8224234 generic-x64
+
applications/ctw/modules/java_desktop.java 8205016 windows-all
applications/ctw/modules/java_desktop_2.java 8205016 windows-all
applications/ctw/modules/jdk_jconsole.java 8205016 windows-all
--- a/test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,7 +31,10 @@
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
+ *
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI
+ * compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
*/
package compiler.compilercontrol.jcmd;
@@ -44,11 +47,14 @@
import compiler.compilercontrol.share.scenario.JcmdCommand;
import compiler.compilercontrol.share.scenario.Scenario;
import jdk.test.lib.Utils;
+import sun.hotspot.WhiteBox;
import java.lang.reflect.Executable;
public class ClearDirectivesFileStackTest extends AbstractTestBase {
- private static final int AMOUNT = Utils.getRandomInstance().nextInt(100);
+ private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+ private static final int LIMIT = WHITE_BOX.getIntVMFlag("CompilerDirectivesLimit").intValue();
+ private static final int AMOUNT = Utils.getRandomInstance().nextInt(LIMIT);
private final CommandGenerator cmdGen = new CommandGenerator();
public static void main(String[] args) {
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* jdk.internal.vm.ci/jdk.vm.ci.meta
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.AsResolvedJavaMethodTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -39,7 +39,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.DoNotInlineOrCompileTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -36,7 +36,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetBytecodeTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetBytecodeTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetClassInitializerTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetClassInitializerTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,7 +31,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetClassInitializerTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetConstantPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -39,7 +39,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetConstantPoolTest
*/
package compiler.jvmci.compilerToVM;
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetExceptionTableTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetExceptionTableTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetImplementorTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetImplementorTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,7 +31,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetImplementorTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -35,7 +35,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetLineNumberTableTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -38,7 +38,7 @@
* @compile -g DummyClass.java
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetLocalVariableTableTest
* @clean compiler.jvmci.compilerToVM.*
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -39,7 +39,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetResolvedJavaMethodTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -45,7 +45,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -XX:-UseCompressedOops -Djvmci.Compiler=null
+ * -XX:-UseCompressedOops -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetResolvedJavaTypeTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetStackTraceElementTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetSymbolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -35,7 +35,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.meta
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetSymbolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,7 +31,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.HasFinalizableSubclassTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/HasNeverInlineDirectiveTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -39,7 +39,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.HasNeverInlineDirectiveTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -39,12 +39,10 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler
- * -Djvmci.Compiler=null
* compiler.jvmci.compilerToVM.IsCompilableTest
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler
- * -Djvmci.Compiler=null
* compiler.jvmci.compilerToVM.IsCompilableTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -42,7 +42,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupKlassInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -40,7 +40,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupKlassRefIndexInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -40,7 +40,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupMethodInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -40,7 +40,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupNameAndTypeRefIndexInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -41,7 +41,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupNameInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -41,7 +41,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupSignatureInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupTypeTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/LookupTypeTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,7 +31,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.LookupTypeTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -35,7 +35,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.MethodIsIgnoredBySecurityStackWalkTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReadConfigurationTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ReadConfigurationTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,7 +32,7 @@
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.compilerToVM.ReadConfigurationTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ReadConfigurationTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -40,7 +40,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolveConstantInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -41,7 +41,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolveFieldInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.code
* @build jdk.internal.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolveMethodTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -40,7 +40,7 @@
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolvePossiblyCachedConstantInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -41,7 +41,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ResolveTypeInPoolTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -39,7 +39,7 @@
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null
+ * -XX:-UseJVMCICompiler
* compiler.jvmci.compilerToVM.ShouldInlineMethodTest
*/
--- a/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidCompilationResult.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidCompilationResult.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,7 +32,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.common
* @compile CodeInstallerTest.java
* @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null compiler.jvmci.errors.TestInvalidCompilationResult
+ * -XX:-UseJVMCICompiler compiler.jvmci.errors.TestInvalidCompilationResult
*/
package compiler.jvmci.errors;
--- a/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidDebugInfo.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidDebugInfo.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,7 +32,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.common
* @compile CodeInstallerTest.java
* @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null compiler.jvmci.errors.TestInvalidDebugInfo
+ * -XX:-UseJVMCICompiler compiler.jvmci.errors.TestInvalidDebugInfo
*/
package compiler.jvmci.errors;
--- a/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidOopMap.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/errors/TestInvalidOopMap.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -32,7 +32,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.common
* @compile CodeInstallerTest.java
* @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null compiler.jvmci.errors.TestInvalidOopMap
+ * -XX:-UseJVMCICompiler compiler.jvmci.errors.TestInvalidOopMap
*/
package compiler.jvmci.errors;
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -24,7 +24,7 @@
/**
* @test
* @bug 8156034
- * @requires vm.jvmci
+ * @requires vm.jvmci & !vm.graal.enabled
* @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8136421
- * @requires vm.jvmci
+ * @requires vm.jvmci & !vm.graal.enabled
* @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
@@ -47,10 +47,6 @@
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
* compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
* @run main/othervm -XX:+UnlockExperimentalVMOptions
- * -Xbootclasspath/a:. -Xmixed
- * -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
- * compiler.jvmci.events.JvmciNotifyInstallEventTest
- * @run main/othervm -XX:+UnlockExperimentalVMOptions
* -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
* -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
* compiler.jvmci.events.JvmciNotifyInstallEventTest
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/DataPatchTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -33,7 +33,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.DataPatchTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.DataPatchTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/InterpreterFrameSizeTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -33,7 +33,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.InterpreterFrameSizeTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.InterpreterFrameSizeTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/MaxOopMapStackOffsetTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.MaxOopMapStackOffsetTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.MaxOopMapStackOffsetTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleCodeInstallationTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -33,7 +33,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.SimpleCodeInstallationTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.SimpleCodeInstallationTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/SimpleDebugInfoTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -33,7 +33,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.SimpleDebugInfoTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.SimpleDebugInfoTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/VirtualObjectDebugInfoTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -33,7 +33,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.amd64
* jdk.internal.vm.ci/jdk.vm.ci.sparc
* @compile CodeInstallationTest.java DebugInfoTest.java TestAssembler.java TestHotSpotVMConfig.java amd64/AMD64TestAssembler.java sparc/SPARCTestAssembler.java
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.code.test.VirtualObjectDebugInfoTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.code.test.VirtualObjectDebugInfoTest
*/
package jdk.vm.ci.code.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -34,7 +34,7 @@
* @run driver ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
* @run testng/othervm/timeout=300 -Xbootclasspath/a:.
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null jdk.vm.ci.hotspot.test.HotSpotConstantReflectionProviderTest
+ * -XX:-UseJVMCICompiler jdk.vm.ci.hotspot.test.HotSpotConstantReflectionProviderTest
*/
package jdk.vm.ci.hotspot.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -38,7 +38,7 @@
* @run testng/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null jdk.vm.ci.hotspot.test.MemoryAccessProviderTest
+ * -XX:-UseJVMCICompiler jdk.vm.ci.hotspot.test.MemoryAccessProviderTest
*/
package jdk.vm.ci.hotspot.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -32,7 +32,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot:+open
* @run testng/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
- * -Djvmci.Compiler=null jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest
+ * -XX:-UseJVMCICompiler jdk.vm.ci.hotspot.test.MethodHandleAccessProviderTest
*/
package jdk.vm.ci.hotspot.test;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestTranslatedException.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.vm.ci.hotspot.test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestTranslatedException {
+
+ private static String printToString(Throwable throwable) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try (PrintStream ps = new PrintStream(baos)) {
+ throwable.printStackTrace(ps);
+ }
+ return baos.toString();
+ }
+
+ @SuppressWarnings("serial")
+ public static class Untranslatable extends RuntimeException {
+ public Untranslatable(String message, Throwable cause) {
+ super(message, cause);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void encodeDecodeTest() throws Exception {
+
+ Class<?> translatedExceptionClass = Class.forName("jdk.vm.ci.hotspot.TranslatedException");
+
+ Method encode = translatedExceptionClass.getDeclaredMethod("encodeThrowable", Throwable.class);
+ Method decode = translatedExceptionClass.getDeclaredMethod("decodeThrowable", String.class);
+ encode.setAccessible(true);
+ decode.setAccessible(true);
+
+ Throwable throwable = new ExceptionInInitializerError(new InvocationTargetException(new Untranslatable("test exception", new NullPointerException()), "invoke"));
+ for (int i = 0; i < 10; i++) {
+ throwable = new ExceptionInInitializerError(new InvocationTargetException(new RuntimeException(String.valueOf(i), throwable), "invoke"));
+ }
+ String before = printToString(throwable);
+ String encoding = (String) encode.invoke(null, throwable);
+ Throwable decoded = (Throwable) decode.invoke(null, encoding);
+ String after = printToString(decoded);
+
+ after = after.replace(
+ "jdk.vm.ci.hotspot.TranslatedException: [java.lang.ClassNotFoundException: jdk/vm/ci/hotspot/test/TestTranslatedException$Untranslatable]",
+ "jdk.vm.ci.hotspot.test.TestTranslatedException$Untranslatable: test exception");
+
+ Assert.assertEquals("before:\n" + before + "\nafter:\n" + after, before, after);
+ }
+}
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.ConstantTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.ConstantTest
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -29,7 +29,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* jdk.attach
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null -Djdk.attach.allowAttachSelf jdk.vm.ci.runtime.test.RedefineClassTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Djdk.attach.allowAttachSelf jdk.vm.ci.runtime.test.RedefineClassTest
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveConcreteMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -26,7 +26,7 @@
* @requires vm.jvmci
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.ResolvedJavaTypeResolveConcreteMethodTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.ResolvedJavaTypeResolveConcreteMethodTest
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ResolvedJavaTypeResolveMethodTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -26,7 +26,7 @@
* @requires vm.jvmci
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.ResolvedJavaTypeResolveMethodTest
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.ResolvedJavaTypeResolveMethodTest
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestConstantReflectionProvider
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestConstantReflectionProvider
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestJavaField
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestJavaField
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestJavaMethod
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestJavaMethod
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestJavaType
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestJavaType
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -28,7 +28,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestMetaAccessProvider
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestMetaAccessProvider
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java Fri Jun 07 09:38:40 2019 -0700
@@ -29,7 +29,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestResolvedJavaField
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaField
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java Fri Jun 07 09:38:40 2019 -0700
@@ -29,7 +29,7 @@
* @modules jdk.internal.vm.ci/jdk.vm.ci.meta
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestResolvedJavaMethod
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaMethod
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -30,7 +30,7 @@
* jdk.internal.vm.ci/jdk.vm.ci.runtime
* jdk.internal.vm.ci/jdk.vm.ci.common
* java.base/jdk.internal.misc
- * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null jdk.vm.ci.runtime.test.TestResolvedJavaType
+ * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaType
*/
package jdk.vm.ci.runtime.test;
--- a/test/hotspot/jtreg/compiler/jvmci/meta/StableFieldTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/compiler/jvmci/meta/StableFieldTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -34,7 +34,7 @@
*
* @compile StableFieldTest.java
* @run driver ClassFileInstaller compiler.jvmci.meta.StableFieldTest
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -Djvmci.Compiler=null -Xbootclasspath/a:. compiler.jvmci.meta.StableFieldTest
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler -Xbootclasspath/a:. compiler.jvmci.meta.StableFieldTest
*/
package compiler.jvmci.meta;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/profiling/TestProfileCounterOverflow.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2019, Loongson Technology Co. Ltd. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8224162
+ * @summary Profile counter for a call site may overflow.
+ * @run main/othervm -Xbatch -XX:-UseOnStackReplacement -XX:MaxTrivialSize=0 compiler.profiling.TestProfileCounterOverflow
+ */
+
+package compiler.profiling;
+
+public class TestProfileCounterOverflow {
+ public static void test(long iterations) {
+ for (long j = 0; j < iterations; j++) {
+ call();
+ }
+ }
+
+ public static void call() {}
+
+ public static void main(String[] args) {
+ // trigger profiling on tier3
+ for (int i = 0; i < 500; i++) {
+ test(1);
+ }
+
+ test(Integer.MAX_VALUE + 10000L); // overflow call counter
+
+ // trigger c2 compilation
+ for (int i = 0; i < 10_000; i++) {
+ test(1);
+ }
+ System.out.println("TEST PASSED");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/whitebox/OSRFailureLevel4Test.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test OSRFailureLevel4Test
+ * @summary check that not compilable OSR level 4 results in falling back to level 1
+ * @library /test/lib /
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -XX:+TieredCompilation compiler.whitebox.OSRFailureLevel4Test
+ */
+
+package compiler.whitebox;
+
+import sun.hotspot.WhiteBox;
+import java.lang.reflect.Executable;
+import java.lang.reflect.Method;
+
+public class OSRFailureLevel4Test extends Thread {
+ private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+ private static final long BACKEDGE_THRESHOLD = 150000;
+ private Method method;
+
+ public static void main(String[] args) throws Exception {
+ OSRFailureLevel4Test test = new OSRFailureLevel4Test();
+ test.test();
+ }
+
+ /**
+ * Triggers two different OSR compilations for the same method and
+ * checks if WhiteBox.deoptimizeMethod() deoptimizes both.
+ *
+ * @throws Exception
+ */
+ public void test() throws Exception {
+ method = OSRFailureLevel4Test.class.getDeclaredMethod("run");
+ WHITE_BOX.makeMethodNotCompilable(method, 4, true);
+
+ Thread t = new OSRFailureLevel4Test();
+ t.setDaemon(true);
+ t.start();
+
+ int currentLevel = 0;
+ int loops = 0;
+ while (true) {
+ int level = WHITE_BOX.getMethodCompilationLevel(method, true);
+ if (level == 1) {
+ System.err.println("success");
+ running = false;
+ return;
+ }
+ if (level == currentLevel) {
+ Thread.sleep(1000);
+ loops++;
+ if (loops > 100) {
+ running = false;
+ throw new AssertionError("Never reached level 1");
+ }
+ continue;
+ }
+ currentLevel = level;
+ System.err.println("Current level = " + currentLevel);
+ }
+
+ }
+
+ static volatile int counter = 0;
+ static boolean running = true;
+
+ public void run() {
+ while (running) {
+ counter++;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/arguments/TestSoftMaxHeapSizeFlag.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package gc.arguments;
+
+/*
+ * @test TestSoftMaxHeapSizeFlag
+ * @key gc
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @run main/othervm gc.arguments.TestSoftMaxHeapSizeFlag
+ */
+
+import jdk.test.lib.process.ProcessTools;
+
+public class TestSoftMaxHeapSizeFlag {
+ private static final long Xms = 200 * 1024 * 1024;
+ private static final long Xmx = 300 * 1024 * 1024;
+ private static final long greaterThanXmx = Xmx + 1;
+ private static final long betweenXmsAndXmx = (Xms + Xmx) / 2;
+
+ public static void main(String args[]) throws Exception {
+ // Test default value
+ ProcessTools.executeTestJvm(new String[]{ "-Xms" + Xms, "-Xmx" + Xmx,
+ "-XX:+PrintFlagsFinal", "-version" })
+ .shouldMatch("SoftMaxHeapSize[ ]+=[ ]+" + Xmx)
+ .shouldHaveExitValue(0);
+
+ // Test setting small value
+ ProcessTools.executeTestJvm(new String[]{ "-Xms" + Xms, "-Xmx" + Xmx,
+ "-XX:SoftMaxHeapSize=" + Xms,
+ "-XX:+PrintFlagsFinal", "-version" })
+ .shouldMatch("SoftMaxHeapSize[ ]+=[ ]+" + Xms)
+ .shouldHaveExitValue(0);
+
+ // Test setting middle value
+ ProcessTools.executeTestJvm(new String[]{ "-Xms" + Xms, "-Xmx" + Xmx,
+ "-XX:SoftMaxHeapSize=" + betweenXmsAndXmx,
+ "-XX:+PrintFlagsFinal", "-version" })
+ .shouldMatch("SoftMaxHeapSize[ ]+=[ ]+" + betweenXmsAndXmx)
+ .shouldHaveExitValue(0);
+
+ // Test setting largest value
+ ProcessTools.executeTestJvm(new String[]{ "-Xms" + Xms, "-Xmx" + Xmx,
+ "-XX:SoftMaxHeapSize=" + Xmx,
+ "-XX:+PrintFlagsFinal", "-version" })
+ .shouldMatch("SoftMaxHeapSize[ ]+=[ ]+" + Xmx)
+ .shouldHaveExitValue(0);
+
+ // Test setting a too large value
+ ProcessTools.executeTestJvm(new String[]{ "-Xms" + Xms, "-Xmx" + Xmx,
+ "-XX:SoftMaxHeapSize=" + greaterThanXmx,
+ "-XX:+PrintFlagsFinal", "-version" })
+ .shouldContain("SoftMaxHeapSize must be less than or equal to the maximum heap size")
+ .shouldHaveExitValue(1);
+ }
+}
--- a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java Fri Jun 07 09:38:40 2019 -0700
@@ -33,8 +33,6 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
-import jtreg.SkippedException;
-import sun.hotspot.gc.GC;
import sun.hotspot.WhiteBox;
/*
@@ -45,10 +43,13 @@
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
+ * @requires vm.gc != "Epsilon"
+ * @requires vm.gc != "Z"
+ * @requires vm.gc != "Shenandoah"
*
* @compile TestMetaSpaceLog.java
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI gc.logging.TestMetaSpaceLog
+ * @run driver gc.logging.TestMetaSpaceLog
*/
public class TestMetaSpaceLog {
@@ -60,27 +61,7 @@
}
public static void main(String[] args) throws Exception {
- boolean noneGCSupported = true;
-
- if (GC.Parallel.isSupported()) {
- noneGCSupported = false;
- testMetaSpaceUpdate("UseParallelGC");
- }
- if (GC.G1.isSupported()) {
- noneGCSupported = false;
- testMetaSpaceUpdate("UseG1GC");
- }
- if (GC.ConcMarkSweep.isSupported()) {
- noneGCSupported = false;
- testMetaSpaceUpdate("UseConcMarkSweepGC");
- }
- if (GC.Serial.isSupported()) {
- noneGCSupported = false;
- testMetaSpaceUpdate("UseSerialGC");
- }
- if (noneGCSupported) {
- throw new SkippedException("Skipping test because none of Parallel/G1/ConcMarkSweep/Serial is supported.");
- }
+ testMetaSpaceUpdate();
}
private static void verifyContainsMetaSpaceUpdate(OutputAnalyzer output) {
@@ -99,14 +80,13 @@
return before > after;
}
- private static void testMetaSpaceUpdate(String gcFlag) throws Exception {
+ private static void testMetaSpaceUpdate() throws Exception {
// Propagate test.src for the jar file.
String testSrc= "-Dtest.src=" + System.getProperty("test.src", ".");
- System.err.println("Testing with GC Flag: " + gcFlag);
ProcessBuilder pb =
ProcessTools.createJavaProcessBuilder(
- "-XX:+" + gcFlag,
+ true,
"-Xlog:gc*",
"-Xbootclasspath/a:.",
"-XX:+UnlockDiagnosticVMOptions",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2016, 2018, Red Hat, Inc. All rights reserved.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test TestThreadCounts
+ * @summary Test that Shenandoah GC thread counts are handled well
+ * @key gc
+ * @requires vm.gc.Shenandoah & !vm.graal.enabled
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @run driver TestThreadCounts
+ */
+
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestThreadCounts {
+ public static void main(String[] args) throws Exception {
+ for (int conc = 0; conc < 16; conc++) {
+ for (int par = 0; par < 16; par++) {
+ testWith(conc, par);
+ }
+ }
+ }
+
+ private static void testWith(int conc, int par) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+ "-XX:+UnlockExperimentalVMOptions",
+ "-XX:+UseShenandoahGC",
+ "-XX:ConcGCThreads=" + conc,
+ "-XX:ParallelGCThreads=" + par,
+ "-version");
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+
+ if (conc == 0) {
+ output.shouldContain("Shenandoah expects ConcGCThreads > 0");
+ output.shouldHaveExitValue(1);
+ } else if (par == 0) {
+ output.shouldContain("Shenandoah expects ParallelGCThreads > 0");
+ output.shouldHaveExitValue(1);
+ } else if (conc > par) {
+ output.shouldContain("Shenandoah expects ConcGCThreads <= ParallelGCThreads");
+ output.shouldHaveExitValue(0);
+ } else {
+ output.shouldNotContain("Shenandoah expects ConcGCThreads <= ParallelGCThreads");
+ output.shouldHaveExitValue(0);
+ }
+ }
+
+}
--- a/test/hotspot/jtreg/gc/z/TestHighUsage.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/gc/z/TestHighUsage.java Fri Jun 07 09:38:40 2019 -0700
@@ -38,18 +38,21 @@
static class Test {
private static final int K = 1024;
private static final int M = K * K;
- private static final long startAt = 16 * M;
- private static final long spikeAt = 4 * M;
+ private static final long maxCapacity = Runtime.getRuntime().maxMemory();
+ private static final long slowAllocationThreshold = 16 * M;
+ private static final long highUsageThreshold = maxCapacity / 20; // 5%
private static volatile LinkedList<byte[]> keepAlive;
private static volatile Object dummy;
public static void main(String[] args) throws Exception {
+ System.out.println("Max capacity: " + (maxCapacity / M) + "M");
+ System.out.println("High usage threshold: " + (highUsageThreshold / M) + "M");
System.out.println("Allocating live-set");
// Allocate live-set
keepAlive = new LinkedList<>();
- while (Runtime.getRuntime().freeMemory() > startAt) {
- while (Runtime.getRuntime().freeMemory() > startAt) {
+ while (Runtime.getRuntime().freeMemory() > slowAllocationThreshold) {
+ while (Runtime.getRuntime().freeMemory() > slowAllocationThreshold) {
keepAlive.add(new byte[128 * K]);
}
@@ -60,21 +63,18 @@
System.out.println("Allocating garbage slowly");
- // Allocate garbage slowly, such that the sampled allocation rate on
- // average becomes zero MB/s for the last 1 second windows. If free
- // memory goes below the spike limit we induce an allocation spike.
- // The expected behavior is that the "High Usage" rule kicks in before
- // the spike happens, avoiding an "Allocation Stall".
+ // Allocate garbage slowly, so that the sampled allocation rate on average
+ // becomes zero MB/s for the last 1 second windows. Once we reach the high
+ // usage threshold we idle to allow for a "High Usage" GC cycle to happen.
+ // We need to allocate slowly to avoid an "Allocation Rate" GC cycle.
for (int i = 0; i < 300; i++) {
- final long free = Runtime.getRuntime().freeMemory();
- System.out.println("Free: " + (free / M) + "M");
-
- if (free > spikeAt) {
- // Low allocation rate
+ if (Runtime.getRuntime().freeMemory() > highUsageThreshold) {
+ // Allocate
dummy = new byte[128 * K];
+ System.out.println("Free: " + (Runtime.getRuntime().freeMemory() / M) + "M (Allocating)");
} else {
- // High allocation rate
- dummy = new byte[8 * M];
+ // Idle
+ System.out.println("Free: " + (Runtime.getRuntime().freeMemory() / M) + "M (Idling)");
}
Thread.sleep(250);
@@ -93,7 +93,7 @@
"-Xmx128M",
"-XX:ParallelGCThreads=1",
"-XX:ConcGCThreads=1",
- "-Xlog:gc",
+ "-Xlog:gc,gc+start",
Test.class.getName() })
.shouldNotContain("Allocation Stall")
.shouldContain("High Usage")
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -38,13 +38,29 @@
public class TestOptionsWithRangesDynamic {
+ private static List<JVMOption> allWriteableOptions;
+
+ private static void excludeTestRange(String optionName) {
+ for (JVMOption option: allWriteableOptions) {
+ if (option.getName().equals(optionName)) {
+ option.excludeTestMinRange();
+ option.excludeTestMaxRange();
+ break;
+ }
+ }
+ }
+
public static void main(String[] args) throws Exception {
int failedTests;
- List<JVMOption> allWriteableOptions;
/* Get only writeable options */
allWriteableOptions = JVMOptionsUtils.getOptionsWithRange(origin -> (origin.contains("manageable") || origin.contains("rw")));
+ /*
+ * Exclude SoftMaxHeapSize as its valid range is only known at runtime.
+ */
+ excludeTestRange("SoftMaxHeapSize");
+
Asserts.assertGT(allWriteableOptions.size(), 0, "Options with ranges not found!");
System.out.println("Test " + allWriteableOptions.size() + " writeable options with ranges. Start test!");
--- a/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -146,7 +146,7 @@
*
* @return name of the option
*/
- final String getName() {
+ public final String getName() {
return name;
}
--- a/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/TimeoutInErrorHandlingTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
@@ -43,9 +43,18 @@
public class TimeoutInErrorHandlingTest {
+ public static final boolean verbose = System.getProperty("verbose") != null;
+ // 16 seconds for hs_err generation timeout = 4 seconds per step timeout
+ public static final int ERROR_LOG_TIMEOUT = 16;
public static void main(String[] args) throws Exception {
+ int error_log_timeout = ERROR_LOG_TIMEOUT;
+ if ("SunOS".equals(System.getProperty("os.name"))) {
+ // Give Solaris machines 3X as much time:
+ error_log_timeout *= 3;
+ }
+
/* Start the VM and let it crash. Specify TestUnresponsiveErrorHandler which will
* let five subsequent error reporting steps hang. The Timeout handling triggered
* by the WatcherThread should kick in and interrupt those steps. In theory, the
@@ -72,12 +81,18 @@
"-Xmx100M",
"-XX:ErrorHandlerTest=14",
"-XX:+TestUnresponsiveErrorHandler",
- "-XX:ErrorLogTimeout=16", // 16 seconds big timeout = 4 seconds per little timeout
+ "-XX:ErrorLogTimeout=" + error_log_timeout,
"-XX:-CreateCoredumpOnCrash",
"-version");
OutputAnalyzer output_detail = new OutputAnalyzer(pb.start());
+ if (verbose) {
+ System.err.println("<begin cmd output>");
+ System.err.println(output_detail.getOutput());
+ System.err.println("<end cmd output>");
+ }
+
// we should have crashed with a SIGSEGV
output_detail.shouldMatch("# A fatal error has been detected by the Java Runtime Environment:.*");
output_detail.shouldMatch("# +(?:SIGSEGV|EXCEPTION_ACCESS_VIOLATION).*");
@@ -88,11 +103,21 @@
// extract hs-err file
String hs_err_file = output_detail.firstMatch("# *(\\S*hs_err_pid\\d+\\.log)", 1);
if (hs_err_file == null) {
+ if (!verbose) {
+ System.err.println("<begin cmd output>");
+ System.err.println(output_detail.getOutput());
+ System.err.println("<end cmd output>");
+ }
throw new RuntimeException("Did not find hs-err file in output.\n");
}
File f = new File(hs_err_file);
if (!f.exists()) {
+ if (!verbose) {
+ System.err.println("<begin cmd output>");
+ System.err.println(output_detail.getOutput());
+ System.err.println("<end cmd output>");
+ }
throw new RuntimeException("hs-err file missing at "
+ f.getAbsolutePath() + ".\n");
}
@@ -104,7 +129,6 @@
String line = null;
-
Pattern [] pattern = new Pattern[] {
Pattern.compile(".*timeout occurred during error reporting in step.*"),
Pattern.compile(".*timeout occurred during error reporting in step.*")
@@ -112,18 +136,31 @@
int currentPattern = 0;
String lastLine = null;
+ StringBuilder saved_hs_err = new StringBuilder();
while ((line = br.readLine()) != null) {
+ saved_hs_err.append(line + System.lineSeparator());
if (currentPattern < pattern.length) {
- if (pattern[currentPattern].matcher(line).matches()) {
- System.out.println("Found: " + line + ".");
- currentPattern ++;
- }
+ if (pattern[currentPattern].matcher(line).matches()) {
+ System.out.println("Found: " + line + ".");
+ currentPattern ++;
+ }
}
lastLine = line;
}
br.close();
+ if (verbose) {
+ System.err.println("<begin hs_err contents>");
+ System.err.print(saved_hs_err);
+ System.err.println("<end hs_err contents>");
+ }
+
if (currentPattern < pattern.length) {
+ if (!verbose) {
+ System.err.println("<begin hs_err contents>");
+ System.err.print(saved_hs_err);
+ System.err.println("<end hs_err contents>");
+ }
throw new RuntimeException("hs-err file incomplete (first missing pattern: " + currentPattern + ")");
}
@@ -132,4 +169,3 @@
}
}
-
--- a/test/hotspot/jtreg/runtime/clinit/ClassInitBarrier.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/runtime/clinit/ClassInitBarrier.java Fri Jun 07 09:38:40 2019 -0700
@@ -114,7 +114,7 @@
checkBlockingAction(Test::testPutStatic); // putstatic
checkBlockingAction(Test::testNewInstanceA); // new
- A recv = testNewInstanceB(NON_BLOCKING.get()); // trigger B initialization
+ A recv = testNewInstanceB(NON_BLOCKING.get()); // trigger B initialization
checkNonBlockingAction(Test::testNewInstanceB); // new: NO BLOCKING: same thread: A being initialized, B fully initialized
checkNonBlockingAction(recv, Test::testGetField); // getfield
@@ -140,8 +140,8 @@
static void run() {
execute(ExceptionInInitializerError.class, () -> triggerInitialization(A.class));
-
ensureFinished();
+ runTests(); // after initialization is over
}
}
@@ -150,22 +150,30 @@
static void execute(Class<? extends Throwable> expectedExceptionClass, Runnable action) {
try {
action.run();
- if (THROW) throw new AssertionError("no exception thrown");
+ if (THROW) throw failure("no exception thrown");
} catch (Throwable e) {
if (THROW) {
if (e.getClass() == expectedExceptionClass) {
// expected
} else {
String msg = String.format("unexpected exception thrown: expected %s, caught %s",
- expectedExceptionClass.getName(), e.getClass().getName());
- throw new AssertionError(msg, e);
+ expectedExceptionClass.getName(), e);
+ throw failure(msg, e);
}
} else {
- throw new AssertionError("no exception expected", e);
+ throw failure("no exception expected", e);
}
}
}
+ private static AssertionError failure(String msg) {
+ return new AssertionError(phase + ": " + msg);
+ }
+
+ private static AssertionError failure(String msg, Throwable e) {
+ return new AssertionError(phase + ": " + msg, e);
+ }
+
static final List<Thread> BLOCKED_THREADS = Collections.synchronizedList(new ArrayList<>());
static final Consumer<Thread> ON_BLOCK = BLOCKED_THREADS::add;
@@ -293,27 +301,53 @@
static final AtomicInteger NON_BLOCKING_COUNTER = new AtomicInteger(0);
static final AtomicInteger NON_BLOCKING_ACTIONS = new AtomicInteger(0);
- static final Factory<Runnable> NON_BLOCKING = () -> disposableAction(Phase.IN_PROGRESS, NON_BLOCKING_COUNTER, NON_BLOCKING_ACTIONS);
+ static final Factory<Runnable> NON_BLOCKING = () -> disposableAction(phase, NON_BLOCKING_COUNTER, NON_BLOCKING_ACTIONS);
static final AtomicInteger BLOCKING_COUNTER = new AtomicInteger(0);
static final AtomicInteger BLOCKING_ACTIONS = new AtomicInteger(0);
static final Factory<Runnable> BLOCKING = () -> disposableAction(Phase.FINISHED, BLOCKING_COUNTER, BLOCKING_ACTIONS);
static void checkBlockingAction(TestCase0 r) {
- r.run(NON_BLOCKING.get()); // same thread
- checkBlocked(ON_BLOCK, ON_FAILURE, r); // different thread
+ switch (phase) {
+ case IN_PROGRESS: {
+ // Barrier during class initalization.
+ r.run(NON_BLOCKING.get()); // initializing thread
+ checkBlocked(ON_BLOCK, ON_FAILURE, r); // different thread
+ break;
+ }
+ case FINISHED: {
+ // No barrier after class initalization is over.
+ r.run(NON_BLOCKING.get()); // initializing thread
+ checkNotBlocked(r); // different thread
+ break;
+ }
+ case INIT_FAILURE: {
+ // Exception is thrown after class initialization failed.
+ TestCase0 test = action -> execute(NoClassDefFoundError.class, () -> r.run(action));
+
+ test.run(NON_BLOCKING.get()); // initializing thread
+ checkNotBlocked(test); // different thread
+ break;
+ }
+ default: throw new Error("wrong phase: " + phase);
+ }
}
static void checkNonBlockingAction(TestCase0 r) {
- r.run(NON_BLOCKING.get());
- checkNotBlocked(r); // different thread
+ r.run(NON_BLOCKING.get()); // initializing thread
+ checkNotBlocked(r); // different thread
}
static <T> void checkNonBlockingAction(T recv, TestCase1<T> r) {
- r.run(recv, NON_BLOCKING.get()); // same thread
+ r.run(recv, NON_BLOCKING.get()); // initializing thread
checkNotBlocked((action) -> r.run(recv, action)); // different thread
}
+ static void checkFailingAction(TestCase0 r) {
+ r.run(NON_BLOCKING.get()); // initializing thread
+ checkNotBlocked(r); // different thread
+ }
+
static void triggerInitialization(Class<?> cls) {
try {
Class<?> loadedClass = Class.forName(cls.getName(), true, cls.getClassLoader());
@@ -356,7 +390,15 @@
}
static void checkNotBlocked(TestCase0 r) {
- Thread thr = new Thread(() -> r.run(NON_BLOCKING.get()));
+ final Thread thr = new Thread(() -> r.run(NON_BLOCKING.get()));
+ final Throwable[] ex = new Throwable[1];
+ thr.setUncaughtExceptionHandler((t, e) -> {
+ if (thr != t) {
+ ex[0] = new Error("wrong thread: " + thr + " vs " + t);
+ } else {
+ ex[0] = e;
+ }
+ });
thr.start();
try {
@@ -368,6 +410,10 @@
} catch (InterruptedException e) {
throw new Error(e);
}
+
+ if (ex[0] != null) {
+ throw new AssertionError("no exception expected", ex[0]);
+ }
}
static void maybeThrow() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/EventsTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.JMXExecutor;
+import jdk.test.lib.process.OutputAnalyzer;
+import org.testng.annotations.Test;
+
+/*
+ * @test
+ * @summary Test of diagnostic command VM.events
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * java.compiler
+ * java.management
+ * jdk.internal.jvmstat/sun.jvmstat.monitor
+ * @run testng EventsTest
+ */
+public class EventsTest {
+
+ static String buildHeaderPattern(String logname) {
+ return "^" + logname + ".*\\(\\d+ events\\):";
+ }
+
+ public void run_all(CommandExecutor executor) {
+ OutputAnalyzer output = executor.execute("VM.events");
+ // This tests for the output to contain the event log header line (e.g. "Classes unloaded (0 events):").
+ // Those are always printed even if the corresponding event log is empty.
+ output.stdoutShouldMatch(buildHeaderPattern("Events"));
+ output.stdoutShouldMatch(buildHeaderPattern("Compilation"));
+ output.stdoutShouldMatch(buildHeaderPattern("GC Heap History"));
+ output.stdoutShouldMatch(buildHeaderPattern("Deoptimization"));
+ output.stdoutShouldMatch(buildHeaderPattern("Classes unloaded"));
+ }
+
+ public void run_selected(CommandExecutor executor) {
+ OutputAnalyzer output = executor.execute("VM.events log=deopt");
+ // We only expect one log to be printed here.
+ output.stdoutShouldMatch(buildHeaderPattern("Deoptimization"));
+
+ output.stdoutShouldNotMatch(buildHeaderPattern("Events"));
+ output.stdoutShouldNotMatch(buildHeaderPattern("Compilation"));
+ output.stdoutShouldNotMatch(buildHeaderPattern("GC Heap History"));
+ output.stdoutShouldNotMatch(buildHeaderPattern("Classes unloaded"));
+ }
+
+ @Test
+ public void jmx() {
+ run_all(new JMXExecutor());
+ run_selected(new JMXExecutor());
+ }
+}
--- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java Fri Jun 07 09:38:40 2019 -0700
@@ -258,35 +258,40 @@
private String[] cmd(long classStart, long classStop) {
String phase = phaseName(classStart);
- return new String[] {
- "-Xbatch",
- "-XX:-UseCounterDecay",
- "-XX:-ShowMessageBoxOnError",
- "-XX:+UnlockDiagnosticVMOptions",
- // redirect VM output to cerr so it won't collide w/ ctw output
- "-XX:+DisplayVMOutputToStderr",
- // define phase start
- "-DCompileTheWorldStartAt=" + classStart,
- "-DCompileTheWorldStopAt=" + classStop,
- // CTW library uses WhiteBox API
- "-XX:+WhiteBoxAPI", "-Xbootclasspath/a:.",
- // export jdk.internal packages used by CTW library
- "--add-exports", "java.base/jdk.internal.jimage=ALL-UNNAMED",
- "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
- "--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
- "--add-exports", "java.base/jdk.internal.access=ALL-UNNAMED",
- // enable diagnostic logging
- "-XX:+LogCompilation",
- // use phase specific log, hs_err and ciReplay files
- String.format("-XX:LogFile=hotspot_%s_%%p.log", phase),
- String.format("-XX:ErrorFile=hs_err_%s_%%p.log", phase),
- String.format("-XX:ReplayDataFile=replay_%s_%%p.log", phase),
- // MethodHandle MUST NOT be compiled
- "-XX:CompileCommand=exclude,java/lang/invoke/MethodHandle.*",
- // CTW entry point
- CompileTheWorld.class.getName(),
- target,
- };
+ Path file = Paths.get(phase + ".cmd");
+ try {
+ Files.write(file, List.of(
+ "-Xbatch",
+ "-XX:-UseCounterDecay",
+ "-XX:-ShowMessageBoxOnError",
+ "-XX:+UnlockDiagnosticVMOptions",
+ // redirect VM output to cerr so it won't collide w/ ctw output
+ "-XX:+DisplayVMOutputToStderr",
+ // define phase start
+ "-DCompileTheWorldStartAt=" + classStart,
+ "-DCompileTheWorldStopAt=" + classStop,
+ // CTW library uses WhiteBox API
+ "-XX:+WhiteBoxAPI", "-Xbootclasspath/a:.",
+ // export jdk.internal packages used by CTW library
+ "--add-exports", "java.base/jdk.internal.jimage=ALL-UNNAMED",
+ "--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
+ "--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
+ "--add-exports", "java.base/jdk.internal.access=ALL-UNNAMED",
+ // enable diagnostic logging
+ "-XX:+LogCompilation",
+ // use phase specific log, hs_err and ciReplay files
+ String.format("-XX:LogFile=hotspot_%s_%%p.log", phase),
+ String.format("-XX:ErrorFile=hs_err_%s_%%p.log", phase),
+ String.format("-XX:ReplayDataFile=replay_%s_%%p.log", phase),
+ // MethodHandle MUST NOT be compiled
+ "-XX:CompileCommand=exclude,java/lang/invoke/MethodHandle.*",
+ // CTW entry point
+ CompileTheWorld.class.getName(),
+ target));
+ } catch (IOException e) {
+ throw new Error("can't create " + file, e);
+ }
+ return new String[]{ "@" + file.toAbsolutePath() };
}
private String phaseName(long classStart) {
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequestManager/createStepRequest/crstepreq001.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -166,7 +166,10 @@
}
enabledStepRequests.forEach(s -> erManager.deleteEventRequest(s));
-
+ // There is a chance that a single step event had been posted after
+ // the step request was created and before it was deleted. In this
+ // case the debuggee VM is in the suspended state.
+ vm.resume();
return quitDebuggee(tot_res);
}
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/gp/GarbageUtils.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, 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
@@ -73,13 +73,15 @@
}
};
- // Force loading of OOM_TYPE and calling of enum contrusctors when loading GarbageUtils class.
+ // Force loading of OOM_TYPE and calling of enum constructors when loading GarbageUtils class.
public static final Object[] thisIsGarbageArray_theOnlyPurposeForCreatingItAndDeclaringItPublicIsToInitializeIntancesOfOOMEnumberation = new Object[] { OOM_TYPE.ANY, OOM_TYPE.HEAP, OOM_TYPE.METASPACE };
// Force early loading of classes that might otherwise unexpectedly fail
// class loading during testing due to high memory pressure.
public static final StringWriter preloadStringWriter = new StringWriter(1);
public static final PrintWriter preloadPrintWriter = new PrintWriter(preloadStringWriter);
+ public static final Throwable preloadThrowable = new Throwable("preload");
+ public static final StackTraceElement[] preloadStackTraceElement = preloadThrowable.getStackTrace();
private GarbageUtils() {
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/ProblemList-aot.txt Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2019, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests for testing AOT.
+#
+#############################################################################
+
+java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java 8222445 windows-x64
+java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java 8222445 windows-x64
+java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java 8222445 windows-x64
--- a/test/jdk/ProblemList-graal.txt Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/ProblemList-graal.txt Fri Jun 07 09:38:40 2019 -0700
@@ -29,9 +29,12 @@
java/lang/Class/getDeclaredField/ClassDeclaredFieldsTest.java 8185139 generic-all
java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java 8185139 generic-all
+java/lang/invoke/InvokeDynamicPrintArgs.java 8185139 generic-all
+java/lang/invoke/MethodHandleConstants.java 8185139 generic-all
java/lang/ProcessBuilder/Basic.java#id0 8185139 generic-all
java/lang/ProcessBuilder/Basic.java#id1 8185139 generic-all
java/lang/ProcessBuilder/SecurityManagerClinit.java 8185139 generic-all
+java/lang/ProcessHandle/PermissionTest.java 8185139 generic-all
java/lang/reflect/Proxy/nonPublicProxy/NonPublicProxyClass.java 8185139 generic-all
java/lang/StackWalker/CallerSensitiveMethod/Main.java 8185139 generic-all
java/lang/StackWalker/GetCallerClassTest.java 8185139 generic-all
@@ -48,12 +51,14 @@
java/lang/System/LoggerFinder/internal/LoggerFinderLoaderTest/LoggerFinderLoaderTest.java 8185139 generic-all
java/lang/System/LoggerFinder/internal/PlatformLoggerBridgeTest/PlatformLoggerBridgeTest.java 8185139 generic-all
java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java 8185139 generic-all
+java/lang/System/LoggerFinder/jdk/DefaultPlatformLoggerTest/DefaultPlatformLoggerTest.java 8185139 generic-all
java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java 8185139 generic-all
java/util/concurrent/atomic/AtomicUpdaters.java 8185139 generic-all
java/util/concurrent/Executors/PrivilegedCallables.java 8185139 generic-all
java/util/logging/FileHandlerPath.java 8185139 generic-all
java/util/logging/FileHandlerPatternExceptions.java 8185139 generic-all
java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java 8185139 generic-all
+java/util/logging/LogManagerAppContextDeadlock.java 8185139 generic-all
java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexResetUpdate.java 8185139 generic-all
java/util/logging/LogManager/Configuration/updateConfiguration/HandlersOnComplexUpdate.java 8185139 generic-all
java/util/logging/LogManager/Configuration/updateConfiguration/SimpleUpdateConfigurationTest.java 8185139 generic-all
@@ -68,6 +73,7 @@
java/util/concurrent/tck/JSR166TestCase.java 8187486 generic-all
java/lang/ref/OOMEInReferenceHandler.java 8196611 generic-all
+java/lang/ref/SoftReference/Pin.java 8196611 generic-all
java/lang/Runtime/exec/LotsOfOutput.java 8196611 generic-all
java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java 8196611 generic-all
vm/gc/InfiniteList.java 8196611 generic-all
@@ -95,8 +101,6 @@
com/sun/jdi/EarlyReturnTest.java 8195635 generic-all
com/sun/jdi/EarlyReturnTest.java 8195635 generic-all
-com/sun/jdi/RedefineCrossEvent.java 8218396 generic-all
-
# Next JFR tests fail with Graal. Assuming 8193210.
jdk/jfr/event/compiler/TestCodeSweeper.java 8193210 generic-all
jdk/jfr/event/compiler/TestCompilerInlining.java 8193210 generic-all
@@ -104,3 +108,6 @@
# Next tests should be re-enabled once libgraal is introduced
java/lang/ref/ReachabilityFenceTest.java 8207267 generic-all
+
+# Next test failed to create new adapter because CodeCache is full with Graal compiled methods.
+java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java 8207267 generic-all
--- a/test/jdk/ProblemList.txt Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/ProblemList.txt Fri Jun 07 09:38:40 2019 -0700
@@ -660,6 +660,7 @@
sun/security/pkcs11/Secmod/AddTrustedCert.java 8180837 generic-all
sun/security/pkcs11/tls/TestKeyMaterial.java 8180837 generic-all
sun/security/pkcs11/tls/tls12/FipsModeTLS12.java 8224954 windows-all
+sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java 8161536 generic-all
sun/security/tools/keytool/ListKeychainStore.sh 8156889 macosx-all
sun/security/tools/keytool/KeyToolTest.java 8224644 solaris-all
--- a/test/jdk/TEST.groups Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/TEST.groups Fri Jun 07 09:38:40 2019 -0700
@@ -137,6 +137,7 @@
java/util/AbstractList \
java/util/AbstractMap \
java/util/AbstractSequentialList \
+ java/util/ArrayDeque \
java/util/ArrayList \
java/util/Arrays \
java/util/BitSet \
--- a/test/jdk/java/io/Serializable/subclass/AbstractObjectOutputStream.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/io/Serializable/subclass/AbstractObjectOutputStream.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -44,7 +44,7 @@
*
* Since serialization must override java access rules in order to
* access private, protected and package accessible Serializable fields,
- * only trusted classes are allowed to subclass AbstractObjectInputStream.
+ * only trusted classes are allowed to subclass AbstractObjectOutputStream.
* Subclasses of AbstractObjectOututStream must have SerializablePermission
* "enableAbstractSubclass" or this constructor will throw a
* SecurityException.Implementations of this class should protect themselves
--- a/test/jdk/java/lang/ProcessBuilder/Basic.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/lang/ProcessBuilder/Basic.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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
@@ -27,7 +27,7 @@
* 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
* 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
* 4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464
- * 8067796
+ * 8067796 8224905
* @key intermittent
* @summary Basic tests for Process and Environment Variable code
* @modules java.base/java.lang:open
@@ -2187,8 +2187,10 @@
// Check that reader failed because stream was
// asynchronously closed.
// e.printStackTrace();
+ String msg = e.getMessage();
if (EnglishUnix.is() &&
- ! (e.getMessage().matches(".*Bad file.*")))
+ ! (msg.matches(".*Bad file.*") ||
+ msg.matches(".*Stream closed.*")))
unexpected(e);
}
catch (Throwable t) { unexpected(t); }}};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/String/Formatted.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * bug 8203444
+ * @summary Unit tests for instance versions of String#format
+ * @run main Formatted
+ */
+
+import java.util.Locale;
+
+public class Formatted {
+ public static void main(String[] args) {
+ test1();
+ }
+
+ /*
+ * Test String#formatted(Object... args) functionality.
+ */
+ static void test1() {
+ check("formatted(Object... args)",
+ "Test this %s".formatted("and that"),
+ String.format("Test this %s", "and that"));
+ }
+
+ static void check(String test, String output, String expected) {
+ if (output != expected && (output == null || !output.equals(expected))) {
+ System.err.println("Testing " + test + ": unexpected result");
+ System.err.println("Output: " + output);
+ System.err.println("Expected: " + expected);
+ throw new RuntimeException();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/String/StripIndent.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8223775
+ * @summary This exercises String#stripIndent patterns and limits.
+ * @run main StripIndent
+ */
+
+public class StripIndent {
+ public static void main(String... arg) {
+ test1();
+ }
+
+ /*
+ * Case combinations.
+ */
+ static void test1() {
+ verify("", "");
+ verify("abc", "abc");
+ verify(" abc", "abc");
+ verify("abc ", "abc");
+ verify(" abc\n def\n ", "abc\ndef\n");
+ verify(" abc\n def\n", " abc\n def\n");
+ verify(" abc\n def", "abc\ndef");
+ verify(" abc\n def\n ", "abc\n def\n");
+ }
+
+ static void verify(String a, String b) {
+ if (!a.stripIndent().equals(b)) {
+ System.err.format("\"%s\" not equal \"%s\"%n", a, b);
+ throw new RuntimeException();
+ }
+ }
+}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/String/TranslateEscapes.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8223780
+ * @summary This exercises String#translateEscapes patterns and limits.
+ * @run main TranslateEscapes
+ */
+
+public class TranslateEscapes {
+ public static void main(String... arg) {
+ test1();
+ test2();
+ test3();
+ }
+
+ /*
+ * Standard escapes.
+ */
+ static void test1() {
+ verifyEscape("b", '\b');
+ verifyEscape("f", '\f');
+ verifyEscape("n", '\n');
+ verifyEscape("r", '\r');
+ verifyEscape("t", '\t');
+ verifyEscape("'", '\'');
+ verifyEscape("\"", '\"');
+ verifyEscape("\\", '\\');
+ }
+
+ /*
+ * Octal escapes.
+ */
+ static void test2() {
+ verifyOctalEscape("0", 0);
+ verifyOctalEscape("3", 03);
+ verifyOctalEscape("7", 07);
+ verifyOctalEscape("07", 07);
+ verifyOctalEscape("17", 017);
+ verifyOctalEscape("27", 027);
+ verifyOctalEscape("37", 037);
+ verifyOctalEscape("377", 0377);
+
+ verifyOctalEscape("777", 077);
+ verifyOctalEscape("78", 07);
+ }
+
+ /*
+ * Exceptions.
+ */
+ static void test3() {
+ exceptionThrown("+");
+ exceptionThrown("\n");
+ }
+
+ static void verifyEscape(String string, char ch) {
+ String escapes = "\\" + string;
+ if (escapes.translateEscapes().charAt(0) != ch) {
+ System.err.format("\"%s\" not escape \"%s\"'%n", string, escapes);
+ throw new RuntimeException();
+ }
+ }
+
+ static void verifyOctalEscape(String string, int octal) {
+ String escapes = "\\" + string;
+ if (escapes.translateEscapes().charAt(0) != octal) {
+ System.err.format("\"%s\" not octal %o%n", string, octal);
+ throw new RuntimeException();
+ }
+ }
+
+ static void exceptionThrown(String string) {
+ String escapes = "\\" + string;
+ try {
+ escapes.translateEscapes();
+ System.err.format("escape not thrown for %s%n", string);
+ throw new RuntimeException();
+
+ } catch (IllegalArgumentException ex) {
+ // okay
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/instrument/RedefineInterfaceMethods/RedefineInterfaceMethods.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8225325
+ * @summary Add tests for redefining a class' private method during resolution of the bootstrap specifier
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @modules java.compiler
+ * java.instrument
+ * jdk.jartool/sun.tools.jar
+ * @compile ../NamedBuffer.java
+ * @compile redef/Xost.java
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineInterfaceMethods
+ */
+
+class Host {
+ static void log(String msg) { System.out.println(msg); }
+
+ static interface B {
+ int ORIGINAL_RETURN = 1;
+ int NEW_RETURN = 2;
+
+ private int privateMethod() {
+ Runnable race1 = () -> log("Hello from inside privateMethod");
+ race1.run();
+ return ORIGINAL_RETURN;
+ }
+
+ public default int defaultMethod(String p) {
+ log(p + "from interface B's defaultMethod");
+ return privateMethod();
+ }
+ }
+
+ static class Impl implements B {
+ }
+}
+
+public class RedefineInterfaceMethods {
+ private static byte[] bytesForHostClass(char replace) throws Throwable {
+ return NamedBuffer.bytesForHostClass(replace, "Host$B");
+ }
+
+ public static void main(String[] args) throws Throwable {
+ Host.Impl impl = new Host.Impl();
+
+ int res = impl.defaultMethod("Hello ");
+ if (res != Host.B.ORIGINAL_RETURN)
+ throw new Error("defaultMethod returned " + res +
+ " expected " + Host.B.ORIGINAL_RETURN);
+
+ byte[] buf = bytesForHostClass('X');
+ RedefineClassHelper.redefineClass(Host.B.class, buf);
+
+ res = impl.defaultMethod("Goodbye ");
+ if (res != Host.B.NEW_RETURN)
+ throw new Error("defaultMethod returned " + res +
+ " expected " + Host.B.NEW_RETURN);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/instrument/RedefineInterfaceMethods/redef/Xost.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+class Xost {
+ static void log(String msg) { System.out.println(msg); }
+
+ static interface B {
+ int ORIGINAL_RETURN = 1;
+ int NEW_RETURN = 2;
+
+ private int privateMethod() {
+ Runnable race1 = () -> log("Hello from inside privateMethod");
+ race1.run();
+ return NEW_RETURN;
+ }
+ public default int defaultMethod(String p) {
+ log(p + "from interface B's defaultMethod");
+ return privateMethod();
+ }
+ }
+
+ static class Impl implements B {
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/instrument/RedefineMathTesterMethods/RedefineMathTesterMethods.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8225325
+ * @summary Add tests for redefining a class' private method during resolution of the bootstrap specifier
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @modules java.compiler
+ * java.instrument
+ * jdk.jartool/sun.tools.jar
+ * @compile ../NamedBuffer.java
+ * @compile redef/Xost.java
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineMathTesterMethods
+ */
+
+interface MathOperation {
+ public int operation(int a, int b);
+}
+
+class Host {
+ static class B {
+ public static int operate(int a, int b, MathOperation mathOperation) {
+ return mathOperation.operation(a, b);
+ }
+
+ static int test_math() {
+ MathOperation addition = (int a, int b) -> a + b;
+ return operate(10, 5, addition);
+ }
+ }
+}
+
+public class RedefineMathTesterMethods {
+ private static byte[] bytesForHostClass(char replace) throws Throwable {
+ return NamedBuffer.bytesForHostClass(replace, "Host$B");
+ }
+
+ public static void main(String[] args) throws Throwable {
+ int res = Host.B.test_math();
+ System.out.println("Result = " + res);
+ if (res != 15) {
+ throw new Error("test_math returned " + res + " expected " + 15);
+ }
+
+ byte[] buf = bytesForHostClass('X');
+ RedefineClassHelper.redefineClass(Host.B.class, buf);
+
+ res = Host.B.test_math();
+ if (res != 5)
+ throw new Error("test_math returned " + res + " expected " + 5);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/instrument/RedefineMathTesterMethods/redef/Xost.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+interface MathOperation {
+ public int operation(int a, int b);
+}
+
+class Xost {
+ static class B {
+ public static int operate(int a, int b, MathOperation mathOperation) {
+ return mathOperation.operation(a, b);
+ }
+
+ static int test_math() {
+ MathOperation subtraction = (int a, int b) -> a - b;
+ return operate(10, 5, subtraction);
+ }
+ }
+}
--- a/test/jdk/java/lang/reflect/PublicMethods/PublicMethodsTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/lang/reflect/PublicMethods/PublicMethodsTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -222,6 +222,11 @@
StandardJavaFileManager standardJavaFileManager =
javac.getStandardFileManager(errorsCollector, Locale.ROOT,
Charset.forName("UTF-8"));
+ try {
+ standardJavaFileManager.setLocation(StandardLocation.CLASS_PATH, List.of());
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
TestFileManager testFileManager = new TestFileManager(
standardJavaFileManager, source);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/JarURLConnection/TestDefaultBehavior.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8225037
+ * @library /test/lib
+ * @summary Basic test for java.net.JarURLConnection default behavior
+ * @run testng/othervm TestDefaultBehavior
+ */
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.JarURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.jar.JarFile;
+import jdk.test.lib.util.JarUtils;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+public class TestDefaultBehavior {
+
+ // Disable caching and create three jar files:
+ // 1. jar without a manifest
+ // 2. jar with a manifest
+ // 3. jar with manifest that includes an entry attribute
+ @BeforeTest
+ public void setup() throws Exception {
+ URLConnection.setDefaultUseCaches("jar", false);
+ URLConnection.setDefaultUseCaches("file", false);
+
+ Path foo = Path.of("foo.txt");
+ Files.writeString(foo, "Hello there");
+
+ Files.createDirectory(Path.of("META-INF"));
+ Path manifest = Path.of("META-INF/MANIFEST.MF");
+ Files.writeString(manifest, "Manifest-Version: 5.5\n");
+
+ JarUtils.createJarFile(Path.of("test.jar"), Path.of("."), foo);
+ JarUtils.createJarFile(Path.of("testWithManifest.jar"), Path.of("."), manifest, foo);
+
+ Files.writeString(manifest, "Manifest-Version: 7.7\n\n" + // main-section
+ "Name: foo.txt\nGreeting: true\n"); // individual-section
+ JarUtils.createJarFile(Path.of("testWithManifestAndAttr.jar"), Path.of("."), manifest, foo);
+ }
+
+ @Test
+ public void noEntry() throws Exception {
+ URI fileURI = Path.of("test.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes(), null);
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), null);
+ assertEquals(jarURLConnection.getJarEntry(), null);
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes(), null);
+ assertEquals(jarURLConnection.getManifest(), null);
+ }
+
+ @Test
+ public void withEntry() throws Exception {
+ URI fileURI = Path.of("test.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/foo.txt").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes(), null);
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), "foo.txt");
+ assertEquals(jarURLConnection.getJarEntry().getName(), "foo.txt");
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes(), null);
+ assertEquals(jarURLConnection.getManifest(), null);
+ }
+
+ @Test
+ public void manifestNoEntry() throws Exception {
+ URI fileURI = Path.of("testWithManifest.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes(), null);
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), null);
+ assertEquals(jarURLConnection.getJarEntry(), null);
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes().getValue("Manifest-Version"), "5.5");
+ assertNotNull(jarURLConnection.getManifest());
+ }
+
+ @Test
+ public void manifestWithEntry() throws Exception {
+ URI fileURI = Path.of("testWithManifest.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/foo.txt").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes(), null);
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), "foo.txt");
+ assertEquals(jarURLConnection.getJarEntry().getName(), "foo.txt");
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes().getValue("Manifest-Version"), "5.5");
+ assertNotNull(jarURLConnection.getManifest());
+ }
+
+ @Test
+ public void manifestNoEntryAttr() throws Exception {
+ URI fileURI = Path.of("testWithManifestAndAttr.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes(), null);
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), null);
+ assertEquals(jarURLConnection.getJarEntry(), null);
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes().getValue("Manifest-Version"), "7.7");
+ assertNotNull(jarURLConnection.getManifest());
+ }
+
+ @Test
+ public void manifestWithEntryAttr() throws Exception {
+ URI fileURI = Path.of("testWithManifestAndAttr.jar").toUri();
+ URL jarFileURL = URI.create("jar:" + fileURI + "!/foo.txt").toURL();
+ JarURLConnection jarURLConnection = new CustomJarURLConnection(jarFileURL);
+
+ assertEquals(jarURLConnection.getAttributes().getValue("Greeting"), "true");
+ assertEquals(jarURLConnection.getCertificates(), null);
+ assertEquals(jarURLConnection.getEntryName(), "foo.txt");
+ assertEquals(jarURLConnection.getJarEntry().getName(), "foo.txt");
+ assertNotNull(jarURLConnection.getJarFile());
+ assertEquals(jarURLConnection.getJarFileURL(), fileURI.toURL());
+ assertEquals(jarURLConnection.getMainAttributes().getValue("Manifest-Version"), "7.7");
+ assertNotNull(jarURLConnection.getManifest());
+ }
+
+ // A minimal JarURLConnection
+ static class CustomJarURLConnection extends JarURLConnection {
+ private final URL jarFileURL;
+ private JarFile jarFile;
+
+ CustomJarURLConnection(URL url) throws MalformedURLException {
+ super(url);
+ jarFileURL = url;
+ }
+
+ @Override
+ public JarFile getJarFile() throws IOException {
+ if (jarFile == null)
+ connect();
+ return jarFile;
+ }
+
+ @Override
+ public void connect() throws IOException {
+ jarFile = ((JarURLConnection)jarFileURL.openConnection()).getJarFile();
+ }
+ }
+}
--- a/test/jdk/java/net/SocketOption/AfterClose.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/net/SocketOption/AfterClose.java Fri Jun 07 09:38:40 2019 -0700
@@ -26,6 +26,7 @@
* @bug 8224477
* @summary Ensures that IOException is thrown after the socket is closed
* @run testng AfterClose
+ * @run testng/othervm -Djdk.net.usePlainSocketImpl AfterClose
*/
import java.io.IOException;
--- a/test/jdk/java/net/SocketOption/NullsAndBadValues.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/net/SocketOption/NullsAndBadValues.java Fri Jun 07 09:38:40 2019 -0700
@@ -26,6 +26,7 @@
* @bug 8224477
* @summary Basic test for NPE, UOE, and IAE for get/setOption
* @run testng NullsAndBadValues
+ * @run testng/othervm -Djdk.net.usePlainSocketImpl NullsAndBadValues
* @run testng/othervm -Dsun.net.useExclusiveBind=false NullsAndBadValues
*/
--- a/test/jdk/java/net/SocketOption/OptionsTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/net/SocketOption/OptionsTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -23,10 +23,11 @@
/*
* @test
- * @bug 8036979 8072384 8044773
+ * @bug 8036979 8072384 8044773 8225214
* @library /test/lib
* @requires !vm.graal.enabled
* @run main/othervm -Xcheck:jni OptionsTest
+ * @run main/othervm -Djdk.net.usePlainSocketImpl OptionsTest
* @run main/othervm -Xcheck:jni -Djava.net.preferIPv4Stack=true OptionsTest
* @run main/othervm --limit-modules=java.base OptionsTest
*/
@@ -52,7 +53,7 @@
}
// The tests set the option using the new API, read back the set value
- // which could be diferent, and then use the legacy get API to check
+ // which could be different, and then use the legacy get API to check
// these values are the same
static Test<?>[] socketTests = new Test<?>[] {
@@ -61,6 +62,8 @@
Test.create(StandardSocketOptions.SO_RCVBUF, Integer.valueOf(8 * 100)),
Test.create(StandardSocketOptions.SO_REUSEADDR, Boolean.FALSE),
Test.create(StandardSocketOptions.SO_REUSEPORT, Boolean.FALSE),
+ Test.create(StandardSocketOptions.SO_LINGER, Integer.valueOf(-1)),
+ Test.create(StandardSocketOptions.SO_LINGER, Integer.valueOf(0)),
Test.create(StandardSocketOptions.SO_LINGER, Integer.valueOf(80)),
Test.create(StandardSocketOptions.IP_TOS, Integer.valueOf(0)), // lower-bound
Test.create(StandardSocketOptions.IP_TOS, Integer.valueOf(100)),
@@ -151,6 +154,23 @@
testEqual(option, value1, value2);
}
+ // Tests default and negative values of SO_LINGER. All negative values should
+ // retrieve as -1.
+ static void testSoLingerValues() throws Exception {
+ try (Socket s = new Socket()) {
+ // retrieve without set
+ int defaultValue = s.getOption(StandardSocketOptions.SO_LINGER);
+ testEqual(StandardSocketOptions.SO_LINGER, -1, defaultValue);
+
+ for (int v : List.of(-1, -2, -100, -65534, -65535, -65536, -100000)) {
+ System.out.println("Testing SO_LINGER with:" + v);
+ s.setOption(StandardSocketOptions.SO_LINGER, v);
+ int value = s.getOption(StandardSocketOptions.SO_LINGER);
+ testEqual(StandardSocketOptions.SO_LINGER, -1, value);
+ }
+ }
+ }
+
@SuppressWarnings("try")
static void doSocketTests() throws Exception {
// unconnected socket
@@ -177,6 +197,8 @@
}
}
}
+
+ testSoLingerValues();
}
static void doServerSocketTests() throws Exception {
@@ -234,7 +256,7 @@
} else if (option.equals(StandardSocketOptions.TCP_NODELAY)) {
return Boolean.valueOf(socket.getTcpNoDelay());
} else {
- throw new RuntimeException("unexecpted socket option");
+ throw new RuntimeException("unexpected socket option");
}
} else if (type.equals(ServerSocket.class)) {
ServerSocket socket = (ServerSocket)s;
@@ -250,7 +272,7 @@
} else if (option.equals(StandardSocketOptions.IP_TOS)) {
return getServerSocketTrafficClass(socket);
} else {
- throw new RuntimeException("unexecpted socket option");
+ throw new RuntimeException("unexpected socket option");
}
} else if (type.equals(DatagramSocket.class)) {
DatagramSocket socket = (DatagramSocket)s;
@@ -268,7 +290,7 @@
} else if (option.equals(StandardSocketOptions.IP_TOS)) {
return Integer.valueOf(socket.getTrafficClass());
} else {
- throw new RuntimeException("unexecpted socket option");
+ throw new RuntimeException("unexpected socket option");
}
} else if (type.equals(MulticastSocket.class)) {
@@ -293,10 +315,10 @@
} else if (option.equals(StandardSocketOptions.IP_MULTICAST_LOOP)) {
return Boolean.valueOf(socket.getLoopbackMode());
} else {
- throw new RuntimeException("unexecpted socket option");
+ throw new RuntimeException("unexpected socket option");
}
}
- throw new RuntimeException("unexecpted socket type");
+ throw new RuntimeException("unexpected socket type");
}
public static void main(String args[]) throws Exception {
--- a/test/jdk/java/nio/channels/DatagramChannel/BasicMulticastTests.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/nio/channels/DatagramChannel/BasicMulticastTests.java Fri Jun 07 09:38:40 2019 -0700
@@ -38,7 +38,6 @@
import java.io.IOException;
import jdk.test.lib.NetworkConfiguration;
-import jdk.test.lib.net.IPSupport;
public class BasicMulticastTests {
@@ -120,7 +119,10 @@
InetAddress loopback)
throws IOException
{
- System.out.println("Exception Tests");
+ System.out.format("Exception Tests using %s, %s @ %s\n",
+ group.getHostAddress(),
+ notGroup.getHostAddress(),
+ nif.getName());
DatagramChannel dc = DatagramChannel.open(family)
.setOption(StandardSocketOptions.SO_REUSEADDR, true)
@@ -200,28 +202,36 @@
* and invoke tests.
*/
public static void main(String[] args) throws IOException {
+ NetworkConfiguration.printSystemConfiguration(System.out);
+
NetworkConfiguration config = NetworkConfiguration.probe();
// test IPv4 if available
- if (IPSupport.hasIPv4()) {
+ {
+ var multicastInterfaces = config.ip4MulticastInterfaces().iterator();
InetAddress group = InetAddress.getByName("225.4.5.6");
InetAddress notGroup = InetAddress.getByName("1.2.3.4");
InetAddress loopback = InetAddress.getByName("127.0.0.1");
- NetworkInterface nif = config.ip4MulticastInterfaces().iterator().next();
- InetAddress anySource = config.ip4Addresses(nif).iterator().next();
- membershipKeyTests(StandardProtocolFamily.INET, group, nif, anySource);
- exceptionTests(StandardProtocolFamily.INET, group, notGroup, nif, loopback);
+ while (multicastInterfaces.hasNext()) {
+ NetworkInterface nif = multicastInterfaces.next();
+ InetAddress anySource = config.ip4Addresses(nif).iterator().next();
+ membershipKeyTests(StandardProtocolFamily.INET, group, nif, anySource);
+ exceptionTests(StandardProtocolFamily.INET, group, notGroup, nif, loopback);
+ }
}
// test IPv6 if available
- if (IPSupport.hasIPv6()) {
+ {
+ var multicastInterfaces = config.ip6MulticastInterfaces().iterator();
InetAddress group = InetAddress.getByName("ff02::a");
InetAddress notGroup = InetAddress.getByName("fe80::1234");
InetAddress loopback = InetAddress.getByName("::1");
- NetworkInterface nif = config.ip6MulticastInterfaces().iterator().next();
- InetAddress anySource = config.ip6Addresses(nif).iterator().next();
- membershipKeyTests(StandardProtocolFamily.INET6, group, nif, anySource);
- exceptionTests(StandardProtocolFamily.INET6, group, notGroup, nif, loopback);
+ while (multicastInterfaces.hasNext()) {
+ NetworkInterface nif = multicastInterfaces.next();
+ InetAddress anySource = config.ip6Addresses(nif).iterator().next();
+ membershipKeyTests(StandardProtocolFamily.INET6, group, nif, anySource);
+ exceptionTests(StandardProtocolFamily.INET6, group, notGroup, nif, loopback);
+ }
}
}
}
--- a/test/jdk/java/nio/file/FileStore/Basic.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/nio/file/FileStore/Basic.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, 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
@@ -115,7 +115,7 @@
/**
* Test: Enumerate all FileStores
*/
- if (FileUtils.areFileSystemsAccessible()) {
+ if (FileUtils.areAllMountPointsAccessible()) {
FileStore prev = null;
for (FileStore store: FileSystems.getDefault().getFileStores()) {
System.out.format("%s (name=%s type=%s)\n", store, store.name(),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/util/BitSet/HugeToString.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8225397
+ * @summary Integer value miscalculation in toString() method of BitSet
+ * @run main/othervm -Xms250m HugeToString
+ */
+
+import java.util.BitSet;
+
+public final class HugeToString {
+
+ public static void main(String[] args) {
+ BitSet bs = new BitSet(500_000_000);
+ bs.flip(0, 500_000_000);
+ try {
+ bs.toString();
+ } catch (OutOfMemoryError expected) {
+ } catch (Throwable t) {
+ throw new AssertionError("Unexpected exception", t);
+ }
+ }
+}
--- a/test/jdk/java/util/Properties/PropertiesTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/java/util/Properties/PropertiesTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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 @@
* @test
* @summary tests the load and store methods of Properties class
* @author Xueming Shen
- * @bug 4094886
+ * @bug 4094886 8224202
* @modules jdk.charsets
* @key randomness
*/
@@ -411,9 +411,23 @@
}
private static void UnicodeEscape() throws Exception {
+ checkMalformedUnicodeEscape("b=\\u012\n");
+ checkMalformedUnicodeEscape("b=\\u01\n");
+ checkMalformedUnicodeEscape("b=\\u0\n");
+ checkMalformedUnicodeEscape("b=\\u\n");
+ checkMalformedUnicodeEscape("a=\\u0123\nb=\\u012\n");
+ checkMalformedUnicodeEscape("a=\\u0123\nb=\\u01\n");
+ checkMalformedUnicodeEscape("a=\\u0123\nb=\\u0\n");
+ checkMalformedUnicodeEscape("a=\\u0123\nb=\\u\n");
+ checkMalformedUnicodeEscape("b=\\u012xyz\n");
+ checkMalformedUnicodeEscape("b=x\\u012yz\n");
+ checkMalformedUnicodeEscape("b=xyz\\u012\n");
+ }
+
+ private static void checkMalformedUnicodeEscape(String propString) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStreamWriter osw = new OutputStreamWriter(baos);
- osw.write("a=b\nb=\\u0\n");
+ osw.write(propString);
osw.close();
Properties props = new Properties();
boolean failed = true;
--- a/test/jdk/jdk/jfr/event/io/EvilInstrument.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/EvilInstrument.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -38,6 +38,7 @@
import java.net.Socket;
import java.security.ProtectionDomain;
import java.util.concurrent.CountDownLatch;
+import jdk.test.lib.Utils;
/**
@@ -87,7 +88,7 @@
}
public static File createScratchFile() throws IOException {
- return File.createTempFile("EvilTransformer", null, new File(".")).getAbsoluteFile();
+ return Utils.createTempFile("EvilTransformer", null).toFile();
}
class EvilTransformer implements ClassFileTransformer {
--- a/test/jdk/jdk/jfr/event/io/TestDisabledEvents.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestDisabledEvents.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -37,6 +37,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
/**
@@ -55,8 +56,7 @@
private static final byte[] writeBuf = { 'B', 'C', 'D' };
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestDisabledEvents", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestDisabledEvents", ".tmp").toFile();
Recording recording = new Recording();
recording.disable(IOEvent.EVENT_FILE_READ);
recording.disable(IOEvent.EVENT_FILE_WRITE);
--- a/test/jdk/jdk/jfr/event/io/TestFileChannelEvents.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestFileChannelEvents.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -37,6 +37,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
/**
@@ -48,8 +49,7 @@
*/
public class TestFileChannelEvents {
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestFileChannelEvents", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestFileChannelEvents", ".tmp").toFile();
Recording recording = new Recording();
List<IOEvent> expectedEvents = new ArrayList<>();
--- a/test/jdk/jdk/jfr/event/io/TestFileReadOnly.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestFileReadOnly.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -38,6 +38,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
/**
@@ -50,8 +51,7 @@
public class TestFileReadOnly {
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestFileReadOnly", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestFileReadOnly", ".tmp").toFile();
Recording recording = new Recording();
List<IOEvent> expectedEvents = new ArrayList<>();
--- a/test/jdk/jdk/jfr/event/io/TestFileStreamEvents.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestFileStreamEvents.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -36,6 +36,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
/**
@@ -48,8 +49,7 @@
public class TestFileStreamEvents {
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestFileStreamEvents", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestFileStreamEvents", ".tmp").toFile();
Recording recording = new Recording();
List<IOEvent> expectedEvents = new ArrayList<>();
--- a/test/jdk/jdk/jfr/event/io/TestRandomAccessFileEvents.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileEvents.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -35,6 +35,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
/**
@@ -47,8 +48,7 @@
public class TestRandomAccessFileEvents {
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestRandomAccessFileEvents", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestRandomAccessFileEvents", ".tmp").toFile();
Recording recording = new Recording();
List<IOEvent> expectedEvents = new ArrayList<>();
--- a/test/jdk/jdk/jfr/event/io/TestRandomAccessFileThread.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileThread.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -37,6 +37,7 @@
import jdk.jfr.Recording;
import jdk.jfr.consumer.RecordedEvent;
import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.Events;
import jdk.test.lib.thread.TestThread;
import jdk.test.lib.thread.XRun;
@@ -62,8 +63,7 @@
private static volatile int writeCount = 0; // Number of writes executed.
public static void main(String[] args) throws Throwable {
- File tmp = File.createTempFile("TestRandomAccessFileThread", ".tmp", new File("."));
- tmp.deleteOnExit();
+ File tmp = Utils.createTempFile("TestRandomAccessFileThread", ".tmp").toFile();
Recording recording = new Recording();
recording.enable(IOEvent.EVENT_FILE_READ).withThreshold(Duration.ofMillis(0));
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -31,6 +31,7 @@
import jdk.jfr.internal.Options;
import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
/**
* @test
@@ -62,7 +63,7 @@
// - where feasible, check if they are respected
//
- String dumpPath = Files.createTempDirectory("dump-path").toAbsolutePath().toString();
+ String dumpPath = Utils.createTempDirectory("dump-path-").toAbsolutePath().toString();
test(DUMPPATH, dumpPath);
test(STACK_DEPTH, 15);
--- a/test/jdk/jdk/jfr/jmx/JmxHelper.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/jmx/JmxHelper.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, 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
@@ -48,6 +48,7 @@
import jdk.management.jfr.RecordingInfo;
import jdk.management.jfr.SettingDescriptorInfo;
import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
import jdk.test.lib.jfr.CommonHelper;
import jdk.test.lib.jfr.Events;
@@ -127,7 +128,7 @@
}
static File dump(long streamId, FlightRecorderMXBean bean) throws IOException {
- File f = File.createTempFile("stream_" + streamId + "_", ".jfr", new File("."));
+ File f = Utils.createTempFile("stream_" + streamId + "_", ".jfr").toFile();
try (FileOutputStream fos = new FileOutputStream(f); BufferedOutputStream bos = new BufferedOutputStream(fos)) {
while (true) {
byte[] data = bean.readStream(streamId);
--- a/test/jdk/jdk/jfr/jvm/TestJavaEvent.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/jdk/jfr/jvm/TestJavaEvent.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, 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
@@ -39,6 +39,7 @@
import jdk.jfr.ValueDescriptor;
import jdk.jfr.consumer.RecordedEvent;
import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Utils;
/**
* @test TestGetThreadId
@@ -117,7 +118,7 @@
r.stop();
// prettyPrint();
- File file = File.createTempFile("test", ".jfr");
+ File file = Utils.createTempFile("test", ".jfr").toFile();
r.dump(file.toPath());
int eventCount = 0;
for (RecordedEvent e : RecordingFile.readAllEvents(file.toPath())) {
--- a/test/jdk/sun/security/krb5/auto/KDC.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/jdk/sun/security/krb5/auto/KDC.java Fri Jun 07 09:38:40 2019 -0700
@@ -165,6 +165,14 @@
private TreeMap<String,byte[]> s2kparamses = new TreeMap<>
(String.CASE_INSENSITIVE_ORDER);
+ // Alias for referrals.
+ private TreeMap<String,KDC> aliasReferrals = new TreeMap<>
+ (String.CASE_INSENSITIVE_ORDER);
+
+ // Alias for local resolution.
+ private TreeMap<String,PrincipalName> alias2Principals = new TreeMap<>
+ (String.CASE_INSENSITIVE_ORDER);
+
// Realm name
private String realm;
// KDC
@@ -553,6 +561,29 @@
return port;
}
+ /**
+ * Register an alias name to be referred to a different KDC for
+ * resolution, according to RFC 6806.
+ * @param alias Alias name (i.e. user@REALM.COM).
+ * @param referredKDC KDC to which the alias is referred for resolution.
+ */
+ public void registerAlias(String alias, KDC referredKDC) {
+ aliasReferrals.remove(alias);
+ aliasReferrals.put(alias, referredKDC);
+ }
+
+ /**
+ * Register an alias to be resolved to a Principal Name locally,
+ * according to RFC 6806.
+ * @param alias Alias name (i.e. user@REALM.COM).
+ * @param user Principal Name to which the alias is resolved.
+ */
+ public void registerAlias(String alias, String user)
+ throws RealmException {
+ alias2Principals.remove(alias);
+ alias2Principals.put(alias, new PrincipalName(user));
+ }
+
// Private helper methods
/**
@@ -778,6 +809,17 @@
PrincipalName cname = null;
boolean allowForwardable = true;
+ if (body.kdcOptions.get(KDCOptions.CANONICALIZE)) {
+ KDC referral = aliasReferrals.get(body.sname.getNameString());
+ if (referral != null) {
+ service = new PrincipalName(
+ PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR +
+ referral.getRealm(), PrincipalName.KRB_NT_SRV_INST,
+ this.getRealm());
+ }
+ }
+
if (pas == null || pas.length == 0) {
throw new KrbException(Krb5.KDC_ERR_PADATA_TYPE_NOSUPP);
} else {
@@ -964,7 +1006,8 @@
from,
till, renewTill,
service,
- body.addresses
+ body.addresses,
+ null
);
EncryptedData edata = new EncryptedData(ckey, enc_part.asn1Encode(),
KeyUsage.KU_ENC_TGS_REP_PART_SESSKEY);
@@ -1008,6 +1051,7 @@
*/
protected byte[] processAsReq(byte[] in) throws Exception {
ASReq asReq = new ASReq(in);
+ byte[] asReqbytes = asReq.asn1Encode();
int[] eTypes = null;
List<PAData> outPAs = new ArrayList<>();
@@ -1030,6 +1074,24 @@
}
int eType = eTypes[0];
+ if (body.kdcOptions.get(KDCOptions.CANONICALIZE) &&
+ body.cname.getNameType() == PrincipalName.KRB_NT_ENTERPRISE) {
+ PrincipalName principal = alias2Principals.get(
+ body.cname.getNameString());
+ if (principal != null) {
+ body.cname = principal;
+ } else {
+ KDC referral = aliasReferrals.get(body.cname.getNameString());
+ if (referral != null) {
+ body.cname = new PrincipalName(
+ PrincipalName.TGS_DEFAULT_SRV_NAME,
+ PrincipalName.KRB_NT_SRV_INST,
+ referral.getRealm());
+ throw new KrbException(Krb5.KRB_ERR_WRONG_REALM);
+ }
+ }
+ }
+
EncryptionKey ckey = keyForUser(body.cname, eType, false);
EncryptionKey skey = keyForUser(service, eType, true);
@@ -1211,17 +1273,18 @@
}
PAData[] inPAs = KDCReqDotPAData(asReq);
+ List<PAData> enc_outPAs = new ArrayList<>();
if (inPAs == null || inPAs.length == 0) {
Object preauth = options.get(Option.PREAUTH_REQUIRED);
if (preauth == null || preauth.equals(Boolean.TRUE)) {
throw new KrbException(Krb5.KDC_ERR_PREAUTH_REQUIRED);
}
} else {
+ EncryptionKey pakey = null;
try {
EncryptedData data = newEncryptedData(
new DerValue(inPAs[0].getValue()));
- EncryptionKey pakey
- = keyForUser(body.cname, data.getEType(), false);
+ pakey = keyForUser(body.cname, data.getEType(), false);
data.decrypt(pakey, KeyUsage.KU_PA_ENC_TS);
} catch (Exception e) {
KrbException ke = new KrbException(Krb5.KDC_ERR_PREAUTH_FAILED);
@@ -1229,6 +1292,17 @@
throw ke;
}
bFlags[Krb5.TKT_OPTS_PRE_AUTHENT] = true;
+ for (PAData pa : inPAs) {
+ if (pa.getType() == Krb5.PA_REQ_ENC_PA_REP) {
+ Checksum ckSum = new Checksum(
+ Checksum.CKSUMTYPE_HMAC_SHA1_96_AES128,
+ asReqbytes, ckey, KeyUsage.KU_AS_REQ);
+ enc_outPAs.add(new PAData(Krb5.PA_REQ_ENC_PA_REP,
+ ckSum.asn1Encode()));
+ bFlags[Krb5.TKT_OPTS_ENC_PA_REP] = true;
+ break;
+ }
+ }
}
TicketFlags tFlags = new TicketFlags(bFlags);
@@ -1259,7 +1333,8 @@
from,
till, rtime,
service,
- body.addresses
+ body.addresses,
+ enc_outPAs.toArray(new PAData[enc_outPAs.size()])
);
EncryptedData edata = new EncryptedData(ckey, enc_part.asn1Encode(),
KeyUsage.KU_ENC_AS_REP_PART);
@@ -1307,8 +1382,10 @@
if (kerr == null) {
if (ke.returnCode() == Krb5.KDC_ERR_PREAUTH_REQUIRED ||
ke.returnCode() == Krb5.KDC_ERR_PREAUTH_FAILED) {
+ outPAs.add(new PAData(Krb5.PA_ENC_TIMESTAMP, new byte[0]));
+ }
+ if (outPAs.size() > 0) {
DerOutputStream bytes = new DerOutputStream();
- bytes.write(new PAData(Krb5.PA_ENC_TIMESTAMP, new byte[0]).asn1Encode());
for (PAData p: outPAs) {
bytes.write(p.asn1Encode());
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/security/krb5/auto/ReferralsTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8215032
+ * @library /test/lib
+ * @run main/othervm/timeout=120 -Dsun.security.krb5.debug=true ReferralsTest
+ * @summary Test Kerberos cross-realm referrals (RFC 6806)
+ */
+
+import java.io.File;
+import sun.security.krb5.Credentials;
+import sun.security.krb5.internal.CredentialsUtil;
+import sun.security.krb5.KrbAsReqBuilder;
+import sun.security.krb5.PrincipalName;
+
+public class ReferralsTest {
+ private static final boolean DEBUG = true;
+ private static final String krbConfigName = "krb5-localkdc.conf";
+ private static final String realmKDC1 = "RABBIT.HOLE";
+ private static final String realmKDC2 = "DEV.RABBIT.HOLE";
+ private static final char[] password = "123qwe@Z".toCharArray();
+ private static final String clientName = "test";
+
+ private static final String clientAlias = clientName +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC1;
+
+ private static final String clientKDC1QueryName = clientAlias.replaceAll(
+ PrincipalName.NAME_REALM_SEPARATOR_STR, "\\\\" +
+ PrincipalName.NAME_REALM_SEPARATOR_STR) +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC1;
+ private static PrincipalName clientKDC1QueryPrincipal = null;
+ static {
+ try {
+ clientKDC1QueryPrincipal = new PrincipalName(
+ clientKDC1QueryName, PrincipalName.KRB_NT_ENTERPRISE,
+ null);
+ } catch (Throwable t) {}
+ }
+
+ private static final String clientKDC2Name = clientName +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC2;
+
+ private static final String serviceName = "http" +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR +
+ "server.dev.rabbit.hole";
+
+ private static Credentials tgt;
+ private static Credentials tgs;
+
+ public static void main(String[] args) throws Exception {
+ try {
+ initializeKDCs();
+ getTGT();
+ getTGS();
+ } finally {
+ cleanup();
+ }
+ }
+
+ private static void initializeKDCs() throws Exception {
+ KDC kdc1 = KDC.create(realmKDC1, "localhost", 0, true);
+ kdc1.addPrincipalRandKey(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC1);
+ kdc1.addPrincipal(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC1 +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC2,
+ password);
+ kdc1.addPrincipal(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC2,
+ password);
+
+ KDC kdc2 = KDC.create(realmKDC2, "localhost", 0, true);
+ kdc2.addPrincipalRandKey(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC2);
+ kdc2.addPrincipal(clientKDC2Name, password);
+ kdc2.addPrincipal(serviceName, password);
+ kdc2.addPrincipal(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC1,
+ password);
+ kdc2.addPrincipal(PrincipalName.TGS_DEFAULT_SRV_NAME +
+ PrincipalName.NAME_COMPONENT_SEPARATOR_STR + realmKDC2 +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC1,
+ password);
+
+ kdc1.registerAlias(clientAlias, kdc2);
+ kdc1.registerAlias(serviceName, kdc2);
+ kdc2.registerAlias(clientAlias, clientKDC2Name);
+
+ KDC.saveConfig(krbConfigName, kdc1, kdc2,
+ "forwardable=true");
+ System.setProperty("java.security.krb5.conf", krbConfigName);
+ }
+
+ private static void cleanup() {
+ File f = new File(krbConfigName);
+ if (f.exists()) {
+ f.delete();
+ }
+ }
+
+ private static void getTGT() throws Exception {
+ KrbAsReqBuilder builder = new KrbAsReqBuilder(clientKDC1QueryPrincipal,
+ password);
+ tgt = builder.action().getCreds();
+ builder.destroy();
+ if (DEBUG) {
+ System.out.println("TGT");
+ System.out.println("----------------------");
+ System.out.println(tgt);
+ System.out.println("----------------------");
+ }
+ if (tgt == null) {
+ throw new Exception("TGT is null");
+ }
+ if (!tgt.getClient().getName().equals(clientKDC2Name)) {
+ throw new Exception("Unexpected TGT client");
+ }
+ String[] tgtServerNames = tgt.getServer().getNameStrings();
+ if (tgtServerNames.length != 2 || !tgtServerNames[0].equals(
+ PrincipalName.TGS_DEFAULT_SRV_NAME) ||
+ !tgtServerNames[1].equals(realmKDC2) ||
+ !tgt.getServer().getRealmString().equals(realmKDC2)) {
+ throw new Exception("Unexpected TGT server");
+ }
+ }
+
+ private static void getTGS() throws Exception {
+ tgs = CredentialsUtil.acquireServiceCreds(serviceName +
+ PrincipalName.NAME_REALM_SEPARATOR_STR + realmKDC1, tgt);
+ if (DEBUG) {
+ System.out.println("TGS");
+ System.out.println("----------------------");
+ System.out.println(tgs);
+ System.out.println("----------------------");
+ }
+ if (tgs == null) {
+ throw new Exception("TGS is null");
+ }
+ if (!tgs.getClient().getName().equals(clientKDC2Name)) {
+ throw new Exception("Unexpected TGS client");
+ }
+ if (!tgs.getServer().getNameString().equals(serviceName) ||
+ !tgs.getServer().getRealmString().equals(realmKDC2)) {
+ throw new Exception("Unexpected TGS server");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/modules/basic/LauncherErrors.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8221368
+ * @library /test/lib
+ * @modules jdk.compiler
+ * @build LauncherErrors jdk.test.lib.compiler.CompilerUtils
+ * @run testng LauncherErrors
+ * @summary Test launcher error message when fails to launch main class
+ */
+
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import jdk.test.lib.compiler.CompilerUtils;
+import jdk.test.lib.process.ProcessTools;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class LauncherErrors {
+ // test source location
+ private static final String TEST_SRC = System.getProperty("test.src");
+ private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
+
+ // module path
+ private static final Path MODS_DIR = Paths.get("mods");
+
+ // the module name of the test module
+ private static final String TEST_MODULE = "test2";
+ // the main class of the test module
+ private static final String MAIN_CLASS = "jdk.test2.Main";
+
+ @BeforeTest
+ public void compileTestModule() throws Exception {
+
+ // javac -d mods/$TESTMODULE src/$TESTMODULE/**
+ boolean compiled =
+ CompilerUtils.compile(SRC_DIR.resolve(TEST_MODULE),
+ MODS_DIR.resolve(TEST_MODULE),
+ "--add-exports", "java.base/com.sun.crypto.provider=" + TEST_MODULE);
+
+ assertTrue(compiled, "test module did not compile");
+ }
+
+ /*
+ * Run jdk.test2.Main without security manager.
+ */
+ @Test
+ public void test() throws Exception {
+ String dir = MODS_DIR.toString();
+ String mid = TEST_MODULE + "/" + MAIN_CLASS;
+
+ ProcessTools.executeTestJava("--module-path", dir, "--module", mid)
+ .outputTo(System.out)
+ .errorTo(System.out)
+ .shouldHaveExitValue(0);
+ }
+
+ /*
+ * Run jdk.test2.Main with security manager such that main class will
+ * fail to initialize.
+ */
+ @Test
+ public void testErrorMessage() throws Exception {
+ String dir = MODS_DIR.toString();
+ String mid = TEST_MODULE + "/" + MAIN_CLASS;
+
+ ProcessTools.executeTestJava("-Djava.security.manager", "--module-path", dir, "--module", mid)
+ .outputTo(System.out)
+ .errorTo(System.out)
+ .shouldContain("Error: Unable to initialize main class " + MAIN_CLASS + " in module " + TEST_MODULE)
+ .shouldContain("Caused by: java.security.AccessControlException: access denied")
+ .shouldNotHaveExitValue(0);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/modules/basic/src/test2/jdk/test2/Main.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.test2;
+
+public class Main {
+ public static void main(String... args) {
+ try {
+ System.out.println("Hello world");
+ } catch (Exception e) {
+ // verifier loads SunJCE class
+ java.security.Provider p = new com.sun.crypto.provider.SunJCE();
+ System.out.println(p.toString());
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/launcher/modules/basic/src/test2/module-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+module test2 {
+}
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java Fri Jun 07 09:38:40 2019 -0700
@@ -65,8 +65,9 @@
+ "<a id=\"DEFAULT_NAME\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>static final java."
- + "lang.String DEFAULT_NAME</pre>");
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">java.lang.String</span> "
+ + "<span class=\"memberName\">DEFAULT_NAME</span></div>\n");
checkOutput("pkg/AnnotationType.html", true,
"<li>Summary: </li>\n"
@@ -84,13 +85,14 @@
"<!-- -->",
"</a>",
"<ul class=\"blockList\">",
- "<li class=\"blockListLast\">",
+ "<li class=\"blockList\">",
"<section class=\"detail\">",
"<h3>value</h3>",
"<a id=\"value()\">",
"<!-- -->",
"</a>",
- "<pre>int value</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">int</span>"
+ + " <span class=\"memberName\">value</span></div>");
checkOutput("pkg/AnnotationType.html", false,
"<HR>\n\n"
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java Fri Jun 07 09:38:40 2019 -0700
@@ -82,14 +82,16 @@
"<pre>@Deprecated\n"
+ "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>\n"
+ "extends java.lang.Object</pre>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "public int field</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"returnType\">int</span>"
+ + " <span class=\"memberName\">field</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "public DeprecatedClassByAnnotation()</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"memberName\">DeprecatedClassByAnnotation</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
- "<pre class=\"methodSignature\">@Deprecated\n"
- + "public void method()</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"returnType\">"
+ + "void</span> <span class=\"memberName\">method</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>");
checkOutput("pkg/TestAnnotationType.html", true,
@@ -100,18 +102,19 @@
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test1 passes.</div>\n"
+ "</div>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "static final int field</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" +
+ "</span><span class=\"modifiers\">static final</span> <span class=\"returnType\">int</span> <span class=\"memberName\">field</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This "
+ "API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test4 passes.</div>\n"
+ "</div>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "int required</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ + "</span><span class=\"returnType\">int</span> <span class=\"memberName\">required</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test3 passes.</div>\n"
+ "</div>",
- "<pre>java.lang.String optional</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>"
+ + " <span class=\"memberName\">optional</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ "<div class=\"deprecationComment\">annotation_test2 passes.</div>\n"
+ "</div>");
@@ -124,8 +127,8 @@
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">class_test1 passes.</div>\n"
+ "</div>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "public TestClass()</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"memberName\">TestClass</span>()</div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
+ "</div>",
@@ -164,8 +167,9 @@
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">enum_test1 passes.</div>\n"
+ "</div>",
- "<pre>@Deprecated(forRemoval=true)\n"
- + "public static final <a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a> FOR_REMOVAL</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+ + "</span><span class=\"modifiers\">public static final</span> <span class=\"returnType\">"
+ + "<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a></span> <span class=\"memberName\">FOR_REMOVAL</span></div>\n"
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+ "<div class=\"deprecationComment\">enum_test3 passes.</div>\n"
+ "</div>");
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Fri Jun 07 09:38:40 2019 -0700
@@ -373,21 +373,22 @@
// Test with -nocomment and -nodeprecated options. The ClassDocs whould
// not display definition lists for any member details.
checkOutput("pkg1/C1.html", expectFound,
- "<pre class=\"methodSignature\">public void readObject()\n" +
- " throws java.io.IOException</pre>\n" +
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> " +
+ "<span class=\"returnType\">void</span> <span class=\"memberName\">readObject</span>()\n" +
+ " throws <span class=\"exceptions\">java.io.IOException</span></div>\n" +
"</section>\n" +
"</li>");
checkOutput("pkg1/C2.html", expectFound,
- "<pre>public C2()</pre>\n" +
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>" +
+ " <span class=\"memberName\">C2</span>()</div>\n" +
"</section>\n" +
"</li>");
checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,
- "<pre>public " +
- "static final <a href=\"C1.ModalExclusionType.html\" " +
- "title=\"enum in pkg1\">C1.ModalExclusionType</a> " +
- "APPLICATION_EXCLUDE</pre>\n" +
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span> " +
+ "<span class=\"returnType\"><a href=\"C1.ModalExclusionType.html\" title=\"enum in pkg1\">" +
+ "C1.ModalExclusionType</a></span> <span class=\"memberName\">APPLICATION_EXCLUDE</span></div>\n" +
"</section>\n" +
"</li>");
--- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java Fri Jun 07 09:38:40 2019 -0700
@@ -48,11 +48,12 @@
checkExit(Exit.OK);
checkOutput("p/Indent.html", true,
- "<pre class=\"methodSignature\">public <T> void m​(T t1,",
- "\n"
- + " T t2)",
- "\n"
- + " throws java.lang.Exception");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"typeParameters\"><T></span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">m</span>"
+ + "​(<span class=\"arguments\">T t1,\n"
+ + "T t2)</span>\n"
+ + " throws <span class=\"exceptions\">java.lang.Exception</span></div>");
// Test indentation of annotations and annotated method arguments
checkOutput("p/IndentAnnot.html", false,
--- a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java Fri Jun 07 09:38:40 2019 -0700
@@ -47,7 +47,7 @@
public static void main(String... args) throws Exception {
TestIndexTaglet tester = new TestIndexTaglet();
- tester.runTests(m -> new Object[]{Paths.get(m.getName())});
+ tester.runTests(m -> new Object[] { Paths.get(m.getName()) });
}
TestIndexTaglet() {
@@ -104,4 +104,27 @@
checkOutput(Output.OUT, true,
"warning: {@index} tag, which expands to <a>, within <a>");
}
+
+ @Test
+ public void testDuplicateReferences(Path base) throws Exception {
+ Path srcDir = base.resolve("src");
+ Path outDir = base.resolve("out");
+
+ new ClassBuilder(tb, "pkg.A")
+ .setModifiers("public", "class")
+ .setComments("This is a class. Here is {@index foo first}.")
+ .addMembers(MethodBuilder.parse("public void m() {}")
+ .setComments("This is a method. Here is {@index foo second}."))
+ .write(srcDir);
+
+ javadoc("-d", outDir.toString(),
+ "-sourcepath", srcDir.toString(),
+ "pkg");
+
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/A.html", true,
+ "This is a class. Here is <a id=\"foo\" class=\"searchTagResult\">foo</a>.",
+ "This is a method. Here is <a id=\"foo-1\" class=\"searchTagResult\">foo</a>.");
+ }
}
--- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java Fri Jun 07 09:38:40 2019 -0700
@@ -67,8 +67,10 @@
checkExit(Exit.OK);
checkOutput("pkg/Interface.html", true,
- "<pre class=\"methodSignature\">int method()</pre>",
- "<pre>static final int field</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">int</span> "
+ + "<span class=\"memberName\">method</span>()</div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">field</span></div>",
// Make sure known implementing class list is correct and omits type parameters.
"<dl>\n"
+ "<dt>All Known Implementing Classes:</dt>\n"
@@ -126,7 +128,8 @@
+ "<a id=\"f\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public static int f</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">f</span></div>\n"
+ "<div class=\"block\">A hider field</div>",
"<td class=\"colFirst\"><code>static void</code></td>\n"
@@ -140,7 +143,8 @@
+ "<a id=\"staticMethod()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public static void staticMethod()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">staticMethod</span>()</div>\n"
+ "<div class=\"block\"><span class=\"descfrmTypeLabel\">"
+ "Description copied from interface: <code>"
+ "<a href=\"InterfaceWithStaticMembers.html#staticMethod()\">"
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java Fri Jun 07 09:38:40 2019 -0700
@@ -57,11 +57,14 @@
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
+ "<dd><a href=\"#getRate()\"><code>getRate()</code></a>, \n"
+ "<a href=\"#setRate(double)\"><code>setRate(double)</code></a></dd>",
- "<pre class=\"methodSignature\">public final void setRate​(double value)</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">setRate</span>​"
+ + "(<span class=\"arguments\">double value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
- "<pre class=\"methodSignature\">public final double getRate()</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">double</span> <span class=\"memberName\">getRate</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>",
@@ -90,20 +93,24 @@
+ "<a id=\"pausedProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public final <a href=\"C.BooleanProperty.html\" "
- + "title=\"class in pkg1\">C.BooleanProperty</a> pausedProperty</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
+ + "C.BooleanProperty</a></span> <span class=\"memberName\">pausedProperty</span></div>\n"
+ "<div class=\"block\">Defines if paused. The second line.</div>",
"<h3>isPaused</h3>\n"
+ "<a id=\"isPaused()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public final double isPaused()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">double</span> <span class=\"memberName\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>",
"<h3>setPaused</h3>\n"
+ "<a id=\"setPaused(boolean)\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public final void setPaused​(boolean value)</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">setPaused</span>​"
+ + "(<span class=\"arguments\">boolean value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property paused.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@@ -114,7 +121,8 @@
+ "<a id=\"isPaused()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public final double isPaused()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">double</span> <span class=\"memberName\">isPaused</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property paused.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@@ -125,8 +133,9 @@
+ "<a id=\"rateProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public final <a href=\"C.DoubleProperty.html\" "
- + "title=\"class in pkg1\">C.DoubleProperty</a> rateProperty</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
+ + "C.DoubleProperty</a></span> <span class=\"memberName\">rateProperty</span></div>\n"
+ "<div class=\"block\">Defines the direction/speed at which the "
+ "<code>Timeline</code> is expected to\n"
+ " be played. This is the second line.</div>",
@@ -134,7 +143,9 @@
+ "<a id=\"setRate(double)\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public final void setRate​(double value)</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">setRate</span>​"
+ + "(<span class=\"arguments\">double value)</span></div>\n"
+ "<div class=\"block\">Sets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@@ -148,7 +159,8 @@
+ "<a id=\"getRate()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public final double getRate()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">double</span> <span class=\"memberName\">getRate</span>()</div>\n"
+ "<div class=\"block\">Gets the value of the property rate.</div>\n"
+ "<dl>\n"
+ "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>\n"
@@ -224,7 +236,9 @@
+ "<a id=\"betaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public java.lang.Object betaProperty</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">java.lang.Object</span>"
+ + " <span class=\"memberName\">betaProperty</span></div>\n"
+ "</section>\n"
+ "</li>\n"
+ "<li class=\"blockList\">\n"
@@ -233,17 +247,20 @@
+ "<a id=\"gammaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public final java.util.List<java.lang.String> gammaProperty</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">java.util.List<java.lang.String></span>"
+ + " <span class=\"memberName\">gammaProperty</span></div>\n"
+ "</section>\n"
+ "</li>\n"
- + "<li class=\"blockListLast\">\n"
+ + "<li class=\"blockList\">\n"
+ "<section class=\"detail\">\n"
+ "<h3>delta</h3>\n"
+ "<a id=\"deltaProperty\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>public final java.util.List<"
- + "java.util.Set<? super java.lang.Object>> deltaProperty</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">java.util.List<java.util.Set<? super java.lang.Object>>"
+ + "</span> <span class=\"memberName\">deltaProperty</span></div>\n"
+ "</section>\n"
+ "</li>\n"
+ "</ul>\n"
--- a/test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java Fri Jun 07 09:38:40 2019 -0700
@@ -57,7 +57,8 @@
checkOutput("pkg/A.html", true,
"<td class=\"colFirst\"><code>default void</code></td>",
- "<pre class=\"methodSignature\">default void defaultMethod()</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">default</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">defaultMethod</span>()</div>\n",
"<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
+ " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
+ " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java Fri Jun 07 09:38:40 2019 -0700
@@ -74,13 +74,13 @@
checkOutput("pkg/C.html", true,
"<a href=\"" + url + "java/lang/String.html?is-external=true\" "
+ "title=\"class or interface in java.lang\" class=\"externalLink\"><code>Link to String Class</code></a>",
- //Make sure the parameters are indented properly when the -link option is used.
+ //Make sure the parameters are formatted properly when the -link option is used.
"(int p1,\n"
- + " int p2,\n"
- + " int p3)",
+ + "int p2,\n"
+ + "int p3)",
"(int p1,\n"
- + " int p2,\n"
- + " <a href=\"" + url + "java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\" class=\"externalLink\">"
+ + "int p2,\n"
+ + "<a href=\"" + url + "java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\" class=\"externalLink\">"
+ "Object</a> p3)");
checkOutput("pkg/B.html", true,
--- a/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java Fri Jun 07 09:38:40 2019 -0700
@@ -49,19 +49,19 @@
checkExit(Exit.OK);
checkOutput("pkg/Test.html", true,
- "no_pre()</pre>\n"
+ "no_pre</span>()</div>\n"
+ "<div class=\"block\">abc<code>def</code>ghi</div>",
- "no_pre_extra_whitespace()</pre>\n"
+ "no_pre_extra_whitespace</span>()</div>\n"
+ "<div class=\"block\">abc<code> def </code>ghi</div>",
- "in_pre()</pre>\n"
+ "in_pre</span>()</div>\n"
+ "<div class=\"block\"><pre> abc<code> def </code>ghi</pre></div>",
- "pre_after_text()</pre>\n"
+ "pre_after_text</span>()</div>\n"
+ "<div class=\"block\">xyz <pre> abc<code> def </code>ghi</pre></div>",
- "after_pre()</pre>\n"
+ "after_pre</span>()</div>\n"
+ "<div class=\"block\">xyz <pre> pqr </pre> abc<code> def </code>ghi</div>",
- "back_in_pre()</pre>\n"
+ "back_in_pre</span>()</div>\n"
+ "<div class=\"block\">xyz <pre> pqr </pre> mno <pre> abc<code> def </code>ghi</pre></div>",
- "typical_usage_code()</pre>\n"
+ "typical_usage_code</span>()</div>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre><code>\n"
+ " line 0 @Override\n"
@@ -70,7 +70,7 @@
+ " line 3 }\n"
+ " </code></pre>\n"
+ " and so it goes.</div>",
- "typical_usage_literal()</pre>\n"
+ "typical_usage_literal</span>()</div>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre>\n"
+ " line 0 @Override\n"
@@ -79,7 +79,7 @@
+ " line 3 }\n"
+ " </pre>\n"
+ " and so it goes.</div>",
- "recommended_usage_literal()</pre>\n"
+ "recommended_usage_literal</span>()</div>\n"
+ "<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+ " Example: <pre>\n"
+ " line 0 @Override\n"
@@ -91,7 +91,8 @@
+ " <PRE>\n"
+ " <b>id </b>\n"
+ " </PRE></div>",
- "<pre class=\"methodSignature\">public void htmlAttrInPre1()</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">htmlAttrInPre1</span>()</div>\n"
+ "<div class=\"block\">More html tag outliers.\n"
+ " <pre>\n"
+ " @Override\n"
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java Fri Jun 07 09:38:40 2019 -0700
@@ -96,7 +96,7 @@
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"#between(java.time.LocalDate,java.time.LocalDate)\">"
+ "between</a></span>​(java.time.LocalDate startDateInclusive,\n"
- + " java.time.LocalDate endDateExclusive)</code></th>");
+ + "java.time.LocalDate endDateExclusive)</code></th>");
checkOutput("pkg1/Implementer.html", false,
"<h3>Methods inherited from interface pkg1.<a href=\"Interface.html\""
--- a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java Fri Jun 07 09:38:40 2019 -0700
@@ -57,8 +57,9 @@
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#returnTypeTest()\">"
+ "returnTypeTest</a></span>()</code>",
// Check return type in member detail.
- "<pre class=\"methodSignature\">public <a href=\"PublicChild.html\" title=\"class in pkg\">"
- + "PublicChild</a> returnTypeTest()</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\"><a href=\"PublicChild.html\" title=\"class in pkg\">"
+ + "PublicChild</a></span> <span class=\"memberName\">returnTypeTest</span>()</div>",
"<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+ "<a href=\"#%3Cinit%3E()\">PublicChild</a></span>()</code></th>");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8214126
+ * @summary Method signatures not formatted correctly in browser
+ * @library ../../lib/
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build javadoc.tester.*
+ * @run main TestMethodSignature
+ */
+
+import javadoc.tester.JavadocTester;
+
+public class TestMethodSignature extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestMethodSignature tester = new TestMethodSignature();
+ tester.runTests();
+ }
+
+ @Test
+ public void test() {
+ javadoc("-d", "out",
+ "-sourcepath", testSrc,
+ "pkg");
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/C.html", true,
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "@Generated(\"GeneratedConstructor\")\n"
+ + "</span><span class=\"modifiers\">public</span> "
+ + "<span class=\"memberName\">C</span>()</div>",
+
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
+ + " <span class=\"returnType\">void</span> <span class=\"memberName\">"
+ + "simpleMethod</span>​(<span class=\"arguments\">int i,\n"
+ + "java.lang.String s,\nboolean b)</span></div>",
+
+ "<div class=\"memberSignature\"><span class=\"annotations\">@Generated"
+ + "(value=\"SomeGeneratedName\",\n date=\"a date\",\n"
+ + " comments=\"some comment about the method below\")\n"
+ + "</span><span class=\"modifiers\">public static</span> <span "
+ + "class=\"returnType\">void</span> <span class=\"memberName\">annotatedMethod"
+ + "</span>​(<span class=\"arguments\">int i,\n"
+ + "java.lang.String s,\nboolean b)</span></div>",
+
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
+ + " <span class=\"typeParametersLong\"><T1 extends java.lang.AutoCloseable,​\n"
+ + "T2 extends java.lang.AutoCloseable,​\n"
+ + "T3 extends java.lang.AutoCloseable,​\n"
+ + "T4 extends java.lang.AutoCloseable,​\n"
+ + "T5 extends java.lang.AutoCloseable,​\n"
+ + "T6 extends java.lang.AutoCloseable,​\n"
+ + "T7 extends java.lang.AutoCloseable,​\n"
+ + "T8 extends java.lang.AutoCloseable></span>\n"
+ + "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
+ + "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3,"
+ + "​T4,​T5,​T6,​T7,​T8></span> "
+ + "<span class=\"memberName\">bigGenericMethod</span>​("
+ + "<span class=\"arguments\"><a href=\"C.F0.html\" "
+ + "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T2> t2,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T3> t3,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T4> t4,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T5> t5,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T6> t6,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T7> t7,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T8> t8)</span>\n"
+ + " "
+ + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
+ + "java.lang.IllegalStateException</span></div>",
+
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "@Generated(value=\"SomeGeneratedName\",\n"
+ + " date=\"a date\",\n"
+ + " comments=\"some comment about the method below\")\n"
+ + "</span><span class=\"modifiers\">public static</span> "
+ + "<span class=\"typeParametersLong\">"
+ + "<T1 extends java.lang.AutoCloseable,​\n"
+ + "T2 extends java.lang.AutoCloseable,​\n"
+ + "T3 extends java.lang.AutoCloseable,​\n"
+ + "T4 extends java.lang.AutoCloseable,​\n"
+ + "T5 extends java.lang.AutoCloseable,​\n"
+ + "T6 extends java.lang.AutoCloseable,​\n"
+ + "T7 extends java.lang.AutoCloseable,​\n"
+ + "T8 extends java.lang.AutoCloseable></span>\n"
+ + "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
+ + "title=\"class in pkg\">C.With8Types</a><T1,​T2,​T3,"
+ + "​T4,​T5,​T6,​T7,​T8></span> "
+ + "<span class=\"memberName\">bigGenericAnnotatedMethod</span>​("
+ + "<span class=\"arguments\"><a href=\"C.F0.html\" "
+ + "title=\"interface in pkg\">C.F0</a><? extends T1> t1,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T2> t2,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T3> t3,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T4> t4,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T5> t5,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T6> t6,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T7> t7,\n"
+ + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
+ + "C.F0</a><? extends T8> t8)</span>\n"
+ + " "
+ + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
+ + "java.lang.IllegalStateException</span></div>\n"
+ + "<div class=\"block\">Generic method with eight type args and annotation.</div>");
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/pkg/C.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg;
+
+import javax.annotation.processing.Generated;
+
+/**
+ * Test class for rendering of method signatures. This provides some pathologically
+ * complex method signatures that require special handling. Other features are
+ * covered by other tests.
+ */
+public class C {
+
+ /**
+ * Annotated constructor.
+ */
+ @Generated(value = "GeneratedConstructor")
+ public C() {}
+
+
+ public interface F0<T> {
+ T apply() throws Exception;
+ }
+
+ public static class With8Types<T1, T2, T3, T4, T5, T6, T7, T8> { }
+
+
+ /**
+ * Simple method.
+ *
+ * @param i param 1
+ * @param s param 2
+ * @param b param 3
+ */
+ public static void simpleMethod(int i, String s, boolean b) {}
+
+
+ /**
+ * Annotated method.
+ *
+ * @param i param 1
+ * @param s param 2
+ * @param b param 3
+ */
+ @Generated(
+ value = "SomeGeneratedName",
+ date = "a date",
+ comments = "some comment about the method below")
+ public static void annotatedMethod(int i, String s, boolean b) {}
+
+
+ /**
+ * Generic method with eight type args.
+ *
+ * @param <T1> type 1
+ * @param <T2> type 2
+ * @param <T3> type 3
+ * @param <T4> type 4
+ * @param <T5> type 5
+ * @param <T6> type 6
+ * @param <T7> type 7
+ * @param <T8> type 8
+ * @param t1 param 1
+ * @param t2 param 2
+ * @param t3 param 3
+ * @param t4 param 4
+ * @param t5 param 5
+ * @param t6 param 6
+ * @param t7 param 7
+ * @param t8 param 8
+ * @return null
+ */
+ public static
+ <T1 extends AutoCloseable,
+ T2 extends AutoCloseable,
+ T3 extends AutoCloseable,
+ T4 extends AutoCloseable,
+ T5 extends AutoCloseable,
+ T6 extends AutoCloseable,
+ T7 extends AutoCloseable,
+ T8 extends AutoCloseable>
+ With8Types<T1, T2, T3, T4, T5, T6, T7, T8> bigGenericMethod(
+ F0<? extends T1> t1,
+ F0<? extends T2> t2,
+ F0<? extends T3> t3,
+ F0<? extends T4> t4,
+ F0<? extends T5> t5,
+ F0<? extends T6> t6,
+ F0<? extends T7> t7,
+ F0<? extends T8> t8)
+ throws IllegalArgumentException, IllegalStateException { return null; }
+
+
+ /**
+ * Generic method with eight type args and annotation.
+ *
+ * @param <T1> type 1
+ * @param <T2> type 2
+ * @param <T3> type 3
+ * @param <T4> type 4
+ * @param <T5> type 5
+ * @param <T6> type 6
+ * @param <T7> type 7
+ * @param <T8> type 8
+ * @param t1 param 1
+ * @param t2 param 2
+ * @param t3 param 3
+ * @param t4 param 4
+ * @param t5 param 5
+ * @param t6 param 6
+ * @param t7 param 7
+ * @param t8 param 8
+ * @return null
+ */
+ @Generated(
+ value = "SomeGeneratedName",
+ date = "a date",
+ comments = "some comment about the method below")
+ public static
+ <T1 extends AutoCloseable,
+ T2 extends AutoCloseable,
+ T3 extends AutoCloseable,
+ T4 extends AutoCloseable,
+ T5 extends AutoCloseable,
+ T6 extends AutoCloseable,
+ T7 extends AutoCloseable,
+ T8 extends AutoCloseable>
+ With8Types<T1, T2, T3, T4, T5, T6, T7, T8> bigGenericAnnotatedMethod(
+ F0<? extends T1> t1,
+ F0<? extends T2> t2,
+ F0<? extends T3> t3,
+ F0<? extends T4> t4,
+ F0<? extends T5> t5,
+ F0<? extends T6> t6,
+ F0<? extends T7> t7,
+ F0<? extends T8> t8)
+ throws IllegalArgumentException, IllegalStateException { return null; }
+}
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java Fri Jun 07 09:38:40 2019 -0700
@@ -81,8 +81,10 @@
"Returns the enum constant of this type with the specified name",
"Overloaded valueOf() method has correct documentation.",
"Overloaded values method has correct documentation.",
- "<pre class=\"methodSignature\">public static <a href=\"Coin.html\" title=\"enum in pkg\">Coin</a>" +
- " valueOf​(java.lang.String name)</pre>\n" +
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span> "
+ + "<span class=\"returnType\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span> "
+ + "<span class=\"memberName\">valueOf</span>​("
+ + "<span class=\"arguments\">java.lang.String name)</span></div>\n" +
"<div class=\"block\">Returns the enum constant of this type with the specified name.\n" +
"The string must match <i>exactly</i> an identifier used to declare an\n" +
"enum constant in this type. (Extraneous whitespace characters are \n" +
@@ -131,8 +133,11 @@
+ "<dd><code>V</code> - This is the second type "
+ "parameter.",
// Signature of method with type parameters
- "public <T extends java.util.List,​V> "
- + "java.lang.String[] methodThatHasTypeParameters",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"typeParameters\"><T extends java.util.List,​\nV></span>\n"
+ + "<span class=\"returnType\">java.lang.String[]</span> <span class=\"memberName\">"
+ + "methodThatHasTypeParameters</span>​(<span class=\"arguments\">T param1,\n"
+ + "V param2)</span></div>",
// Method that returns TypeParameters
"<td class=\"colFirst\"><code><a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n"
@@ -140,10 +145,11 @@
+ "<a href=\"#methodThatReturnsTypeParameterA(E%5B%5D)\">"
+ "methodThatReturnsTypeParameterA</a></span>​(<a href=\"TypeParameters.html\" "
+ "title=\"type parameter in TypeParameters\">E</a>[] e)</code>",
- "<pre class=\"methodSignature\">public <a href=\"TypeParameters.html\" "
- + "title=\"type parameter in TypeParameters\">E</a>[] "
- + "methodThatReturnsTypeParameterA​(<a href=\"TypeParameters.html\" "
- + "title=\"type parameter in TypeParameters\">E</a>[] e)</pre>\n",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> <span "
+ + "class=\"returnType\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+ + "E</a>[]</span> <span class=\"memberName\">methodThatReturnsTypeParameterA</span>​("
+ + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+ + "E</a>[] e)</span></div>\n",
"<td class=\"colFirst\"><code><T extends java.lang.Object & java.lang.Comparable<? super T>>"
+ "<br>T</code></td>\n"
+ "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
@@ -210,7 +216,10 @@
// Handle multiple bounds.
//==============================================================
checkOutput("pkg/MultiTypeParameters.html", true,
- "public <T extends java.lang.Number & java.lang.Runnable> T foo​(T t)");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"typeParameters\"><T extends java.lang.Number & java.lang.Runnable></span>\n"
+ + "<span class=\"returnType\">T</span> <span class=\"memberName\">foo</span>​"
+ + "(<span class=\"arguments\">T t)</span></div>");
//==============================================================
// Test Class-Use Documentation for Type Parameters.
@@ -531,45 +540,42 @@
+ "AnnotationTypeUsage</span>\n"
+ "extends java.lang.Object</pre>",
// FIELD
- "<pre><a href=\"AnnotationType.html\" "
- + "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"AnnotationType.html#optional()\">optional</a>"
- + "=\"Field Annotation\",\n"
- + " <a href=\"AnnotationType.html#required()\">"
- + "required</a>=1994)\n"
- + "public int field</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ + "optional</a>=\"Field Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"returnType\">int</span>"
+ + " <span class=\"memberName\">field</span></div>",
// CONSTRUCTOR
- "<pre><a href=\"AnnotationType.html\" "
- + "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"AnnotationType.html#optional()\">optional</a>"
- + "=\"Constructor Annotation\",\n"
- + " <a href=\"AnnotationType.html#required()\">"
- + "required</a>=1994)\n"
- + "public AnnotationTypeUsage()</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ + "optional</a>=\"Constructor Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ + "</span><span class=\"modifiers\">public</span> "
+ + "<span class=\"memberName\">AnnotationTypeUsage</span>()</div>",
// METHOD
- "<pre class=\"methodSignature\"><a href=\"AnnotationType.html\" "
- + "title=\"annotation in pkg\">@AnnotationType</a>("
- + "<a href=\"AnnotationType.html#optional()\">optional</a>"
- + "=\"Method Annotation\",\n"
- + " <a href=\"AnnotationType.html#required()\">"
- + "required</a>=1994)\n"
- + "public void method()</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+ + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
+ + "optional</a>=\"Method Annotation\",\n"
+ + " <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ + "</span><span class=\"modifiers\">public</span> <span class=\"returnType\">"
+ + "void</span> <span class=\"memberName\">method</span>()</div>",
// METHOD PARAMS
- "<pre class=\"methodSignature\">public void methodWithParams​("
- + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
- + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
- + "optional</a>=\"Parameter Annotation\",<a "
- + "href=\"AnnotationType.html#required()\">required</a>=1994)\n"
- + " int documented,\n"
- + " int undocmented)</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> <span "
+ + "class=\"returnType\">void</span> <span class=\"memberName\">methodWithParams</span>"
+ + "​(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
+ + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">optional</a>"
+ + "=\"Parameter Annotation\",<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ + "int documented,\n"
+ + "int undocmented)</span></div>",
// CONSTRUCTOR PARAMS
- "<pre>public AnnotationTypeUsage​(<a "
- + "href=\"AnnotationType.html\" title=\"annotation in pkg\">"
- + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
- + "optional</a>=\"Constructor Param Annotation\",<a "
- + "href=\"AnnotationType.html#required()\">required</a>=1994)\n"
- + " int documented,\n"
- + " int undocmented)</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"memberName\">AnnotationTypeUsage</span>​(<span class=\"arguments\">"
+ + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>("
+ + "<a href=\"AnnotationType.html#optional()\">optional</a>=\"Constructor Param Annotation\","
+ + "<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
+ + "int documented,\n"
+ + "int undocmented)</span></div>");
//=================================
// Annotatation Type Usage
--- a/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java Fri Jun 07 09:38:40 2019 -0700
@@ -197,15 +197,16 @@
+ "<a id=\"DEFAULT_NAME\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>static final java.lang.String "
- + "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">"
- + "DEFAULT_NAME</a></pre>",
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">java.lang.String</span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>",
"<h3>name</h3>\n"
+ "<a id=\"name()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre>java.lang.String <a href="
- + "\"../src-html/linksource/AnnotationTypeField.html#line.34\">name</a></pre>");
+ + "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span> "
+ + "<span class=\"memberName\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
+ + "name</a></span></div>");
checkOutput("src-html/linksource/AnnotationTypeField.html", true,
"<title>Source code</title>",
@@ -215,10 +216,9 @@
checkOutput("linksource/Properties.html", true,
"<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">"
+ "Properties</a>",
- "<pre>public java.lang.Object <a href="
- + "\"../src-html/linksource/Properties.html#line.31\">someProperty</a></pre>",
- "<pre class=\"methodSignature\">public java.lang.Object <a href="
- + "\"../src-html/linksource/Properties.html#line.31\">someProperty</a>()</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">java.lang.Object</span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/Properties.html#line.31\">someProperty</a></span></div>");
checkOutput("src-html/linksource/Properties.html", true,
"<title>Source code</title>",
@@ -228,12 +228,15 @@
checkOutput("linksource/SomeClass.html", true,
"<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">"
+ "SomeClass</a>\nextends java.lang.Object</pre>",
- "<pre>public int <a href=\"../src-html/linksource/SomeClass.html#line.31\">"
- + "field</a></pre>",
- "<pre>public <a href=\"../src-html/linksource/SomeClass.html#line.33\">"
- + "SomeClass</a>()</pre>",
- "<pre class=\"methodSignature\">public int <a href=\"../src-html/linksource/SomeClass.html#line.36\">"
- + "method</a>()</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/SomeClass.html#line.31\">field</a></span></div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"memberName\"><a href=\"../src-html/linksource/SomeClass.html#line.33\">"
+ + "SomeClass</a></span>()</div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/SomeClass.html#line.36\">method</a></span>()</div>");
checkOutput("src-html/linksource/SomeClass.html", true,
"<title>Source code</title>",
@@ -247,12 +250,14 @@
+ "public int method() {</a>");
checkOutput("linksource/SomeEnum.html", true,
- "<pre>public static final <a href=\"SomeEnum.html\" "
- + "title=\"enum in linksource\">SomeEnum</a> <a href="
- + "\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></pre>",
- "<pre>public static final <a href=\"SomeEnum.html\" "
- + "title=\"enum in linksource\">SomeEnum</a> <a href="
- + "\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span> "
+ + "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+ + "SomeEnum</a></span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></span></div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span> "
+ + "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+ + "SomeEnum</a></span> <span class=\"memberName\">"
+ + "<a href=\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></span></div>");
checkOutput("src-html/linksource/SomeEnum.html", true,
"<span class=\"sourceLineNo\">029</span><a id=\"line.29\"> VALUE1,</a>",
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java Fri Jun 07 09:38:40 2019 -0700
@@ -516,10 +516,14 @@
checkOrder("pkg5/AnnoFieldTest.html",
"<h2>Field Details</h2>",
- "<pre>static final int one</pre>",
- "<pre>static final int two</pre>",
- "<pre>static final int three</pre>",
- "<pre>static final int four</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">one</span></div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">two</span></div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">three</span></div>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span> "
+ + "<span class=\"returnType\">int</span> <span class=\"memberName\">four</span></div>");
checkOrder("pkg5/AnnoOptionalTest.html",
"<h2>Optional Element Summary</h2>",
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java Fri Jun 07 09:38:40 2019 -0700
@@ -57,7 +57,8 @@
+ "<a id=\"toString()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public void toString()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">toString</span>()</div>\n"
+ "<div class=\"block\">Why can't I do this ?</div>\n"
+ "</section>");
}
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java Fri Jun 07 09:38:40 2019 -0700
@@ -57,9 +57,11 @@
checkOrder("pkg1/SubClass.html",
"Method Detail",
- "@Deprecated\npublic void func1()",
+ "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">func1</span>()",
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>",
- "@Deprecated\npublic void func2()",
+ "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">func2</span>()",
"<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>",
"<div class=\"block\">deprecated with comments</div>");
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8222091
+ * @summary Javadoc does not handle package annotations correctly on package-info.java
+ * @library ../../lib/
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build javadoc.tester.*
+ * @run main TestPackageAnnotation
+ */
+
+import javadoc.tester.JavadocTester;
+
+public class TestPackageAnnotation extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestPackageAnnotation tester = new TestPackageAnnotation();
+ tester.runTests();
+ }
+
+ @Test
+ public void testPackageInfoAnnotationNoComment() {
+ javadoc("-d", "out-annotation",
+ "-sourcepath", testSrc,
+ "-use",
+ "pkg1");
+ checkExit(Exit.OK);
+ checkOutput("pkg1/package-summary.html", true,
+ "<main role=\"main\">\n<div class=\"header\">\n"
+ + "<p>@Deprecated(since=\"1<2>3\")\n"
+ + "</p>\n"
+ + "<h1 title=\"Package\" class=\"title\">Package pkg1</h1>\n"
+ + "</div>\n");
+ }
+
+ @Test
+ public void testPackageHtmlTag() {
+ javadoc("-d", "out-annotation-2",
+ "-sourcepath", testSrc,
+ "-use",
+ "pkg2");
+ checkExit(Exit.OK);
+ checkOutput("pkg2/package-summary.html", true,
+ "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ + "<div class=\"deprecationComment\">This package is deprecated.</div>\n"
+ + "</div>\n"
+ + "<div class=\"block\">This is the description of package pkg2.</div>\n"
+ + "</section>");
+ }
+
+ @Test
+ public void testPackageInfoAndHtml() {
+ javadoc("-d", "out-annotation-3",
+ "-sourcepath", testSrc,
+ "-use",
+ "pkg3");
+ checkExit(Exit.OK);
+ checkOutput("pkg3/package-summary.html", true,
+ "<main role=\"main\">\n"
+ + "<div class=\"header\">\n"
+ + "<p>@Deprecated(since=\"1<2>3\")\n"
+ + "</p>\n"
+ + "<h1 title=\"Package\" class=\"title\">Package pkg3</h1>\n"
+ + "</div>\n");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg1/A.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg1;
+
+public class A {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg1/package-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// Contains no javadoc comment, but should still be honored by javadoc.
+
+@Deprecated(since="1<2>3")
+package pkg1;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg2/A.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg2;
+
+public class A {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg2/package.html Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,9 @@
+<html lang="en">
+<head>
+ <title>Package Summary</title>
+</head>
+<body>
+This is the description of package pkg2.
+@deprecated This package is deprecated.
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg3/A.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package pkg3;
+
+public class A {
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg3/package-info.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// Contains no javadoc comment, but should still be honored by javadoc.
+
+@Deprecated(since="1<2>3")
+package pkg3;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/pkg3/package.html Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,8 @@
+<html lang="en">
+<head>
+ <title>Package Summary</title>
+</head>
+<body>
+This file is ignored by javadoc as the package contains a package-info.java file.
+</body>
+</html>
--- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java Fri Jun 07 09:38:40 2019 -0700
@@ -70,7 +70,10 @@
+ "<div class=\"inheritance\">pkg.PublicChild</div>\n"
+ "</div>",
// Method is documented as though it is declared in the inheriting method.
- "<pre class=\"methodSignature\">public void methodInheritedFromParent​(int p1)",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">"
+ + "methodInheritedFromParent</span>​(<span class=\"arguments\">int p1)</span>\n"
+ + " throws <span class=\"exceptions\">java.lang.Exception</span></div>",
"<dl>\n"
+ "<dt>All Implemented Interfaces:</dt>\n"
+ "<dd><code><a href=\"PublicInterface.html\" title=\"interface in pkg\">"
--- a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java Fri Jun 07 09:38:40 2019 -0700
@@ -50,10 +50,10 @@
checkExit(Exit.OK);
checkOutput("pkg/MyClass.html", true,
- "<pre>public final <a href=\"ObjectProperty.html\" "
- + "title=\"class in pkg\">ObjectProperty</a>"
- + "<<a href=\"MyObj.html\" "
- + "title=\"class in pkg\">MyObj</a>> goodProperty</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ + "ObjectProperty</a><<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>></span>"
+ + " <span class=\"memberName\">goodProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the "
+ "Object is a single Object.</div>\n"
+ "<dl>\n"
@@ -63,10 +63,10 @@
+ "<code>setGood(MyObj)</code></a></dd>\n"
+ "</dl>",
- "<pre>public final <a href=\"ObjectProperty.html\" "
- + "title=\"class in pkg\">ObjectProperty</a>"
- + "<<a href=\"MyObj.html\" "
- + "title=\"class in pkg\">MyObj</a>[]> badProperty</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ + "ObjectProperty</a><<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>[]></span>"
+ + " <span class=\"memberName\">badProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the "
+ "Object is an array.</div>\n"
+ "<dl>\n"
@@ -94,11 +94,11 @@
);
checkOutput("pkg/MyClassT.html", true,
- "<pre>public final <a href=\"ObjectProperty.html\" "
- + "title=\"class in pkg\">ObjectProperty</a>"
- + "<java.util.List<<a href=\"MyClassT.html\" "
- + "title=\"type parameter in MyClassT\">T</a>>> "
- + "listProperty</pre>\n"
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+ + "ObjectProperty</a><java.util.List<<a href=\"MyClassT.html\" "
+ + "title=\"type parameter in MyClassT\">T</a>>></span> "
+ + "<span class=\"memberName\">listProperty</span></div>\n"
+ "<div class=\"block\">This is an Object property where the "
+ "Object is a single <code>List<T></code>.</div>\n"
+ "<dl>\n"
--- a/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java Fri Jun 07 09:38:40 2019 -0700
@@ -65,7 +65,7 @@
"protected java.lang.Object writeReplace()",
"protected java.lang.Object readObjectNoData()",
"<h3>Serialization Overview</h3>\n<ul class=\"blockList\">\n"
- + "<li class=\"blockListLast\">\n<div class=\"block\">"
+ + "<li class=\"blockList\">\n<div class=\"block\">"
+ "<span class=\"deprecatedLabel\">Deprecated.</span> </div>\n"
+ "<dl>\n<dt><span class=\"seeLabel\">See Also:</span></dt>\n"
+ "<dd><code>TestSerializedForm</code></dd>\n</dl>",
@@ -95,7 +95,7 @@
"<pre>Long[] longs</pre>\n" +
"<div class=\"block\">the longs</div>\n" +
"</li>\n" +
- "<li class=\"blockListLast\">\n" +
+ "<li class=\"blockList\">\n" +
"<h4>name</h4>\n" +
"<pre>java.lang.String name</pre>\n" +
"<div class=\"block\">a test</div>");
@@ -139,7 +139,7 @@
"<pre>Long[] longs</pre>\n" +
"<div class=\"block\">the longs</div>\n" +
"</li>\n" +
- "<li class=\"blockListLast\">\n" +
+ "<li class=\"blockList\">\n" +
"<h5>name</h5>\n" +
"<pre>java.lang.String name</pre>\n" +
"<div class=\"block\">a test</div>");
--- a/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java Fri Jun 07 09:38:40 2019 -0700
@@ -73,10 +73,11 @@
checkExit(Exit.OK);
checkOutput("serialized-form.html", true,
- "<pre class=\"methodSignature\">public void readObject​"
- + "(java.io.ObjectInputStream arg0)\n"
- + " throws java.lang.ClassNotFoundException,\n"
- + " java.io.IOException</pre>\n");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">readObject</span>"
+ + "​(<span class=\"arguments\">java.io.ObjectInputStream arg0)</span>\n"
+ + " throws <span class=\"exceptions\">java.lang.ClassNotFoundException,\n"
+ + "java.io.IOException</span></div>\n");
}
void createTestClass(Path base, Path srcDir) throws Exception {
--- a/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java Fri Jun 07 09:38:40 2019 -0700
@@ -165,9 +165,9 @@
+ "th.colFirst a:link, th.colFirst a:visited,\n"
+ "th.colSecond a:link, th.colSecond a:visited,\n"
+ "th.colConstructorName a:link, th.colConstructorName a:visited,\n"
- + "th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited, \n"
- + ".constantValuesContainer td a:link, .constantValuesContainer td a:visited, \n"
- + ".allClassesContainer td a:link, .allClassesContainer td a:visited, \n"
+ + "th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,\n"
+ + ".constantValuesContainer td a:link, .constantValuesContainer td a:visited,\n"
+ + ".allClassesContainer td a:link, .allClassesContainer td a:visited,\n"
+ ".allPackagesContainer td a:link, .allPackagesContainer td a:visited {\n"
+ " font-weight:bold;\n"
+ "}",
--- a/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java Fri Jun 07 09:38:40 2019 -0700
@@ -90,7 +90,8 @@
+ "<a id=\"m3()\">\n"
+ "<!-- -->\n"
+ "</a>\n"
- + "<pre class=\"methodSignature\">public void m3()</pre>\n"
+ + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">m3</span>()</div>\n"
+ "<div class=\"block\">First sentence some text maybe second sentence.</div>\n"
+ "</section>\n"
);
--- a/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java Fri Jun 07 09:38:40 2019 -0700
@@ -47,7 +47,7 @@
public static void main(String... args) throws Exception {
TestSystemPropertyTaglet tester = new TestSystemPropertyTaglet();
- tester.runTests(m -> new Object[]{Paths.get(m.getName())});
+ tester.runTests(m -> new Object[] { Paths.get(m.getName()) });
}
TestSystemPropertyTaglet() {
@@ -118,4 +118,27 @@
checkOutput(Output.OUT, true,
"warning: {@systemProperty} tag, which expands to <a>, within <a>");
}
+
+ @Test
+ public void testDuplicateReferences(Path base) throws Exception {
+ Path srcDir = base.resolve("src");
+ Path outDir = base.resolve("out");
+
+ new ClassBuilder(tb, "pkg.A")
+ .setModifiers("public", "class")
+ .setComments("This is a class. Here is {@systemProperty foo}.")
+ .addMembers(MethodBuilder.parse("public void m() {}")
+ .setComments("This is a method. Here is {@systemProperty foo}."))
+ .write(srcDir);
+
+ javadoc("-d", outDir.toString(),
+ "-sourcepath", srcDir.toString(),
+ "pkg");
+
+ checkExit(Exit.OK);
+
+ checkOutput("pkg/A.html", true,
+ "This is a class. Here is <code><a id=\"foo\" class=\"searchTagResult\">foo</a></code>.",
+ "This is a method. Here is <code><a id=\"foo-1\" class=\"searchTagResult\">foo</a></code>.");
+ }
}
--- a/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java Fri Jun 07 09:38:40 2019 -0700
@@ -115,249 +115,274 @@
// Test for type annotations on fields (Fields.java).
checkOutput("typeannos/DefaultScope.html", true,
- "<pre><a href=\"Parameterized.html\" title=\"class in "
- + "typeannos\">Parameterized</a><<a href=\"FldA.html\" "
- + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,​<a "
- + "href=\"FldB.html\" title=\"annotation in typeannos\">"
- + "@FldB</a> java.lang.String> bothTypeArgs</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"Parameterized.html\" "
+ + "title=\"class in typeannos\">Parameterized</a><<a href=\"FldA.html\" "
+ + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,​"
+ + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> java.lang.String>"
+ + "</span> <span class=\"memberName\">bothTypeArgs</span></div>",
- "<pre><a href=\"FldA.html\" title=\"annotation in "
- + "typeannos\">@FldA</a> java.lang.String <a href=\""
- + "FldB.html\" title=\"annotation in typeannos\">@FldB</a> [] "
- + "array1Deep</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"FldA.html\" "
+ + "title=\"annotation in typeannos\">@FldA</a> java.lang.String <a href=\"FldB.html\" "
+ + "title=\"annotation in typeannos\">@FldB</a> []</span> "
+ + "<span class=\"memberName\">array1Deep</span></div>",
- "<pre>java.lang.String <a href=\"FldB.html\" "
- + "title=\"annotation in typeannos\">@FldB</a> [][] array2SecondOld</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String "
+ + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> [][]</span> "
+ + "<span class=\"memberName\">array2SecondOld</span></div>",
// When JDK-8068737, we should change the order
- "<pre><a href=\"FldD.html\" title=\"annotation in typeannos\">"
- + "@FldD</a> java.lang.String "
- + "<a href=\"FldC.html\" title=\"annotation in typeannos\">@FldC</a> "
- + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> [] "
- + "<a href=\"FldC.html\" title=\"annotation in typeannos\">@FldC</a> "
- + "<a href=\"FldA.html\" title=\"annotation in typeannos\">@FldA</a> [] "
- + "array2Deep</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"FldD.html\" "
+ + "title=\"annotation in typeannos\">@FldD</a> java.lang.String <a href=\"FldC.html\" "
+ + "title=\"annotation in typeannos\">@FldC</a> <a href=\"FldB.html\" "
+ + "title=\"annotation in typeannos\">@FldB</a> [] <a href=\"FldC.html\" "
+ + "title=\"annotation in typeannos\">@FldC</a> <a href=\"FldA.html\" "
+ + "title=\"annotation in typeannos\">@FldA</a> []</span> "
+ + "<span class=\"memberName\">array2Deep</span></div>");
checkOutput("typeannos/ModifiedScoped.html", true,
- "<pre>public final <a href=\"Parameterized.html\" "
- + "title=\"class in typeannos\">Parameterized</a><<a href=\""
- + "FldA.html\" title=\"annotation in typeannos\">@FldA</a> "
- + "<a href=\"Parameterized.html\" title=\"class in "
- + "typeannos\">Parameterized</a><<a href=\"FldA.html\" "
- + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,​<a "
- + "href=\"FldB.html\" title=\"annotation in typeannos\">"
- + "@FldB</a> java.lang.String>,​<a href=\"FldB.html\" "
- + "title=\"annotation in typeannos\">@FldB</a> java.lang.String> "
- + "nestedParameterized</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>"
+ + " <span class=\"returnType\"><a href=\"Parameterized.html\" "
+ + "title=\"class in typeannos\">Parameterized</a><<a href=\"FldA.html\" "
+ + "title=\"annotation in typeannos\">@FldA</a> <a href=\"Parameterized.html\" "
+ + "title=\"class in typeannos\">Parameterized</a><<a href=\"FldA.html\" "
+ + "title=\"annotation in typeannos\">@FldA</a> java.lang.String,​"
+ + "<a href=\"FldB.html\" title=\"annotation in typeannos\">@FldB</a> "
+ + "java.lang.String>,​<a href=\"FldB.html\" "
+ + "title=\"annotation in typeannos\">@FldB</a> java.lang.String>"
+ + "</span> <span class=\"memberName\">nestedParameterized</span></div>",
- "<pre>public final <a href=\"FldA.html\" "
- + "title=\"annotation in typeannos\">@FldA</a> java.lang.String[][] "
- + "array2</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"FldA.html\" title=\"annotation in typeannos\">"
+ + "@FldA</a> java.lang.String[][]</span> "
+ + "<span class=\"memberName\">array2</span></div>");
// Test for type annotations on method return types (MethodReturnType.java).
checkOutput("typeannos/MtdDefaultScope.html", true,
- "<pre class=\"methodSignature\">public <T> <a href=\"MRtnA.html\" "
- + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String"
- + " method()</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>"
+ + " <span class=\"typeParameters\"><T></span> <span "
+ + "class=\"returnType\"><a href=\"MRtnA.html\" title=\"annotation in typeannos\">"
+ + "@MRtnA</a> java.lang.String</span> "
+ + "<span class=\"memberName\">method</span>()</div>",
// When JDK-8068737 is fixed, we should change the order
- "<pre class=\"methodSignature\"><a href=\"MRtnA.html\" title=\"annotation in typeannos\">"
- + "@MRtnA</a> java.lang.String "
- + "<a href=\"MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> [] "
- + "<a href=\"MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> []"
- + " array2Deep()</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MRtnA.html\" "
+ + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String <a href=\"MRtnB.html\" "
+ + "title=\"annotation in typeannos\">@MRtnB</a> [] <a href=\"MRtnA.html\" "
+ + "title=\"annotation in typeannos\">@MRtnA</a> []</span> <span class=\"memberName\">"
+ + "array2Deep</span>()</div>",
- "<pre class=\"methodSignature\"><a href=\"MRtnA.html\" title=\"annotation in "
- + "typeannos\">@MRtnA</a> java.lang.String[][] array2()</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MRtnA.html\" "
+ + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String[][]</span> "
+ + "<span class=\"memberName\">array2</span>()</div>");
checkOutput("typeannos/MtdModifiedScoped.html", true,
- "<pre class=\"methodSignature\">public final <a href=\"MtdParameterized.html\" "
- + "title=\"class in typeannos\">MtdParameterized</a><<a href=\""
- + "MRtnA.html\" title=\"annotation in typeannos\">@MRtnA</a> "
- + "<a href=\"MtdParameterized.html\" title=\"class in "
- + "typeannos\">MtdParameterized</a><<a href=\"MRtnA."
- + "html\" title=\"annotation in typeannos\">@MRtnA</a> java.lang."
- + "String,​<a href=\"MRtnB.html\" title=\"annotation in "
- + "typeannos\">@MRtnB</a> java.lang.String>,​<a href=\""
- + "MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> java."
- + "lang.String> nestedMtdParameterized()</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\"><a href=\"MtdParameterized.html\" "
+ + "title=\"class in typeannos\">MtdParameterized</a><<a href=\"MRtnA.html\" "
+ + "title=\"annotation in typeannos\">@MRtnA</a> <a href=\"MtdParameterized.html\" "
+ + "title=\"class in typeannos\">MtdParameterized</a><<a href=\"MRtnA.html\" "
+ + "title=\"annotation in typeannos\">@MRtnA</a> java.lang.String,​"
+ + "<a href=\"MRtnB.html\" title=\"annotation in typeannos\">@MRtnB</a> "
+ + "java.lang.String>,​<a href=\"MRtnB.html\" title=\"annotation in typeannos\">"
+ + "@MRtnB</a> java.lang.String></span> <span class=\"memberName\">"
+ + "nestedMtdParameterized</span>()</div>");
// Test for type annotations on method type parameters (MethodTypeParameters.java).
checkOutput("typeannos/UnscopedUnmodified.html", true,
- "<pre class=\"methodSignature\"><K extends <a href=\"MTyParamA.html\" title=\""
- + "annotation in typeannos\">@MTyParamA</a> java.lang.String>"
- + " void methodExtends()</pre>",
+ "<div class=\"memberSignature\"><span class=\"typeParameters\"><K extends "
+ + "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
+ + "java.lang.String></span> <span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">methodExtends</span>()</div>",
- "<pre class=\"methodSignature\"><K extends <a href=\"MTyParamA.html\" title=\""
- + "annotation in typeannos\">@MTyParamA</a> <a href=\""
- + "MtdTyParameterized.html\" title=\"class in typeannos\">"
- + "MtdTyParameterized</a><<a href=\"MTyParamB.html\" "
- + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
- + ">> void nestedExtends()</pre>");
+ "<div class=\"memberSignature\"><span class=\"typeParametersLong\"><K extends "
+ + "<a href=\"MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
+ + "<a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">MtdTyParameterized</a>"
+ + "<<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">@MTyParamB</a> "
+ + "java.lang.String>></span>\n<span class=\"returnType\">void</span>"
+ + " <span class=\"memberName\">nestedExtends</span>()</div>");
checkOutput("typeannos/PublicModifiedMethods.html", true,
- "<pre class=\"methodSignature\">public final <K extends <a href=\""
- + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
- + "java.lang.String> void methodExtends()</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"typeParameters\"><K extends <a href=\"MTyParamA.html\" "
+ + "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String></span>\n"
+ + "<span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">methodExtends</span>()</div>",
- "<pre class=\"methodSignature\">public final <K extends <a href=\""
- + "MTyParamA.html\" title=\"annotation in typeannos\">@MTyParamA</a> "
- + "java.lang.String,​V extends <a href=\"MTyParamA.html\" "
- + "title=\"annotation in typeannos\">@MTyParamA</a> <a href=\""
- + "MtdTyParameterized.html\" title=\"class in typeannos\">"
- + "MtdTyParameterized</a><<a href=\"MTyParamB.html\" "
- + "title=\"annotation in typeannos\">@MTyParamB</a> java.lang.String"
- + ">> void dual()</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>"
+ + " <span class=\"typeParametersLong\"><K extends <a href=\"MTyParamA.html\" "
+ + "title=\"annotation in typeannos\">@MTyParamA</a> java.lang.String,​\n"
+ + "V extends <a href=\"MTyParamA.html\" title=\"annotation in typeannos\">"
+ + "@MTyParamA</a> <a href=\"MtdTyParameterized.html\" title=\"class in typeannos\">"
+ + "MtdTyParameterized</a><<a href=\"MTyParamB.html\" title=\"annotation in typeannos\">"
+ + "@MTyParamB</a> java.lang.String>></span>\n<span class=\"returnType\">void</span>"
+ + " <span class=\"memberName\">dual</span>()</div>");
// Test for type annotations on parameters (Parameters.java).
checkOutput("typeannos/Parameters.html", true,
- "<pre class=\"methodSignature\">void unannotated​(<a href=\""
- + "ParaParameterized.html\" title=\"class in typeannos\">"
- + "ParaParameterized</a><java.lang.String,​java.lang.String>"
- + " a)</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">unannotated</span>​(<span class=\"arguments\">"
+ + "<a href=\"ParaParameterized.html\" title=\"class in typeannos\">ParaParameterized</a>"
+ + "<java.lang.String,​java.lang.String> a)</span></div>",
- "<pre class=\"methodSignature\">void nestedParaParameterized​(<a href=\""
- + "ParaParameterized.html\" title=\"class in typeannos\">"
- + "ParaParameterized</a><<a href=\"ParamA.html\" "
- + "title=\"annotation in typeannos\">@ParamA</a> <a href=\""
- + "ParaParameterized.html\" title=\"class in typeannos\">"
- + "ParaParameterized</a><<a href=\"ParamA.html\" "
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">nestedParaParameterized</span>​"
+ + "(<span class=\"arguments\"><a href=\"ParaParameterized.html\" "
+ + "title=\"class in typeannos\">ParaParameterized</a><<a href=\"ParamA.html\" "
+ + "title=\"annotation in typeannos\">@ParamA</a> <a href=\"ParaParameterized.html\" "
+ + "title=\"class in typeannos\">ParaParameterized</a><<a href=\"ParamA.html\" "
+ "title=\"annotation in typeannos\">@ParamA</a> java.lang.String,​"
- + "<a href=\"ParamB.html\" title=\"annotation in "
- + "typeannos\">@ParamB</a> java.lang.String>,​<a href=\""
- + "ParamB.html\" title=\"annotation in typeannos\">@ParamB"
- + "</a> java.lang.String> a)</pre>",
+ + "<a href=\"ParamB.html\" title=\"annotation in typeannos\">@ParamB</a> "
+ + "java.lang.String>,​<a href=\"ParamB.html\" title=\"annotation in typeannos\">"
+ + "@ParamB</a> java.lang.String> a)</span></div>",
// When JDK-8068737 is fixed, we should change the order
- "<pre class=\"methodSignature\">void array2Deep​(<a href=\"ParamA.html\" "
- + "title=\"annotation in typeannos\">@ParamA</a> java.lang.String "
- + "<a href=\"ParamB.html\" title=\"annotation in typeannos\">"
- + "@ParamB</a> [] "
- + "<a href=\"ParamA.html\" title=\"annotation in typeannos\">"
- + "@ParamA</a> []"
- + " a)</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">array2Deep</span>​(<span class=\"arguments\">"
+ + "<a href=\"ParamA.html\" title=\"annotation in typeannos\">@ParamA</a> "
+ + "java.lang.String <a href=\"ParamB.html\" title=\"annotation in typeannos\">"
+ + "@ParamB</a> [] <a href=\"ParamA.html\" title=\"annotation in typeannos\">"
+ + "@ParamA</a> [] a)</span></div>");
// Test for type annotations on throws (Throws.java).
checkOutput("typeannos/ThrDefaultUnmodified.html", true,
- "<pre class=\"methodSignature\">void oneException()\n"
- + " throws <a href=\"ThrA.html\" title=\""
- + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">oneException</span>()\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>",
- "<pre class=\"methodSignature\">void twoExceptions()\n"
- + " throws <a href=\"ThrA.html\" title=\""
- + "annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
- + " <a href=\"ThrA.html\" title=\""
- + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">twoExceptions</span>()\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ + "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
+ + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> "
+ + "java.lang.Exception</span></div>");
checkOutput("typeannos/ThrPublicModified.html", true,
- "<pre class=\"methodSignature\">public final void oneException​"
- + "(java.lang.String a)\n throws <a href=\"ThrA.html\" "
- + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">"
+ + "oneException</span>​(<span class=\"arguments\">java.lang.String a)</span>\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</span></div>",
- "<pre class=\"methodSignature\">public final void twoExceptions​"
- + "(java.lang.String a)\n throws <a href=\"ThrA.html\" "
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">"
+ + "twoExceptions</span>​(<span class=\"arguments\">java.lang.String a)</span>\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrA.html\" "
+ "title=\"annotation in typeannos\">@ThrA</a> java.lang.RuntimeException,\n"
- + " <a href=\"ThrA.html\" "
- + "title=\"annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
+ + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> "
+ + "java.lang.Exception</span></div>");
checkOutput("typeannos/ThrWithValue.html", true,
- "<pre class=\"methodSignature\">void oneException()\n"
- + " throws <a href=\"ThrB.html\" title=\""
- + "annotation in typeannos\">@ThrB</a>("
- + "\"m\") java.lang.Exception</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">oneException</span>()\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrB.html\" "
+ + "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.Exception</span></div>",
- "<pre class=\"methodSignature\">void twoExceptions()\n"
- + " throws <a href=\"ThrB.html\" title=\""
- + "annotation in typeannos\">@ThrB</a>("
- + "\"m\") java.lang.RuntimeException,\n"
- + " <a href=\"ThrA.html\" title=\""
- + "annotation in typeannos\">@ThrA</a> java.lang.Exception</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">twoExceptions</span>()\n"
+ + " throws <span class=\"exceptions\"><a href=\"ThrB.html\" "
+ + "title=\"annotation in typeannos\">@ThrB</a>(\"m\") java.lang.RuntimeException,\n"
+ + "<a href=\"ThrA.html\" title=\"annotation in typeannos\">@ThrA</a> "
+ + "java.lang.Exception</span></div>");
// Test for type annotations on type parameters (TypeParameters.java).
checkOutput("typeannos/TestMethods.html", true,
- "<pre class=\"methodSignature\"><K,​<a href=\"TyParaA.html\" title="
- + "\"annotation in typeannos\">@TyParaA</a> V extends <a href=\"TyParaA.html\" "
- + "title=\"annotation in typeannos\">@TyParaA</a> "
- + "java.lang.String> void secondAnnotated()</pre>"
+ "<div class=\"memberSignature\"><span class=\"typeParameters\"><K,​\n"
+ + "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> V extends "
+ + "<a href=\"TyParaA.html\" title=\"annotation in typeannos\">@TyParaA</a> "
+ + "java.lang.String></span>\n<span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">secondAnnotated</span>()</div>"
);
// Test for type annotations on wildcard type (Wildcards.java).
checkOutput("typeannos/BoundTest.html", true,
- "<pre class=\"methodSignature\">void wcExtends​(<a href=\"MyList.html\" "
- + "title=\"class in typeannos\">MyList</a><? extends <a href=\""
- + "WldA.html\" title=\"annotation in typeannos\">@WldA"
- + "</a> java.lang.String> l)</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">wcExtends</span>​(<span class=\"arguments\">"
+ + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a><? extends "
+ + "<a href=\"WldA.html\" title=\"annotation in typeannos\">@WldA</a> "
+ + "java.lang.String> l)</span></div>",
- "<pre class=\"methodSignature\"><a href=\"MyList.html\" title=\"class in "
- + "typeannos\">MyList</a><? super <a href=\"WldA.html\" "
- + "title=\"annotation in typeannos\">@WldA</a> java.lang.String>"
- + " returnWcSuper()</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MyList.html\" "
+ + "title=\"class in typeannos\">MyList</a><? super <a href=\"WldA.html\" "
+ + "title=\"annotation in typeannos\">@WldA</a> java.lang.String></span> "
+ + "<span class=\"memberName\">returnWcSuper</span>()</div>");
checkOutput("typeannos/BoundWithValue.html", true,
- "<pre class=\"methodSignature\">void wcSuper​(<a href=\"MyList.html\""
- + " title=\"class in typeannos\">MyList</a><? super <a href=\""
- + "WldB.html\" title=\"annotation in typeannos\">@WldB</a>("
- + "\"m\") java.lang."
- + "String> l)</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">wcSuper</span>​(<span class=\"arguments\">"
+ + "<a href=\"MyList.html\" title=\"class in typeannos\">MyList</a><? super "
+ + "<a href=\"WldB.html\" title=\"annotation in typeannos\">@WldB</a>(\"m\") "
+ + "java.lang.String> l)</span></div>",
- "<pre class=\"methodSignature\"><a href=\"MyList.html\" title=\"class in "
- + "typeannos\">MyList</a><? extends <a href=\"WldB."
- + "html\" title=\"annotation in typeannos\">@WldB</a>("
- + "\"m\") java.lang.String"
- + "> returnWcExtends()</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\"><a href=\"MyList.html\" "
+ + "title=\"class in typeannos\">MyList</a><? extends <a href=\"WldB.html\" "
+ + "title=\"annotation in typeannos\">@WldB</a>(\"m\") java.lang.String></span>"
+ + " <span class=\"memberName\">returnWcExtends</span>()</div>");
// Test for receiver annotations (Receivers.java).
checkOutput("typeannos/DefaultUnmodified.html", true,
- "<pre class=\"methodSignature\">void withException​(<a href=\"RcvrA.html\" "
- + "title=\"annotation in typeannos\">@RcvrA</a> "
- + "DefaultUnmodified this)\n"
- + " throws java."
- + "lang.Exception</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">withException</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ + " DefaultUnmodified this)</span>\n"
+ + " throws <span class=\"exceptions\">java.lang.Exception</span></div>",
- "<pre class=\"methodSignature\">java.lang.String nonVoid​(<a href=\"RcvrA."
- + "html\" title=\"annotation in typeannos\">@RcvrA</a> <a href=\""
- + "RcvrB.html\" title=\"annotation in typeannos\">@RcvrB"
- + "</a>(\"m\")"
- + " DefaultUnmodified this)</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span> "
+ + "<span class=\"memberName\">nonVoid</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> "
+ + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")"
+ + " DefaultUnmodified this)</span></div>",
- "<pre class=\"methodSignature\"><T extends java.lang.Runnable> void accept​("
- + "<a href=\"RcvrA.html\" title=\"annotation in "
- + "typeannos\">@RcvrA</a> DefaultUnmodified this,\n"
- + " T r)\n"
- + " throws java.lang.Exception</pre>");
+ "<div class=\"memberSignature\"><span class=\"typeParameters\"><T extends "
+ + "java.lang.Runnable></span> <span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">accept</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a> "
+ + "DefaultUnmodified this,\nT r)</span>\n"
+ + " throws <span class=\"exceptions\">"
+ + "java.lang.Exception</span></div>");
checkOutput("typeannos/PublicModified.html", true,
- "<pre class=\"methodSignature\">public final java.lang.String nonVoid​"
- + "(<a href=\"RcvrA.html\" title=\"annotation in typeannos\">"
- + "@RcvrA</a> PublicModified this)</pre>",
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"returnType\">java.lang.String</span> <span class=\"memberName\">"
+ + "nonVoid</span>​(<span class=\"arguments\"><a href=\"RcvrA.html\" "
+ + "title=\"annotation in typeannos\">@RcvrA</a> PublicModified this)"
+ + "</span></div>",
- "<pre class=\"methodSignature\">public final <T extends java.lang.Runnable> "
- + "void accept​(<a href=\"RcvrA.html\" title=\""
- + "annotation in typeannos\">@RcvrA</a> PublicModified this,\n"
- + " T r)\n"
- + " throws java.lang.Exception</pre>");
+ "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span> "
+ + "<span class=\"typeParameters\"><T extends java.lang.Runnable></span> "
+ + "<span class=\"returnType\">void</span> <span class=\"memberName\">accept"
+ + "</span>​(<span class=\"arguments\"><a href=\"RcvrA.html\" "
+ + "title=\"annotation in typeannos\">@RcvrA</a> PublicModified this,\n"
+ + "T r)</span>\n throws "
+ + "<span class=\"exceptions\">java.lang.Exception</span></div>");
checkOutput("typeannos/WithValue.html", true,
- "<pre class=\"methodSignature\"><T extends java.lang.Runnable> void accept​("
- + "<a href=\"RcvrB.html\" title=\"annotation in "
- + "typeannos\">@RcvrB</a>("
- + "\"m\") WithValue this,\n"
- + " T r)\n"
- + " throws java.lang.Exception</pre>");
+ "<div class=\"memberSignature\"><span class=\"typeParameters\"><T extends "
+ + "java.lang.Runnable></span> <span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">accept</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\")"
+ + " WithValue this,\nT r)</span>\n"
+ + " throws <span class=\"exceptions\">"
+ + "java.lang.Exception</span></div>");
checkOutput("typeannos/WithFinal.html", true,
- "<pre class=\"methodSignature\">java.lang.String nonVoid​(<a href=\"RcvrB.html\" "
- + "title=\"annotation in typeannos\">@RcvrB</a>(\"m\") "
- + "<a href=\"WithFinal.html\" title=\"class in typeannos\">"
- + "WithFinal</a> afield)</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>"
+ + " <span class=\"memberName\">nonVoid</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrB.html\" title=\"annotation in typeannos\">@RcvrB</a>(\"m\") "
+ + "<a href=\"WithFinal.html\" title=\"class in typeannos\">WithFinal</a>"
+ + " afield)</span></div>");
checkOutput("typeannos/WithBody.html", true,
- "<pre class=\"methodSignature\">void field​(<a href=\"RcvrA.html\" title=\""
- + "annotation in typeannos\">@RcvrA</a> WithBody this)</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">field</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ + " WithBody this)</span></div>");
checkOutput("typeannos/Generic2.html", true,
- "<pre class=\"methodSignature\">void test2​(<a href=\"RcvrA.html\" title=\""
- + "annotation in typeannos\">@RcvrA</a> Generic2<X> this)</pre>");
+ "<div class=\"memberSignature\"><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">test2</span>​(<span class=\"arguments\">"
+ + "<a href=\"RcvrA.html\" title=\"annotation in typeannos\">@RcvrA</a>"
+ + " Generic2<X> this)</span></div>");
// Test for repeated type annotations (RepeatedAnnotations.java).
@@ -393,84 +418,82 @@
// + "extends java.lang.Object</pre>");
checkOutput("typeannos/RepeatingOnConstructor.html", true,
- "<pre><a href=\"RepConstructorA.html\" title=\"annotation "
- + "in typeannos\">@RepConstructorA</a> <a href=\"RepConstructorA.html"
- + "\" title=\"annotation in typeannos\">@RepConstructorA</a>\n<a href="
- + "\"RepConstructorB.html\" title=\"annotation in typeannos"
- + "\">@RepConstructorB</a> <a href=\"RepConstructorB.html"
- + "\" title=\"annotation in typeannos\">@RepConstructorB</a>\n"
- + "RepeatingOnConstructor()</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">"
+ + "@RepConstructorA</a> <a href=\"RepConstructorA.html\" "
+ + "title=\"annotation in typeannos\">@RepConstructorA</a>\n"
+ + "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">"
+ + "@RepConstructorB</a> <a href=\"RepConstructorB.html\" "
+ + "title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ + "</span><span class=\"memberName\">RepeatingOnConstructor</span>()</div>",
- "<pre><a href=\"RepConstructorA.html\" title=\"annotation in typeannos"
- + "\">@RepConstructorA</a> <a href=\"RepConstructorA.html"
- + "\" title=\"annotation in typeannos\">@RepConstructorA</a>\n<a href="
- + "\"RepConstructorB.html\" title=\"annotation in typeannos"
- + "\">@RepConstructorB</a> <a href=\"RepConstructorB.html"
- + "\" title=\"annotation in typeannos\">@RepConstructorB</a>\n"
- + "RepeatingOnConstructor​(int i,\n int j)</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepConstructorA.html\" title=\"annotation in typeannos\">"
+ + "@RepConstructorA</a> <a href=\"RepConstructorA.html\" "
+ + "title=\"annotation in typeannos\">@RepConstructorA</a>\n"
+ + "<a href=\"RepConstructorB.html\" title=\"annotation in typeannos\">"
+ + "@RepConstructorB</a> <a href=\"RepConstructorB.html\" "
+ + "title=\"annotation in typeannos\">@RepConstructorB</a>\n"
+ + "</span><span class=\"memberName\">RepeatingOnConstructor</span>"
+ + "​(<span class=\"arguments\">int i,\n"
+ + "int j)</span></div>",
- "<pre><a href=\"RepAllContextsA.html\" title=\"annotation in typeannos"
- + "\">@RepAllContextsA</a> <a href=\"RepAllContextsA.html"
- + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
- + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos"
- + "\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html"
- + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
- + "RepeatingOnConstructor​(int i,\n int j,\n"
- + " int k)</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
+ + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ + "</span><span class=\"memberName\">RepeatingOnConstructor</span>"
+ + "​(<span class=\"arguments\">int i,\n"
+ + "int j,\nint k)</span></div>",
- "<pre>RepeatingOnConstructor​(<a href=\"RepParameterA.html"
- + "\" title=\"annotation in typeannos\">@RepParameterA</a> <a href="
- + "\"RepParameterA.html\" title=\"annotation in typeannos"
- + "\">@RepParameterA</a> <a href=\"RepParameterB.html"
- + "\" title=\"annotation in typeannos\">@RepParameterB</a> "
- + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos"
- + "\">@RepParameterB</a>\n java.lang.String parameter,\n"
- + " <a href=\"RepParameterA.html\" "
- + "title=\"annotation in typeannos\">@RepParameterA</a> <a href="
- + "\"RepParameterA.html\" title=\"annotation in typeannos\">"
- + "@RepParameterA</a> <a href=\"RepParameterB.html\" "
- + "title=\"annotation in typeannos\">@RepParameterB</a> <a href="
- + "\"RepParameterB.html\" title=\"annotation in typeannos\">"
- + "@RepParameterB</a>\n java.lang.String "
- + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
- + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> ... vararg)</pre>"
+ "<div class=\"memberSignature\"><span class=\"memberName\">RepeatingOnConstructor</span>"
+ + "​(<span class=\"arguments\"><a href=\"RepParameterA.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String parameter,\n<a href=\"RepParameterA.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)</span></div>"
);
checkOutput("typeannos/RepeatingOnConstructor.Inner.html", true,
"<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E(java.lang.String,"
+ "java.lang.String...)\">Inner</a></span>​(java.lang.String parameter,\n"
- + " java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> ... vararg)</code>",
- "Inner​(<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> RepeatingOnConstructor this,\n <a href="
- + "\"RepParameterA.html\" title=\"annotation in typeannos\">"
- + "@RepParameterA</a> <a href=\"RepParameterA.html\" title="
- + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"RepParameterB.html"
- + "\" title=\"annotation in typeannos\">@RepParameterB</a> <a href="
- + "\"RepParameterB.html\" title=\"annotation in typeannos\">"
- + "@RepParameterB</a>\n java.lang.String parameter,\n"
- + " <a href=\"RepParameterA.html\" title=\"annotation in typeannos\">"
- + "@RepParameterA</a> <a href=\"RepParameterA.html\" title="
- + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"RepParameterB.html"
- + "\" title=\"annotation in typeannos\">@RepParameterB</a> <a href="
- + "\"RepParameterB.html\" title=\"annotation in typeannos\">"
- + "@RepParameterB</a>\n java.lang.String <a href=\"RepTypeUseA.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseB</a> ... vararg)");
+ "Inner</span>​(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> RepeatingOnConstructor this,\n"
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String parameter,\n<a href=\"RepParameterA.html\" "
+ + "title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)</span>");
checkOutput("typeannos/RepeatingOnField.html", true,
"<code>(package private) java.lang.Integer</code></td>\n<th class=\"colSecond\" scope=\"row\">"
@@ -519,57 +542,55 @@
+ "\"memberNameLink\"><a href=\"#sa"
+ "\">sa</a></span></code>",
- "<pre><a href=\"RepFieldA.html\" title=\"annotation in typeannos\">"
- + "@RepFieldA</a> <a href=\"RepFieldA.html\" title="
- + "\"annotation in typeannos\">@RepFieldA</a>\n<a href=\"RepFieldB.html"
- + "\" title=\"annotation in typeannos\">@RepFieldB</a> <a href="
- + "\"RepFieldB.html\" title=\"annotation in typeannos\">"
- + "@RepFieldB</a>\njava.lang.Integer i1</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a> "
+ + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n"
+ + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> "
+ + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n"
+ + "</span><span class=\"returnType\">java.lang.Integer</span> "
+ + "<span class=\"memberName\">i1</span></div>",
- "<pre><a href=\"RepTypeUseA.html\" title=\"annotation in typeannos"
- + "\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
- + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer i2</pre>",
-
- "<pre><a href=\"RepFieldA.html\" title=\"annotation in typeannos\">"
- + "@RepFieldA</a> <a href=\"RepFieldA.html\" title="
- + "\"annotation in typeannos\">@RepFieldA</a>\n<a href=\"RepFieldB.html"
- + "\" title=\"annotation in typeannos\">@RepFieldB</a> <a href="
- + "\"RepFieldB.html\" title=\"annotation in typeannos\">"
- + "@RepFieldB</a>\n<a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.Integer i3</pre>",
+ "<div class=\"memberSignature\"><span class=\"returnType\">"
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "java.lang.Integer</span> <span class=\"memberName\">i2</span></div>",
- "<pre><a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html"
- + "\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
- + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html"
- + "\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
- + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
- + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
- + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html"
- + "\" title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.Integer i4</pre>",
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a> "
+ + "<a href=\"RepFieldA.html\" title=\"annotation in typeannos\">@RepFieldA</a>\n"
+ + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a> "
+ + "<a href=\"RepFieldB.html\" title=\"annotation in typeannos\">@RepFieldB</a>\n"
+ + "</span><span class=\"returnType\"><a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "java.lang.Integer</span> <span class=\"memberName\">i3</span></div>",
- "<pre>java.lang.String <a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html"
- + "\" title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> [] <a href="
- + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> [] sa</pre>");
+ "<div class=\"memberSignature\"><span class=\"annotations\">"
+ + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ + "</span><span class=\"returnType\"><a href=\"RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ + "java.lang.Integer</span> <span class=\"memberName\">i4</span></div>",
+
+ "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> [] "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> []"
+ + "</span> <span class=\"memberName\">sa</span></div>");
checkOutput("typeannos/RepeatingOnMethod.html", true,
"<code>(package private) java.lang.String</code></td>\n<th class=\"colSecond\" scope=\"row\">"
@@ -608,7 +629,7 @@
"<code><span class=\"memberNameLink\"><a href=\""
+ "#test5(java.lang.String,java.lang.String...)\">test5</a></span>"
- + "​(java.lang.String parameter,\n java.lang.String <a href="
+ + "​(java.lang.String parameter,\njava.lang.String <a href="
+ "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html"
@@ -616,69 +637,63 @@
+ "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseB</a> ... vararg)</code>",
- "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">"
- + "@RepMethodA</a> <a href=\"RepMethodA.html\" title="
- + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"RepMethodB.html\""
- + " title=\"annotation in typeannos\">@RepMethodB</a> <a href="
- + "\"RepMethodB.html\" title=\"annotation in typeannos\">"
- + "@RepMethodB</a>\njava.lang.String test1()",
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a> "
+ + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ + "</span><span class=\"returnType\">java.lang.String</span> "
+ + "<span class=\"memberName\">test1</span>()",
"<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title="
+ "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String test2()",
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span>"
+ + " <span class=\"memberName\">test2</span>()",
- "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">"
- + "@RepMethodA</a> <a href=\"RepMethodA.html\" title="
- + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"RepMethodB.html\" "
- + "title=\"annotation in typeannos\">@RepMethodB</a> <a href="
- + "\"RepMethodB.html\" title=\"annotation in typeannos\">"
- + "@RepMethodB</a>\n<a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String test3()",
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a> "
+ + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ + "</span><span class=\"returnType\"><a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseB</a> java.lang.String</span> "
+ + "<span class=\"memberName\">test3</span>()",
- "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
- + "title=\"annotation in typeannos\">@RepAllContextsA</a>\n<a href="
- + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
- + "title=\"annotation in typeannos\">@RepAllContextsB</a>\n<a href="
- + "\"RepAllContextsA.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
- + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href="
- + "\"RepAllContextsB.html\" title=\"annotation in typeannos\">"
- + "@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
- + "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String test4()",
+ "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a> "
+ + "<a href=\"RepAllContextsA.html\" title=\"annotation in typeannos\">@RepAllContextsA</a>\n"
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a> "
+ + "<a href=\"RepAllContextsB.html\" title=\"annotation in typeannos\">@RepAllContextsB</a>\n"
+ + "</span><span class=\"returnType\"><a href=\"RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsA.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsA</a> <a href=\"RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a> <a href=\"RepAllContextsB.html\" "
+ + "title=\"annotation in typeannos\">@RepAllContextsB</a> java.lang.String</span> "
+ + "<span class=\"memberName\">test4</span>()",
- "java.lang.String test5​(<a href=\"RepTypeUseA.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseB</a> RepeatingOnMethod "
- + "this,\n <a href=\"RepParameterA.html\" "
- + "title=\"annotation in typeannos\">@RepParameterA</a> <a href="
- + "\"RepParameterA.html\" title=\"annotation in typeannos\">"
- + "@RepParameterA</a> <a href=\"RepParameterB.html\" "
- + "title=\"annotation in typeannos\">@RepParameterB</a> <a href="
- + "\"RepParameterB.html\" title=\"annotation in typeannos\">"
- + "@RepParameterB</a>\n java.lang.String parameter,\n"
- + " <a href=\"RepParameterA.html\" title="
- + "\"annotation in typeannos\">@RepParameterA</a> <a href=\"RepParameterA.html\""
- + " title=\"annotation in typeannos\">@RepParameterA</a> <a href="
- + "\"RepParameterB.html\" title=\"annotation in typeannos\">"
- + "@RepParameterB</a> <a href=\"RepParameterB.html\" title="
- + "\"annotation in typeannos\">@RepParameterB</a>\n "
- + "java.lang.String <a href=\"RepTypeUseA.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" "
- + "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
- + "\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
- + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title="
- + "\"annotation in typeannos\">@RepTypeUseB</a> ... vararg)");
+ "java.lang.String</span> <span class=\"memberName\">test5</span>​("
+ + "<span class=\"arguments\"><a href=\"RepTypeUseA.html\" "
+ + "title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">@RepTypeUseA</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a> "
+ + "<a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">@RepTypeUseB</a>"
+ + " RepeatingOnMethod this,\n"
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String parameter,\n"
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterA.html\" title=\"annotation in typeannos\">@RepParameterA</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a> "
+ + "<a href=\"RepParameterB.html\" title=\"annotation in typeannos\">@RepParameterB</a>\n"
+ + "java.lang.String <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> <a href=\"RepTypeUseB.html\" title=\"annotation in typeannos\">"
+ + "@RepTypeUseB</a> ... vararg)");
checkOutput("typeannos/RepeatingOnTypeParametersBoundsTypeArgumentsOnMethod.html", true,
"<code>(package private) <T> java.lang.String</code></td>\n"
@@ -699,7 +714,9 @@
+ "<span class=\"memberNameLink\"><a href=\"#"
+ "test()\">test</a></span>()</code>",
- "java.lang.String test​(<a href=\"RepTypeUseA.html\" "
+ "<span class=\"returnType\">java.lang.String</span> "
+ + "<span class=\"memberName\">test</span>"
+ + "​(<span class=\"arguments\"><a href=\"RepTypeUseA.html\" "
+ "title=\"annotation in typeannos\">@RepTypeUseA</a> <a href="
+ "\"RepTypeUseA.html\" title=\"annotation in typeannos\">"
+ "@RepTypeUseA</a> <a href=\"RepTypeUseB.html\" title="
@@ -713,11 +730,11 @@
+ "title=\"annotation in typeannos\">@RepTypeUseB</a> T> this)");
checkOutput("typeannos/RepeatingOnVoidMethodDeclaration.html", true,
- "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">"
- + "@RepMethodA</a> <a href=\"RepMethodA.html\" title="
- + "\"annotation in typeannos\">@RepMethodA</a>\n<a href=\"RepMethodB.html"
- + "\" title=\"annotation in typeannos\">@RepMethodB</a> <a href="
- + "\"RepMethodB.html\" title=\"annotation in typeannos\">"
- + "@RepMethodB</a>\nvoid test()");
+ "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a> "
+ + "<a href=\"RepMethodA.html\" title=\"annotation in typeannos\">@RepMethodA</a>\n"
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a> "
+ + "<a href=\"RepMethodB.html\" title=\"annotation in typeannos\">@RepMethodB</a>\n"
+ + "</span><span class=\"returnType\">void</span> "
+ + "<span class=\"memberName\">test</span>()");
}
}
--- a/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java Fri Jun 07 09:38:40 2019 -0700
@@ -54,7 +54,7 @@
checkExit(Exit.OK);
checkOutput("pkg/C.html", true,
- "<td class=\"colFirst\"><code><W extends java.lang.String,​V extends "
+ "<td class=\"colFirst\"><code><W extends java.lang.String,​\nV extends "
+ "java.util.List><br>java.lang.Object</code></td>",
"<code><T> java.lang.Object</code>");
--- a/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java Fri Jun 07 09:38:40 2019 -0700
@@ -272,7 +272,7 @@
checkOrder("p/C.html",
"METHOD DETAIL",
- "public", "void", "method()",
+ "public", "void", "method",
"See Also:",
"sub()",
"sub1()");
@@ -307,7 +307,7 @@
checkOrder("p/C.html",
"METHOD DETAIL",
- "public", "void", "method()", "See Also:", "sub()", "I.sub1()",
+ "public", "void", "method", "See Also:", "sub()", "I.sub1()",
"public", "void", "m", "Method in C. See", "I.length()"
);
@@ -411,10 +411,10 @@
checkOrder("p/C.html",
"METHOD DETAIL",
- "public", "void", "m()", "Method m in p.B",
- "public", "void", "n()", "Method n in p.A",
- "public", "void", "o()", "Description copied from class:", ">A<", "Method o in p.A",
- "public", "void", "p()", "Method p in p.B",
+ "public", "void", "m", "Method m in p.B",
+ "public", "void", "n", "Method n in p.A",
+ "public", "void", "o", "Description copied from class:", ">A<", "Method o in p.A",
+ "public", "void", "p", "Method p in p.B",
"END OF CLASS DATA");
checkOutput("p/C.html", false,
@@ -471,10 +471,10 @@
checkOrder("p/C.html",
"METHOD DETAIL",
- "public", "void", "m()", "Method m in p.B",
- "public", "void", "n()", "Method n in p.A",
- "public", "void", "o()", "Description copied from class:", ">A<", "Method o in p.A",
- "public", "void", "p()", "Method p in p.B",
+ "public", "void", "m", "Method m in p.B",
+ "public", "void", "n", "Method n in p.A",
+ "public", "void", "o", "Description copied from class:", ">A<", "Method o in p.A",
+ "public", "void", "p", "Method p in p.B",
"END OF CLASS DATA");
checkOutput("p/C.html", false,
--- a/test/langtools/jdk/jshell/CompletenessTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/jshell/CompletenessTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8149524 8131024 8165211 8080071 8130454 8167343 8129559 8114842 8182268
+ * @bug 8149524 8131024 8165211 8080071 8130454 8167343 8129559 8114842 8182268 8223782
* @summary Test SourceCodeAnalysis
* @build KullaTesting TestingInputStream
* @run testng CompletenessTest
@@ -328,6 +328,18 @@
assertStatus("/** test", DEFINITELY_INCOMPLETE, null);
}
+ public void testTextBlocks() {
+ assertStatus("\"\"\"", DEFINITELY_INCOMPLETE, null);
+ assertStatus("\"\"\"broken", DEFINITELY_INCOMPLETE, null);
+ assertStatus("\"\"\"\ntext", DEFINITELY_INCOMPLETE, null);
+ assertStatus("\"\"\"\ntext\"\"", DEFINITELY_INCOMPLETE, "\"\"\"\ntext\"\"\"");
+ assertStatus("\"\"\"\ntext\"\"\"", COMPLETE, "\"\"\"\ntext\"\"\"");
+ assertStatus("\"\"\"\ntext\\\"\"\"\"", COMPLETE, "\"\"\"\ntext\\\"\"\"\"");
+ assertStatus("\"\"\"\ntext\\\"\"\"", DEFINITELY_INCOMPLETE, null);
+ assertStatus("\"\"\"\ntext\\\"\"\"\\\"\"\"", DEFINITELY_INCOMPLETE, null);
+ assertStatus("\"\"\"\ntext\\\"\"\"\\\"\"\"\"\"\"", COMPLETE, "\"\"\"\ntext\\\"\"\"\\\"\"\"\"\"\"");
+ }
+
public void testMiscSource() {
assertStatus("if (t) if ", DEFINITELY_INCOMPLETE, "if (t) if"); //Bug
assertStatus("int m() {} dfd", COMPLETE, "int m() {}");
--- a/test/langtools/jdk/jshell/CompletionSuggestionTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/jdk/jshell/CompletionSuggestionTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -107,6 +107,8 @@
assertCompletionIncludesExcludes("new C() {}.|",
new HashSet<>(Arrays.asList("method()", "number")),
new HashSet<>(Arrays.asList("D", "E", "F", "H", "class")));
+ assertCompletion("\"\".leng|", "length()");
+ assertCompletion("\"\"\"\n\"\"\".leng|", "length()");
}
public void testStartOfExpression() {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8223942/ClientCodeWrappersShouldOverrideAllMethodsTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8223942
+ * @summary Missing methods in ClientCodeWrapper$WrappedJavaFileManager
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.util
+ */
+
+import java.lang.reflect.*;
+import java.io.*;
+
+import javax.tools.*;
+import java.nio.charset.StandardCharsets;
+import com.sun.tools.javac.api.JavacTaskImpl;
+
+public class ClientCodeWrappersShouldOverrideAllMethodsTest {
+ public static void main(String[] args) {
+ ClientCodeWrappersShouldOverrideAllMethodsTest clientCodeWrappersShouldOverrideAllMethodsTest = new ClientCodeWrappersShouldOverrideAllMethodsTest();
+ clientCodeWrappersShouldOverrideAllMethodsTest.testWrappersForJavaFileManager();
+ clientCodeWrappersShouldOverrideAllMethodsTest.testWrappersForStandardJavaFileManager();
+ }
+
+ void testWrappersForJavaFileManager() {
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager standardFileManager = compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8);
+ UserFileManager fileManager = new UserFileManager(standardFileManager);
+ JavacTaskImpl task = (JavacTaskImpl)compiler.getTask(null, fileManager, null, null, null, null);
+ JavaFileManager wrappedFM = task.getContext().get(JavaFileManager.class);
+ checkAllMethodsOverridenInWrapperClass(wrappedFM.getClass(), JavaFileManager.class);
+ }
+
+ void testWrappersForStandardJavaFileManager() {
+ JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+ StandardJavaFileManager standardFileManager = compiler.getStandardFileManager(null, null, StandardCharsets.UTF_8);
+ UserStandardJavaFileManager fileManager = new UserStandardJavaFileManager(standardFileManager);
+ JavacTaskImpl task = (JavacTaskImpl)compiler.getTask(null, fileManager, null, null, null, null);
+ JavaFileManager wrappedFM = task.getContext().get(JavaFileManager.class);
+ checkAllMethodsOverridenInWrapperClass(wrappedFM.getClass(), StandardJavaFileManager.class);
+ }
+
+ void checkAllMethodsOverridenInWrapperClass(Class<?> subClass, Class<?> superClass) {
+ Method[] allMethods = subClass.getMethods();
+ for (Method m : allMethods) {
+ if (m.getDeclaringClass() == superClass) {
+ throw new AssertionError(String.format("method %s not overriden by javac provided wrapper class", m.getName()));
+ }
+ }
+ }
+
+ static class UserFileManager extends ForwardingJavaFileManager<JavaFileManager> {
+ UserFileManager(JavaFileManager delegate) {
+ super(delegate);
+ }
+ }
+
+ static class UserStandardJavaFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> implements StandardJavaFileManager {
+ StandardJavaFileManager delegate;
+
+ UserStandardJavaFileManager(StandardJavaFileManager delegate) {
+ super(delegate);
+ this.delegate = delegate;
+ }
+
+ public Iterable<? extends File> getLocation(Location location) { return delegate.getLocation(location);}
+
+ public void setLocation(Location location, Iterable<? extends File> files) throws IOException {
+ delegate.setLocation(location, files);
+ }
+
+ public Iterable<? extends JavaFileObject> getJavaFileObjects(String... names) {
+ return delegate.getJavaFileObjects(names);
+ }
+
+ public Iterable<? extends JavaFileObject> getJavaFileObjectsFromStrings(Iterable<String> names) {
+ return delegate.getJavaFileObjectsFromStrings(names);
+ }
+
+ public Iterable<? extends JavaFileObject> getJavaFileObjectsFromFiles(Iterable<? extends File> files) {
+ return delegate.getJavaFileObjectsFromFiles(files);
+ }
+
+ public Iterable<? extends JavaFileObject> getJavaFileObjects(File... files) {
+ return delegate.getJavaFileObjects(files);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/TextBlockAPI.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8223967
+ * @summary Unit tests for Text Block language changes
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main TextBlockAPI
+ */
+
+import toolbox.JavacTask;
+import toolbox.JavaTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
+public class TextBlockAPI {
+ private static ToolBox TOOLBOX = new ToolBox();
+ private final static String JDK_VERSION = Integer.toString(Runtime.version().feature());
+
+ public static void main(String... args) {
+ test1();
+ test2();
+ test3();
+ test4();
+ }
+
+ /*
+ * Check that correct/incorrect syntax is properly detected
+ */
+ static void test1() {
+ for (String lineterminators : new String[] { "\n", "\r", "\r\n" })
+ for (String whitespace : new String[] { "", " ", "\t", "\u2002" })
+ for (String content : new String[] { "a", "ab", "abc", "\u2022", "*".repeat(1000), "*".repeat(10000) }) {
+ String code =
+ "public class CorrectTest {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = " +
+ "\"\"\"" + whitespace + lineterminators +
+ content +
+ "\"\"\";\n" +
+ " }\n" +
+ "}\n";
+ compPass(code);
+ }
+ }
+
+ /*
+ * Check that use of \u0022 is properly detected
+ */
+ static void test2() {
+ compPass("public class UnicodeDelimiterTest {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \\u0022\\u0022\\u0022\nabc\n\\u0022\\u0022\\u0022;\n" +
+ " }\n" +
+ "}\n");
+ }
+
+ /*
+ * Check edge cases of text blocks as last token
+ */
+ static void test3() {
+ compFail("public class EndTest {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc\"\"\"");
+ compFail("public class TwoQuoteClose {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc\"\"");
+ compFail("public class OneQuoteClose {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc\"");
+ compFail("public class NoClose {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc");
+ compFail("public class ZeroTerminator {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc\\u0000");
+ compFail("public class NonBreakingSpace {\n" +
+ " public static void main(String... args) {\n" +
+ " String xxx = \"\"\"\nabc\\u001A");
+ }
+
+ /*
+ * Check line terminator translation
+ */
+ static void test4() {
+ String[] terminators = new String[] { "\n", "\r\n", "\r" };
+ for (String terminator : terminators) {
+ String code = "public class LineTerminatorTest {" + terminator +
+ " public static void main(String... args) {" + terminator +
+ " String s =" + terminator +
+ "\"\"\"" + terminator +
+ "abc" + terminator +
+ "\"\"\";" + terminator +
+ " System.out.println(s.equals(\"abc\\n\"));" + terminator +
+ " }" + terminator +
+ "}" + terminator;
+ new JavacTask(TOOLBOX)
+ .sources(code)
+ .classpath(".")
+ .options("--enable-preview", "-source", JDK_VERSION, "-encoding", "utf8")
+ .run();
+ String output = new JavaTask(TOOLBOX)
+ .vmOptions("--enable-preview")
+ .classpath(".")
+ .classArgs("LineTerminatorTest")
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.STDOUT);
+
+ if (!output.contains("true")) {
+ throw new RuntimeException("Error detected");
+ }
+ }
+ }
+
+ /*
+ * Test source for successful compile.
+ */
+ static void compPass(String source) {
+ String output = new JavacTask(TOOLBOX)
+ .sources(source)
+ .classpath(".")
+ .options("--enable-preview", "-source", JDK_VERSION, "-encoding", "utf8")
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (output.contains("compiler.err")) {
+ throw new RuntimeException("Error detected");
+ }
+ }
+
+ /*
+ * Test source for unsuccessful compile and specific error.
+ */
+ static void compFail(String source) {
+ String errors = new JavacTask(TOOLBOX)
+ .sources(source)
+ .classpath(".")
+ .options("-XDrawDiagnostics", "--enable-preview", "-source", JDK_VERSION, "-encoding", "utf8")
+ .run(Task.Expect.FAIL)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!errors.contains("compiler.err")) {
+ throw new RuntimeException("No error detected");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/TextBlockLang.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8223967
+ * @summary Unit tests for Text Block language changes
+ * @compile --enable-preview -source ${jdk.version} -encoding utf8 TextBlockLang.java
+ * @run main/othervm --enable-preview TextBlockLang
+ */
+
+public class TextBlockLang {
+ public static void main(String... args) {
+ test1();
+ }
+
+ /*
+ * Test basic string functionality.
+ */
+ static void test1() {
+ EQ("""
+ """, "");
+ EQ("""
+ abc
+ """, "abc\n");
+ EQ("""
+
+ """, "\n");
+ EQ("""
+ "
+ """, "\"\n");
+ EQ("""
+ ""
+ """, "\"\"\n");
+ EQ("""
+ \"""
+ """, "\"\"\"\n");
+ EQ("""
+ "\""
+ """, "\"\"\"\n");
+ EQ("""
+ ""\"
+ """, "\"\"\"\n");
+ EQ("""
+ \r
+ """, "\r\n");
+ EQ("""
+ \u2022
+ """, "\u2022\n");
+ EQ("""
+ •
+ """, "\u2022\n");
+ LENGTH("""
+ abc
+ """, 4);
+ }
+
+
+ /*
+ * Raise an exception if the string is not the expected length.
+ */
+ static void LENGTH(String string, int length) {
+ if (string == null || string.length() != length) {
+ System.err.println("Failed LENGTH");
+ System.err.println(string + " " + length);
+ throw new RuntimeException("Failed LENGTH");
+ }
+ }
+
+ /*
+ * Raise an exception if the two input strings are not equal.
+ */
+ static void EQ(String input, String expected) {
+ if (input == null || expected == null || !expected.equals(input)) {
+ System.err.println("Failed EQ");
+ System.err.println();
+ System.err.println("Input:");
+ System.err.println(input.replaceAll(" ", "."));
+ System.err.println();
+ System.err.println("Expected:");
+ System.err.println(expected.replaceAll(" ", "."));
+ throw new RuntimeException();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/TextBlockCloseDelimiter.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ // key: compiler.warn.preview.feature.use.plural
+ // key: compiler.misc.feature.text.blocks
+ // key: compiler.err.unclosed.text.block
+ // options: --enable-preview -source ${jdk.version} -Xlint:preview
+
+class TextBlockCloseDelimiter {
+ String m() {
+ return """
+ ;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/TextBlockOpenDelimiter.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ // key: compiler.warn.preview.feature.use.plural
+ // key: compiler.misc.feature.text.blocks
+ // key: compiler.err.illegal.text.block.open
+ // options: --enable-preview -source ${jdk.version} -Xlint:preview
+
+class TextBlockOpenDelimiter {
+ String m() {
+ return """xxxx
+ """;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/TextBlockWhitespace.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ // key: compiler.warn.preview.feature.use.plural
+ // key: compiler.misc.feature.text.blocks
+ // key: compiler.warn.inconsistent.white.space.indentation
+ // key: compiler.warn.trailing.white.space.will.be.removed
+ // options: --enable-preview -source ${jdk.version} -Xlint:preview,text-blocks
+
+class TextBlockWhitespace {
+ String m() {
+ return """
+\u0009\u0009\u0009\u0009tab indentation
+\u0020\u0020\u0020\u0020space indentation and trailing space\u0020
+\u0020\u0020\u0020\u0020""";
+ }
+}
--- a/test/langtools/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/tools/javac/doctree/dcapi/DocCommentTreeApiTester.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -39,6 +39,7 @@
import java.io.PrintWriter;
import java.io.Reader;
import java.io.StringWriter;
+import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.BreakIterator;
@@ -98,14 +99,14 @@
test.runDocTreePath("Anchor.java", "package.html");
// test for correct parsing using valid and some invalid html tags
- test.runFileObjectTest("overview0.html");
- test.runFileObjectTest("overview1.html");
- test.runFileObjectTest("overview2.html");
- test.runFileObjectTest("overview3.html");
- test.runFileObjectTest("overview4.html");
- test.runFileObjectTest("overview5.html");
- test.runFileObjectTest("overview6.html");
- test.runFileObjectTest("overview7.html");
+ try (DirectoryStream<Path> ds = Files.newDirectoryStream(Path.of(testSrc))) {
+ for (Path entry: ds) {
+ String name = entry.getFileName().toString();
+ if (name.matches("overview[0-9]+\\.html")) {
+ test.runFileObjectTest(name);
+ }
+ }
+ }
} finally {
test.status();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/doctree/dcapi/overview8.html Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,9 @@
+<!-- /nodynamiccopyright/ -->
+<HTML>
+<HEAD>
+</HEAD>
+<BODY><MAIN>
+This is the content.
+@since 1.0
+</MAIN></BODY>
+</HTML>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/doctree/dcapi/overview8.html.out Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,35 @@
+EXPECT_START
+DocComment[DOC_COMMENT, pos:0
+ preamble: 6
+ Comment[COMMENT, pos:0, <!--_/nodynamiccopyright/_-->]
+ StartElement[START_ELEMENT, pos:30
+ name:HTML
+ attributes: empty
+ ]
+ StartElement[START_ELEMENT, pos:37
+ name:HEAD
+ attributes: empty
+ ]
+ EndElement[END_ELEMENT, pos:44, HEAD]
+ StartElement[START_ELEMENT, pos:52
+ name:BODY
+ attributes: empty
+ ]
+ StartElement[START_ELEMENT, pos:58
+ name:MAIN
+ attributes: empty
+ ]
+ firstSentence: 1
+ Text[TEXT, pos:65, This_is_the_content.]
+ body: empty
+ block tags: 1
+ Since[SINCE, pos:86
+ body: 1
+ Text[TEXT, pos:93, 1.0]
+ ]
+ postamble: 3
+ EndElement[END_ELEMENT, pos:97, MAIN]
+ EndElement[END_ELEMENT, pos:104, BODY]
+ EndElement[END_ELEMENT, pos:112, HTML]
+]
+EXPECT_END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/doctree/dcapi/overview9.html Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,10 @@
+<!-- /nodynamiccopyright/ -->
+<HTML>
+<HEAD>
+</HEAD>
+<BODY lang="en">
+<main role="main">
+This is the content.
+@since 1.0
+</main></BODY>
+</HTML>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/doctree/dcapi/overview9.html.out Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,47 @@
+EXPECT_START
+DocComment[DOC_COMMENT, pos:0
+ preamble: 6
+ Comment[COMMENT, pos:0, <!--_/nodynamiccopyright/_-->]
+ StartElement[START_ELEMENT, pos:30
+ name:HTML
+ attributes: empty
+ ]
+ StartElement[START_ELEMENT, pos:37
+ name:HEAD
+ attributes: empty
+ ]
+ EndElement[END_ELEMENT, pos:44, HEAD]
+ StartElement[START_ELEMENT, pos:52
+ name:BODY
+ attributes: 1
+ Attribute[ATTRIBUTE, pos:58
+ name: lang
+ vkind: DOUBLE
+ value: 1
+ Text[TEXT, pos:64, en]
+ ]
+ ]
+ StartElement[START_ELEMENT, pos:69
+ name:main
+ attributes: 1
+ Attribute[ATTRIBUTE, pos:75
+ name: role
+ vkind: DOUBLE
+ value: 1
+ Text[TEXT, pos:81, main]
+ ]
+ ]
+ firstSentence: 1
+ Text[TEXT, pos:88, This_is_the_content.]
+ body: empty
+ block tags: 1
+ Since[SINCE, pos:109
+ body: 1
+ Text[TEXT, pos:116, 1.0]
+ ]
+ postamble: 3
+ EndElement[END_ELEMENT, pos:120, main]
+ EndElement[END_ELEMENT, pos:127, BODY]
+ EndElement[END_ELEMENT, pos:135, HTML]
+]
+EXPECT_END
--- a/test/langtools/tools/javap/WhitespaceTest.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/langtools/tools/javap/WhitespaceTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -37,8 +37,8 @@
}
void run() throws Exception {
- test("-v", "java.lang.String");
- test("-XDtab:1", "-v", "java.lang.String");
+ test("-v", "java.lang.Object");
+ test("-XDtab:1", "-v", "java.lang.Object");
String testClasses = System.getProperty("test.classes");
for (int i = 10; i < 40; i++)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javap/default_methods/JavapNotPrintingDefaultModifierTest.java Fri Jun 07 09:38:40 2019 -0700
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test 8216261
+ * @summary Javap ignores default modifier on interfaces
+ * @library /tools/lib
+ * @modules jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.ToolBox toolbox.JavapTask
+ * @run main JavapNotPrintingDefaultModifierTest
+ */
+
+import java.nio.file.*;
+import java.util.*;
+
+import toolbox.JavapTask;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+import toolbox.Task;
+
+public class JavapNotPrintingDefaultModifierTest extends TestRunner {
+ ToolBox tb = new ToolBox();
+
+ interface SimpleInterface {
+ default void defaultMethod() {}
+ void foo();
+ }
+
+ private static final List<String> expectedOutput = List.of(
+ "Compiled from \"JavapNotPrintingDefaultModifierTest.java\"",
+ "interface JavapNotPrintingDefaultModifierTest$SimpleInterface {",
+ " public default void defaultMethod();",
+ " public abstract void foo();",
+ "}");
+
+ JavapNotPrintingDefaultModifierTest() throws Exception {
+ super(System.err);
+ }
+
+ public static void main(String... args) throws Exception {
+ JavapNotPrintingDefaultModifierTest tester = new JavapNotPrintingDefaultModifierTest();
+ tester.runTests();
+ }
+
+ protected void runTests() throws Exception {
+ runTests(m -> new Object[] { Paths.get(m.getName()) });
+ }
+
+ @Test
+ public void testMain(Path base) throws Exception {
+ Path testClassesPath = Paths.get(System.getProperty("test.classes"));
+ List<String> output = new JavapTask(tb)
+ .options("-p", testClassesPath.resolve(this.getClass().getSimpleName() + "$SimpleInterface.class").toString())
+ .run()
+ .writeAll()
+ .getOutputLines(Task.OutputKind.DIRECT);
+ System.out.println(output);
+ if (!output.equals(expectedOutput)) {
+ throw new AssertionError(String.format("unexpected output:\n %s", output));
+ }
+ }
+}
--- a/test/lib/jdk/test/lib/Utils.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/lib/jdk/test/lib/Utils.java Fri Jun 07 09:38:40 2019 -0700
@@ -815,4 +815,24 @@
Path dir = Paths.get(System.getProperty("user.dir", "."));
return Files.createTempFile(dir, prefix, suffix);
}
+
+ /**
+ * Creates an empty directory in "user.dir" or "."
+ * <p>
+ * This method is meant as a replacement for {@code Files#createTempDirectory(String, String, FileAttribute...)}
+ * that doesn't leave files behind in /tmp directory of the test machine
+ * <p>
+ * If the property "user.dir" is not set, "." will be used.
+ *
+ * @param prefix
+ * @param attrs
+ * @return the path to the newly created directory
+ * @throws IOException
+ *
+ * @see {@link Files#createTempDirectory(String, String, FileAttribute...)}
+ */
+ public static Path createTempDirectory(String prefix, FileAttribute<?>... attrs) throws IOException {
+ Path dir = Paths.get(System.getProperty("user.dir", "."));
+ return Files.createTempDirectory(dir, prefix);
+ }
}
--- a/test/lib/jdk/test/lib/util/FileUtils.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/lib/jdk/test/lib/util/FileUtils.java Fri Jun 07 09:38:40 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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,6 +25,8 @@
import jdk.test.lib.Platform;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
import java.io.IOException;
import java.io.PrintStream;
import java.io.UncheckedIOException;
@@ -45,6 +47,8 @@
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.TimeUnit;
/**
@@ -238,6 +242,93 @@
}
/**
+ * Checks whether all file systems are accessible. This is performed
+ * by checking free disk space on all mounted file systems via a
+ * separate, spawned process. File systems are considered to be
+ * accessible if this process completes successfully before a given
+ * fixed duration has elapsed.
+ *
+ * @implNote On Unix this executes the {@code df} command in a separate
+ * process and on Windows always returns {@code true}.
+ *
+ * @return whether file systems appear to be accessible
+ *
+ * @throws RuntimeException if there are duplicate mount points or some
+ * other execution problem occurs
+ */
+ public static boolean areAllMountPointsAccessible() {
+ final AtomicBoolean areMountPointsOK = new AtomicBoolean(true);
+ if (!IS_WINDOWS) {
+ Thread thr = new Thread(() -> {
+ try {
+ Process proc = new ProcessBuilder("df").start();
+ BufferedReader reader = new BufferedReader
+ (new InputStreamReader(proc.getInputStream()));
+ // Skip the first line as it is the "df" output header.
+ if (reader.readLine() != null ) {
+ String prevMountPoint = null, mountPoint = null;
+ while ((mountPoint = reader.readLine()) != null) {
+ if (prevMountPoint != null &&
+ mountPoint.equals(prevMountPoint)) {
+ throw new RuntimeException
+ ("System configuration error: " +
+ "duplicate mount point " + mountPoint +
+ " detected");
+ }
+ prevMountPoint = mountPoint;
+ }
+ }
+
+ try {
+ proc.waitFor(90, TimeUnit.SECONDS);
+ } catch (InterruptedException ignored) {
+ }
+ try {
+ int exitValue = proc.exitValue();
+ if (exitValue != 0) {
+ System.err.printf("df process exited with %d != 0%n",
+ exitValue);
+ areMountPointsOK.set(false);
+ }
+ } catch (IllegalThreadStateException ignored) {
+ System.err.println("df command apparently hung");
+ areMountPointsOK.set(false);
+ }
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ };
+ });
+
+ final AtomicReference throwableReference =
+ new AtomicReference<Throwable>();
+ thr.setUncaughtExceptionHandler(
+ new Thread.UncaughtExceptionHandler() {
+ public void uncaughtException(Thread t, Throwable e) {
+ throwableReference.set(e);
+ }
+ });
+
+ thr.start();
+ try {
+ thr.join(120*1000L);
+ } catch (InterruptedException ie) {
+ throw new RuntimeException(ie);
+ }
+
+ Throwable uncaughtException = (Throwable)throwableReference.get();
+ if (uncaughtException != null) {
+ throw new RuntimeException(uncaughtException);
+ }
+
+ if (thr.isAlive()) {
+ throw new RuntimeException("df thread did not join in time");
+ }
+ }
+
+ return areMountPointsOK.get();
+ }
+
+ /**
* List the open file descriptors (if supported by the 'lsof' command).
* @param ps a printStream to send the output to
* @throws UncheckedIOException if an error occurs
--- a/test/micro/org/openjdk/bench/java/util/regex/PatternBench.java Thu Jun 06 15:46:36 2019 +0300
+++ b/test/micro/org/openjdk/bench/java/util/regex/PatternBench.java Fri Jun 07 09:38:40 2019 -0700
@@ -45,12 +45,13 @@
public String fileTestString;
public String flagsString;
-
public Pattern graphemePattern;
public Pattern jmodPattern;
public Pattern jmodCanonicalPattern;
- public Pattern pattern;
+ public String charPatternRegex;
+ public String[] charPatternStrings;
+ public Pattern charPattern;
@Setup
public void setup() {
@@ -61,6 +62,10 @@
String jmodRegex = "^.*(?:(?:_the\\.[^/]*)|(?:_[^/]*\\.marker)|(?:[^/]*\\.diz)|(?:[^/]*\\.debuginfo)|(?:[^/]*\\.dSYM/.*)|(?:[^/]*\\.dSYM)|(?:[^/]*\\.pdb)|(?:[^/]*\\.map))$";
jmodCanonicalPattern = Pattern.compile(jmodRegex, Pattern.CANON_EQ);
jmodPattern = Pattern.compile(jmodRegex);
+
+ charPatternRegex = "[ a-zA-Z]*foo[ a-zA-Z0-9]*bar[ a-z]*";
+ charPatternStrings = new String[] {"avaaafooddddddbariiii", "lorem ipsum dolor foo bar", "fpp brr lorem ipsum dolor foo bar %", "lorem ipsum dolor foo bar lorem ipsum dolor foo bar lorem ipsum dolor foo bar /"};
+ charPattern = Pattern.compile(charPatternRegex);
}
@Benchmark
@@ -83,4 +88,30 @@
public boolean normalJmodMatch() {
return jmodPattern.matcher(fileTestString).matches();
}
+
+ @Benchmark
+ @Warmup(iterations = 3)
+ @Measurement(iterations = 3)
+ public boolean charPatternMatch() {
+ return charPattern.matcher(charPatternStrings[0]).matches()
+ && charPattern.matcher(charPatternStrings[1]).matches()
+ && charPattern.matcher(charPatternStrings[2]).matches();
+ }
+
+ @Benchmark
+ @Warmup(iterations = 3)
+ @Measurement(iterations = 3)
+ public boolean charPatternMatchWithCompile() {
+ Pattern p = Pattern.compile(charPatternRegex);
+ return p.matcher(charPatternStrings[0]).matches()
+ && p.matcher(charPatternStrings[1]).matches()
+ && p.matcher(charPatternStrings[2]).matches();
+ }
+
+ @Benchmark
+ @Warmup(iterations = 3)
+ @Measurement(iterations = 3)
+ public Pattern charPatternCompile() {
+ return Pattern.compile(charPatternRegex);
+ }
}