Skip to content

Commit 7294afb

Browse files
mrserbmrserb
authored
Merge branch 'openjdk:master' into backport-mrserb-51be7db9-master
2 parents fc00dff + 341fc38 commit 7294afb

File tree

167 files changed

+1066
-2775
lines changed

Some content is hidden

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

167 files changed

+1066
-2775
lines changed

‎.github/actions/do-build/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2022, 2025, 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
@@ -42,7 +42,7 @@ runs:
4242
- name: 'Build'
4343
id: build
4444
run: >
45-
make LOG=info ${{ inputs.make-target }}
45+
make -k LOG=info ${{ inputs.make-target }}
4646
|| bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
4747
shell: bash
4848

‎.github/workflows/build-cross-compile.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,23 @@ jobs:
5959
gnu-arch: aarch64
6060
debian-arch: arm64
6161
debian-repository: https://httpredir.debian.org/debian/
62-
debian-version: bullseye
62+
debian-version: bookworm
6363
- target-cpu: arm
6464
gnu-arch: arm
6565
debian-arch: armhf
6666
debian-repository: https://httpredir.debian.org/debian/
67-
debian-version: bullseye
67+
debian-version: bookworm
6868
gnu-abi: eabihf
6969
- target-cpu: s390x
7070
gnu-arch: s390x
7171
debian-arch: s390x
7272
debian-repository: https://httpredir.debian.org/debian/
73-
debian-version: bullseye
73+
debian-version: bookworm
7474
- target-cpu: ppc64le
7575
gnu-arch: powerpc64le
7676
debian-arch: ppc64el
7777
debian-repository: https://httpredir.debian.org/debian/
78-
debian-version: bullseye
78+
debian-version: bookworm
7979

8080
steps:
8181
- name: 'Checkout the JDK source'

‎.github/workflows/build-windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ env:
6363
jobs:
6464
build-windows:
6565
name: build
66-
runs-on: windows-2019
66+
runs-on: windows-2025
6767
defaults:
6868
run:
6969
shell: bash
@@ -98,7 +98,7 @@ jobs:
9898
id: toolchain-check
9999
run: |
100100
set +e
101-
'/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
101+
'/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
102102
if [ $? -eq 0 ]; then
103103
echo "Toolchain is already installed"
104104
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
# Run Visual Studio Installer
113113
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
114-
modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
114+
modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
115115
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
116116
if: steps.toolchain-check.outputs.toolchain-installed != 'true'
117117

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
uses: ./.github/workflows/build-windows.yml
247247
with:
248248
platform: windows-x64
249-
msvc-toolset-version: '14.29'
249+
msvc-toolset-version: '14.44'
250250
msvc-toolset-architecture: 'x86.x64'
251251
configure-arguments: ${{ github.event.inputs.configure-arguments }}
252252
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -258,7 +258,7 @@ jobs:
258258
uses: ./.github/workflows/build-windows.yml
259259
with:
260260
platform: windows-aarch64
261-
msvc-toolset-version: '14.29'
261+
msvc-toolset-version: '14.44'
262262
msvc-toolset-architecture: 'arm64'
263263
make-target: 'hotspot'
264264
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@@ -308,7 +308,7 @@ jobs:
308308
with:
309309
platform: windows-x64
310310
bootjdk-platform: windows-x64
311-
runs-on: windows-2019
311+
runs-on: windows-2025
312312

313313
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
314314
remove-bundles:

‎.github/workflows/test.yml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,16 @@ jobs:
143143
echo "value=$PATH" >> $GITHUB_OUTPUT
144144
fi
145145
146+
- name: 'Set JTReg Options'
147+
id: jtreg-options
148+
run: |
149+
if [[ '${{ runner.os }}' == 'Windows' ]]; then
150+
# JTReg option for 'ProgramFiles(x86)' environment variable
151+
echo 'value=-e:ProgramFiles\(x86\)=C:\\Program\ Files\ \(x86\)' >> $GITHUB_OUTPUT
152+
else
153+
echo 'value=' >> $GITHUB_OUTPUT
154+
fi
155+
146156
- name: 'Run tests'
147157
id: run-tests
148158
run: >
@@ -153,7 +163,7 @@ jobs:
153163
JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
154164
SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
155165
TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
156-
JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
166+
JTREG='OPTIONS=${{ steps.jtreg-options.outputs.value }};JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
157167
&& bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
158168
env:
159169
PATH: ${{ steps.path.outputs.value }}

‎.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=11.0.28
4+
version=11.0.29
55

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

‎make/RunTestsPrebuilt.gmk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris)
239239
else ifeq ($(OPENJDK_TARGET_OS), windows)
240240
NUM_CORES := $(NUMBER_OF_PROCESSORS)
241241
MEMORY_SIZE := $(shell \
242-
$(EXPR) `wmic computersystem get totalphysicalmemory -value \
243-
| $(GREP) = | $(SED) 's/\\r//g' \
244-
| $(CUT) -d "=" -f 2-` / 1024 / 1024 \
242+
$(EXPR) `powershell -Command \
243+
"(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" \
244+
| $(SED) 's/\\r//g' ` / 1024 / 1024 \
245245
)
246246
endif
247247
ifeq ($(NUM_CORES), )

‎make/autoconf/build-performance.m4‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2011, 2025, 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
@@ -84,7 +84,8 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
8484
FOUND_MEM=yes
8585
elif test "x$OPENJDK_BUILD_OS" = xwindows; then
8686
# Windows, but without cygwin
87-
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
87+
MEMORY_SIZE=`powershell -Command \
88+
"(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" | $SED 's/\\r//g' `
8889
MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
8990
FOUND_MEM=yes
9091
fi

‎make/autoconf/version-numbers‎

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

2929
DEFAULT_VERSION_FEATURE=11
3030
DEFAULT_VERSION_INTERIM=0
31-
DEFAULT_VERSION_UPDATE=28
31+
DEFAULT_VERSION_UPDATE=29
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-07-15
36+
DEFAULT_VERSION_DATE=2025-10-21
3737
DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
3838
DEFAULT_VERSION_CLASSFILE_MINOR=0
3939
DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

‎make/data/cacerts/sectigocodesignroote46‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Owner: CN=Sectigo Public Code Signing Root E46, O=Sectigo Limited, C=GB
2+
Issuer: CN=Sectigo Public Code Signing Root E46, O=Sectigo Limited, C=GB
3+
Serial number: 50249ba2ef8ea6bf6c2c1f1a6385d4c3
4+
Valid from: Mon Mar 22 00:00:00 GMT 2021 until: Wed Mar 21 23:59:59 GMT 2046
5+
Signature algorithm name: SHA384withECDSA
6+
Subject Public Key Algorithm: 384-bit EC (secp384r1) key
7+
Version: 3
8+
-----BEGIN CERTIFICATE-----
9+
MIICKDCCAa+gAwIBAgIQUCSbou+Opr9sLB8aY4XUwzAKBggqhkjOPQQDAzBWMQsw
10+
CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRT
11+
ZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBFNDYwHhcNMjEwMzIyMDAw
12+
MDAwWhcNNDYwMzIxMjM1OTU5WjBWMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2Vj
13+
dGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25p
14+
bmcgUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQIMoEDH487om+BR4zl
15+
e7m6wWmyW0nAKLkUWG8kM85Qm3PZO8FoOZx6Yc5c0iJHRKuAhanllayqrmZYhlan
16+
uIODzLTRDqlR+EtnOX+MubY5aDSPGUq6jiHrQrisVp0J3AejQjBAMB0GA1UdDgQW
17+
BBTPfSygkHqYHd22XoXC4NoVcdLlXjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/
18+
BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjACd++zAerlV83j8HflRwwwlLmgchbs
19+
aGX/4g44dv/oG8KfzCVTRg6sZHMobtK0IqYCMGk5W6+oBFyZMtOebrSwXs8lGjll
20+
/zHz43Zy8DMXO+iiqzSEwWGneZ6KupkGGqfVKw==
21+
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)