Skip to content

Commit ef2f9e4

Browse files
committed
Merge ac289dd into ac13056
2 parents ac13056 + ac289dd commit ef2f9e4

File tree

1,305 files changed

+67015
-18270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,305 files changed

+67015
-18270
lines changed

.jcheck/conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[general]
22
project=jdk-updates
33
jbs=JDK
4-
version=17.0.15
4+
version=17.0.16
55

66
[checks]
77
error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

closed/openjdk-tag.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OPENJDK_TAG := jdk-17.0.15+6
1+
OPENJDK_TAG := jdk-17.0.16+1

make/Bundles.gmk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,10 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
242242
)
243243

244244
JDK_SYMBOLS_BUNDLE_FILES := \
245-
$(call FindFiles, $(SYMBOLS_IMAGE_DIR))
245+
$(filter-out \
246+
%.stripped.pdb, \
247+
$(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
248+
)
246249

247250
TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
248251
$(ALL_JDK_DEMOS_FILES))

make/autoconf/basic.m4

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -452,7 +452,9 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
452452
AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
453453
[
454454
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
455-
file_to_test="$TOPDIR/LICENSE"
455+
# The choice of file here is somewhat arbitrary, it just needs to be there
456+
# in the source tree when configure runs
457+
file_to_test="$TOPDIR/Makefile"
456458
if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
457459
AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
458460
fi

make/autoconf/jdk-options.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
210210
211211
# Setup default CDS alignment. For OpenJ9 it needs to be false.
212212
COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
213-
AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
214213
215214
# Compress jars
216215
COMPRESS_JARS=false

make/conf/version-numbers.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828

2929
DEFAULT_VERSION_FEATURE=17
3030
DEFAULT_VERSION_INTERIM=0
31-
DEFAULT_VERSION_UPDATE=15
31+
DEFAULT_VERSION_UPDATE=16
3232
DEFAULT_VERSION_PATCH=0
3333
DEFAULT_VERSION_EXTRA1=0
3434
DEFAULT_VERSION_EXTRA2=0
3535
DEFAULT_VERSION_EXTRA3=0
36-
DEFAULT_VERSION_DATE=2025-04-15
36+
DEFAULT_VERSION_DATE=2025-07-15
3737
DEFAULT_VERSION_CLASSFILE_MAJOR=61 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_VERSION_DOCS_API_SINCE=11
4040
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
4141
DEFAULT_JDK_SOURCE_TARGET_VERSION=17
42-
DEFAULT_PROMOTED_VERSION_PRE=
42+
DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/cacerts/baltimorecybertrustca

Lines changed: 0 additions & 28 deletions
This file was deleted.

make/data/tzdata/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# or visit www.oracle.com if you need additional information or have any
2222
# questions.
2323
#
24-
tzdata2025a
24+
tzdata2025b

make/data/tzdata/asia

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,16 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
15231523
# (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977).
15241524
# UIT is the Operational Bulletin of International Telecommunication Union.
15251525

1526+
# From Roozbeh Pournader (2025-03-18):
1527+
# ... the exact time of Iran's transition from +0400 to +0330 ... was Friday
1528+
# 1357/8/19 AP=1978-11-10. Here's a newspaper clip from the Ettela'at
1529+
# newspaper, dated 1357/8/14 AP=1978-11-05, translated from Persian
1530+
# (at https://w.wiki/DUEY):
1531+
# Following the government's decision about returning the official time
1532+
# to the previous status, the spokesperson for the Ministry of Energy
1533+
# announced today: At the hour 24 of Friday 19th of Aban (=1978-11-10),
1534+
# the country's time will be pulled back half an hour.
1535+
#
15261536
# From Roozbeh Pournader (2003-03-15):
15271537
# This is an English translation of what I just found (originally in Persian).
15281538
# The Gregorian dates in brackets are mine:
@@ -1650,7 +1660,7 @@ Rule Iran 2021 2022 - Sep 21 24:00 0 -
16501660
Zone Asia/Tehran 3:25:44 - LMT 1916
16511661
3:25:44 - TMT 1935 Jun 13 # Tehran Mean Time
16521662
3:30 Iran %z 1977 Oct 20 24:00
1653-
4:00 Iran %z 1979
1663+
4:00 Iran %z 1978 Nov 10 24:00
16541664
3:30 Iran %z
16551665

16561666

make/data/tzdata/northamerica

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,6 +1634,15 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9
16341634
# For more on Orillia, see: Daubs K. Bold attempt at daylight saving
16351635
# time became a comic failure in Orillia. Toronto Star 2017-07-08.
16361636
# https://www.thestar.com/news/insight/2017/07/08/bold-attempt-at-daylight-saving-time-became-a-comic-failure-in-orillia.html
1637+
# From Paul Eggert (2025-03-20):
1638+
# Also see the 1912-06-17 front page of The Evening Sunbeam,
1639+
# reproduced in: Richardson M. "Daylight saving was a confusing
1640+
# time in Orillia" in the 2025-03-15 Orillia Matters. Richardson writes,
1641+
# "The first Sunday after the switch was made, [DST proponent and
1642+
# Orillia mayor William Sword] Frost walked into church an hour late.
1643+
# This became a symbol of the downfall of daylight saving in Orillia."
1644+
# The mayor became known as "Daylight Bill".
1645+
# https://www.orilliamatters.com/local-news/column-daylight-saving-was-a-confusing-time-in-orillia-10377529
16371646

16381647
# From Mark Brader (2010-03-06):
16391648
#

0 commit comments

Comments
 (0)