Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master jdk-11.0.18+1 into openj9-staging #589

Merged
merged 125 commits into from
Nov 2, 2022

Conversation

JasonFengJ9
Copy link
Member

Resolved conflicts:

	make/autoconf/basics.m4
	make/autoconf/toolchain_windows.m4

Updated closed/autoconf/custom-hook.m4, BASIC_REQUIRE_PROGS is replaced by UTIL_REQUIRE_PROGS, and BASIC_FIXUP_PATH is replaced by UTIL_FIXUP_PATH.

Signed-off-by: Jason Feng fengj@ca.ibm.com

RealCLanger and others added 30 commits September 1, 2022 04:57
…memory

Reviewed-by: sgehwolf
Backport-of: f694f8a7671002559e7d23fdb65d5e9c768f9c03
Reviewed-by: clanger
Backport-of: 4f45b5f9739e5a5e7d1c4f80da9c42e0d77dd0bf
8213239: Configure cannot handle command overrides with arguments
8206125: [windows] cannot pass relative path to --with-boot-jdk

Reviewed-by: clanger
Backport-of: 63f939636a5fe9871f5f9057c93ed5b1a9924265
Reviewed-by: clanger
Backport-of: 165fa2450c1a7550d723be4c62bf54de464798bb
Backport-of: bcc668b77f0a0c22db49ef048286a9df5c04a308
…the SunMSCAPI provider

Backport-of: e3c178d6d87c9e0e2a75cddc72d802cf9124420e
…memory

Backport-of: 9a0d1e7ce86368cdcade713a9e220604f7d77ecf
Reviewed-by: vkempik
Backport-of: f65db88b74911e5896d2ff536c4ac97e7f62d98b
Reviewed-by: clanger
Backport-of: 6096dd9765eaf280890f65c0ff1ab64864b9316a
…with macOS SDK 10.15 and earlier

Reviewed-by: clanger
Backport-of: fe807217a79753f84c00432e7451c17baa6645c5
… ppc64le machine with missing Memory and Swap Limit output

Backport-of: d8f4e97bd3f4e50902e80b4b6b4eb3268c6d4a9d
…n lead to users blocked

Backport-of: 3be394e1606dd17c2c14ce806c796f5eb2b1ad6e
…ycles are not happening

Reviewed-by: phh
Backport-of: 47bfc8aa9367ff852ea5d901f1fa3c6ef316913e
Backport-of: cbec37d45d77533081c27b3fc649098dfcca0425
Backport-of: 73b83e018838d3870733970b2bb22a8394b53330
Backport-of: fb623f1d2ee858fbc6edfeaaa702b5fcd832a0aa
Backport-of: 2bf6285c80f078d8451afb5682ee307bb13be179
Backport-of: a0d9cc2d014b3175bfbb8d5b66680df8a827730c
…/8175301/ScaledFrameBackgroundTest.java' fails

Backport-of: 32538b5b1d403b5d6b0e48bceef97a47cf9ddbe7
…ate in SuperWord::co_locate_pack

Backport-of: 0a89987a9699008927268c050ca4b7e01afc30f4
Reviewed-by: clanger
Backport-of: a17816f881fadca8dc3bfd49458445873ae762cd
… JComboBox

Backport-of: 7612bba0f1ae63b2c762eb103544dc43d4e8304f
…s when GC cycles are not happening

Backport-of: 5002eaa5cc7301b91a45f8c0f65b5943fea225d8
…h TZ env variable

Reviewed-by: clanger
Backport-of: 3c3256414f7df049cdd6c8519fbcea0d818a1a33
Reviewed-by: shade
Backport-of: 4c400d2372a73841f040a5913a199f7af855b56a
Backport-of: 25669bb667466b3cc814f8f08d4e3a2982a4cf2e
…d with "RuntimeException: Failed in server"

Backport-of: af529be069b651808310c3c37e2167d216979f69
gnu-andrew and others added 26 commits October 18, 2022 18:56
Backport-of: 21407dec0156301871a83328615e4d975c4287c4
Reviewed-by: clanger
Backport-of: 2f2b914794fd6fa6bf33fe49620e91bff1103f49
…&& (shift != 0))) failed: impossible encoding

Reviewed-by: phh
Backport-of: b4490386fe348250e88347526172c1c27ef01eba
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
…on: Invalid location on Editable JComboBox

Backport-of: ebfa27b9f06aee8ceceabc564a78a351903ce9a1
Backport-of: c0f6ce7c54e0e8266beb36de154f3c2e8747a24e
Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org>
Reviewed-by: phh
…bit platforms

Reviewed-by: phh
Backport-of: 1ed64c2a95b36be6f94680a485734a8d6743a182
Add filters to color and hide parts of the graph based on node categories or
estimated execution frequency, and simplify remaining filters.

Reviewed-by: phh
Backport-of: 16bd7d381f498ed659d2b1b372458d86fbbef275
…n macOS

Backport-of: c59f741276d55d98d2628c01bf41eeb571eac7be
…rty checking

Signed-off-by: Zainab Fatmi <zainab@ibm.com>
Backport-of: 40155b14cdbc5690469b1d8869ae0f5cdb4b0218
Use the OpenSSL PKCS12 method for PBE and simplify NativeCrypto property checking
Backport-of: 46b5bfbc38f14607f0db686a42f1fa96d2f61891
Backport-of: 1581e3faa06358f192799b3a89718028c7f6a24b
Backport-of: 66b2c3b66e253ac3d8718c0c6d7c7551dbe04001
Backport-of: 3dbc38a2c903f533ace847a3bc0d2687f263fafd
Reviewed-by: phh
Backport-of: 45adc9227a28c8d614c41ac496bbeaa752e5fd7b
8285373: Create an automated test for JDK-4702233

Backport-of: 6f526e1bc3e0af4189fbb7d3b48d614717f266b0
…ch64

Reviewed-by: serb
Backport-of: 2e9ef14ee4c9ead29cb50f424df698069ee93332
Backport-of: 3464019d7e8fe57adc910339c00ba79884c77852
Resolved conflicts:
	make/autoconf/basics.m4
	make/autoconf/toolchain_windows.m4
Updated closed/autoconf/custom-hook.m4, BASIC_REQUIRE_PROGS is replaced by UTIL_REQUIRE_PROGS, and BASIC_FIXUP_PATH is replaced by UTIL_FIXUP_PATH.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@keithc-ca keithc-ca merged commit ef434cb into ibmruntimes:openj9-staging Nov 2, 2022
@JasonFengJ9 JasonFengJ9 deleted the mergetmp branch November 3, 2022 00:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.