Skip to content

Commit d37951e

Browse files
ziyilinziyilin
committed
Merge 'jdk8u272-ga'
2 parents ee0c0af + e5d438e commit d37951e

8 files changed

+144
-28
lines changed

‎.hgtags

+15
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,22 @@ bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06
10051005
908e7985b3393370a417db1254ab4585ea954b2f jdk8u262-b03
10061006
e1a42471eb39cb9340608238cd67b1938f73632e jdk8u262-b04
10071007
ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u262-b05
1008+
ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u272-b00
10081009
2f973e405849e5e5fbe1b95ad1f37dc19cd046bc jdk8u262-b06
10091010
4f5c1e68c85ec157a86505613e1aec3f4528957b jdk8u262-b07
10101011
59b2de0b2c60f7ae444a43c76fc96260351172a3 jdk8u262-b08
10111012
2bab25ddc567a2fe5038cb49cf5586dfb4c32ff2 jdk8u262-b09
1013+
94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-b10
1014+
94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-ga
1015+
94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u265-b00
1016+
6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-b01
1017+
6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-ga
1018+
1bda51d3d528f884afe13b4a810390e3aa2464a8 jdk8u272-b01
1019+
1059e4b7426a1ab9c52ce9aa55daf11d97b13607 jdk8u272-b02
1020+
fbad06cacb73f4ca1701c789f7c1bc3f5c6f08c9 jdk8u272-b03
1021+
a0dd128191fdce8034be8bd4c7a1f47ee2426e6d jdk8u272-b04
1022+
afbc213b114cfc20b07318d4c1b2550211e77682 jdk8u272-b05
1023+
e68b51b4e55a792c78f6f043738e75755571d92d jdk8u272-b06
1024+
fec6ed779ae6ebe1cd2b3a97963026b3104f8ded jdk8u272-b07
1025+
34c6baf214648afedf83625ed18a2650ed280c36 jdk8u272-b08
1026+
7f60c2d9823ea2928db8eee582fbc736bd8d962c jdk8u272-b09

‎THIRD_PARTY_README

+40-3
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
22402240

22412241
-------------------------------------------------------------------------------
22422242

2243-
%% This notice is provided with respect to PC/SC Lite v1.8.24,
2243+
%% This notice is provided with respect to PC/SC Lite v1.8.26,
22442244
which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
22452245

22462246
--- begin of LICENSE ---
@@ -3028,8 +3028,7 @@ included with JRE 8, JDK 8, and OpenJDK 8.
30283028
Apache Commons Math 3.2
30293029
Apache Derby 10.11.1.2
30303030
Apache Jakarta BCEL 5.1
3031-
Apache Jakarta Regexp 1.4
3032-
Apache Santuario XML Security for Java 1.5.4
3031+
Apache Santuario XML Security for Java 2.1.1
30333032
Apache Xalan-Java 2.7.2
30343033
Apache Xerces Java 2.10.0
30353034
Apache XML Resolver 1.1
@@ -3243,3 +3242,41 @@ included with JRE 8, JDK 8, and OpenJDK 8.
32433242

32443243
-------------------------------------------------------------------------------
32453244

3245+
%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
3246+
Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8.
3247+
3248+
--- begin of LICENSE ---
3249+
3250+
Copyright (c) OASIS Open 2016. All Rights Reserved.
3251+
3252+
All capitalized terms in the following text have the meanings assigned to them
3253+
in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
3254+
full Policy may be found at the OASIS website:
3255+
[http://www.oasis-open.org/policies-guidelines/ipr]
3256+
3257+
This document and translations of it may be copied and furnished to others, and
3258+
derivative works that comment on or otherwise explain it or assist in its
3259+
implementation may be prepared, copied, published, and distributed, in whole or
3260+
in part, without restriction of any kind, provided that the above copyright
3261+
notice and this section are included on all such copies and derivative works.
3262+
However, this document itself may not be modified in any way, including by
3263+
removing the copyright notice or references to OASIS, except as needed for the
3264+
purpose of developing any document or deliverable produced by an OASIS
3265+
Technical Committee (in which case the rules applicable to copyrights, as set
3266+
forth in the OASIS IPR Policy, must be followed) or as required to translate it
3267+
into languages other than English.
3268+
3269+
The limited permissions granted above are perpetual and will not be revoked by
3270+
OASIS or its successors or assigns.
3271+
3272+
This document and the information contained herein is provided on an "AS IS"
3273+
basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
3274+
LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
3275+
INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
3276+
FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
3277+
ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
3278+
OF THIS DOCUMENT OR ANY PART THEREOF.
3279+
3280+
--- end of LICENSE ---
3281+
3282+
-------------------------------------------------------------------------------

‎common/autoconf/generated-configure.sh

+17-9
Original file line numberDiff line numberDiff line change
@@ -1857,7 +1857,7 @@ Optional Features:
18571857
run the Queens test after Hotspot build [disabled]
18581858
--enable-unlimited-crypto
18591859
Enable unlimited crypto policy [disabled]
1860-
--enable-jfr Enable Java Flight Recorder support [disabled]
1860+
--disable-jfr Disable Java Flight Recorder support [enabled]
18611861
--disable-debug-symbols disable generation of debug symbols [enabled]
18621862
--disable-zip-debug-info
18631863
disable zipping of debug-info files [enabled]
@@ -4394,7 +4394,7 @@ VS_SDK_PLATFORM_NAME_2017=
43944394
#CUSTOM_AUTOCONF_INCLUDE
43954395

43964396
# Do not change or remove the following line, it is needed for consistency checks:
4397-
DATE_WHEN_GENERATED=1589212500
4397+
DATE_WHEN_GENERATED=1591143270
43984398

43994399
###############################################################################
44004400
#
@@ -19822,27 +19822,35 @@ fi
1982219822
#
1982319823
# Enable or disable JFR
1982419824
#
19825-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
19826-
$as_echo_n "checking whether to build jfr... " >&6; }
19825+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5
19826+
$as_echo_n "checking whether to build JFR... " >&6; }
1982719827
# Check whether --enable-jfr was given.
1982819828
if test "${enable_jfr+set}" = set; then :
1982919829
enableval=$enable_jfr;
1983019830
else
1983119831
enable_jfr=auto
1983219832
fi
1983319833

19834-
if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
19834+
if test "x$enable_jfr" = "xno"; then
1983519835
ENABLE_JFR=false
19836-
elif test "x$enable_jfr" = "xyes" ; then
19836+
elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
1983719837
if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
19838-
as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
19838+
if test "x$enable_jfr" = "xyes"; then
19839+
as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
19840+
else
19841+
ENABLE_JFR=false
19842+
fi
1983919843
elif test "x$OPENJDK_TARGET_OS" = xaix; then
19840-
as_fn_error $? "AIX does not support JFR" "$LINENO" 5
19844+
if test "x$enable_jfr" = "xyes"; then
19845+
as_fn_error $? "AIX does not support JFR" "$LINENO" 5
19846+
else
19847+
ENABLE_JFR=false
19848+
fi
1984119849
else
1984219850
ENABLE_JFR=true
1984319851
fi
1984419852
else
19845-
as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
19853+
as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5
1984619854
fi
1984719855
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
1984819856
$as_echo "$ENABLE_JFR" >&6; }

‎common/autoconf/jdk-options.m4

+16-8
Original file line numberDiff line numberDiff line change
@@ -437,22 +437,30 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
437437
#
438438
# Enable or disable JFR
439439
#
440-
AC_MSG_CHECKING([whether to build jfr])
441-
AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
442-
[Enable Java Flight Recorder support @<:@disabled@:>@])],,
440+
AC_MSG_CHECKING([whether to build JFR])
441+
AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
442+
[Disable Java Flight Recorder support @<:@enabled@:>@])],,
443443
[enable_jfr=auto])
444-
if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
444+
if test "x$enable_jfr" = "xno"; then
445445
ENABLE_JFR=false
446-
elif test "x$enable_jfr" = "xyes" ; then
446+
elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
447447
if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
448-
AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
448+
if test "x$enable_jfr" = "xyes"; then
449+
AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
450+
else
451+
ENABLE_JFR=false
452+
fi
449453
elif test "x$OPENJDK_TARGET_OS" = xaix; then
450-
AC_MSG_ERROR([AIX does not support JFR])
454+
if test "x$enable_jfr" = "xyes"; then
455+
AC_MSG_ERROR([AIX does not support JFR])
456+
else
457+
ENABLE_JFR=false
458+
fi
451459
else
452460
ENABLE_JFR=true
453461
fi
454462
else
455-
AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
463+
AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
456464
fi
457465
AC_MSG_RESULT([$ENABLE_JFR])
458466
AC_SUBST(ENABLE_JFR)

‎dragonwell_version

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
2020
#
2121

22-
DRAGONWELL_VERSION=8.4.4
23-
DRAGONWELL_JDK_UPDATE_VERSION=262
22+
DRAGONWELL_VERSION=8.5.4
23+
DRAGONWELL_JDK_UPDATE_VERSION=272

‎get_source_dragonwell.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,14 @@ for repo in ${subrepos}; do
105105
# checkout to specific branch
106106
if [ $BRANCH != "master" ]; then
107107
cd ${repo}
108-
${GIT} checkout -b ${BRANCH} origin/${BRANCH}
108+
${GIT} checkout origin/${BRANCH} -b ${BRANCH}
109109
result=$?
110110
if [ $result != 0 ]; then
111-
error "failed to checkout ${repo} to ${BRANCH}"
111+
${GIT} checkout tags/${BRANCH} -b ${BRANCH}
112+
result=$?
113+
if [ $result != 0 ]; then
114+
error "failed to checkout ${repo} to ${BRANCH}"
115+
fi
112116
fi
113117
cd ..
114118
fi

‎make/Javadoc.gmk

+37-1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,11 @@ JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
221221
JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
222222
PLATFORM_DOCSDIR = $(DOCSDIR)/platform
223223

224+
JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
225+
JAVADOC_ARCHIVE_ASSEMBLY_DIR := $(DOCSTMPDIR)/docs-zip
226+
JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
227+
JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
228+
224229
# The non-core api javadocs need to be able to access the root of the core
225230
# api directory, so for jdk/api or jre/api to get to the core api/
226231
# directory we would use this:
@@ -329,6 +334,37 @@ include NON_CORE_PKGS.gmk
329334
all: docs
330335
docs: coredocs otherdocs
331336

337+
#
338+
# Optional target which bundles all generated javadocs into a zip
339+
# archive. The dependency on docs is handled in Main.gmk. Incremental
340+
# building of docs is currently broken so if you invoke docs-zip after
341+
# docs, the docs are always rebuilt.
342+
#
343+
344+
docs-zip: $(JAVADOC_ARCHIVE)
345+
346+
#
347+
# Add the core docs as prerequisite to the archive to trigger a rebuild
348+
# if the core docs were rebuilt. Ideally any doc rebuild should trigger
349+
# this, but the way prerequisites are currently setup in this file, that
350+
# is hard to achieve.
351+
#
352+
353+
$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
354+
@$(ECHO) $(LOG_INFO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)"
355+
$(MKDIR) -p $(JAVADOC_ARCHIVE_DIR)
356+
$(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
357+
$(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
358+
all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html | grep -v old/doclet `; \
359+
pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
360+
for index_file in $${all_roots} ; do \
361+
target_dir=`dirname $${index_file}`; \
362+
name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
363+
$(LN) -s $${target_dir} $${name}; \
364+
done; \
365+
$(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
366+
popd ;
367+
332368
#################################################################
333369
# Production Targets -- USE THESE TARGETS WHEN:
334370
# a) You're generating docs outside of release engineering's
@@ -1372,4 +1408,4 @@ clean:
13721408

13731409
#############################################################
13741410
.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
1375-
sanitycheckcoredocs $(ALL_OTHER_TARGETS)
1411+
sanitycheckcoredocs $(ALL_OTHER_TARGETS) docs-zip

‎make/Main.gmk

+11-3
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ docs-only: start-make
161161
@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
162162
@$(call TargetExit)
163163

164+
docs-zip: docs docs-zip-only
165+
docs-zip-only: start-make
166+
@$(call TargetEnter)
167+
@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
168+
@$(call TargetExit)
169+
164170
sign-jars: jdk sign-jars-only
165171
sign-jars-only: start-make
166172
@$(call TargetEnter)
@@ -235,6 +241,8 @@ clean-bootcycle-build:
235241
clean-docs:
236242
$(call CleanComponent,docs)
237243
$(call CleanComponent,docstemp)
244+
clean-docs-zip:
245+
$(call CleanComponent,bundles/jdk-*-docs.zip)
238246
clean-test:
239247
$(call CleanComponent,testoutput)
240248

@@ -246,10 +254,10 @@ reconfigure:
246254
endif
247255
@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
248256

249-
.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
250-
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
257+
.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs docs-zip
258+
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only docs-zip-only
251259
.PHONY: default all clean dist-clean bootcycle-images start-make
252-
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
260+
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-docs-zip clean-test clean-overlay-images clean-bootcycle-build
253261
.PHONY: profiles profiles-only
254262

255263
include $(root_dir)/make/Jprt.gmk

0 commit comments

Comments
 (0)