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 jdk-11.0.19+3, +4 and OpenSSL Version granularity update to 0.38 #623

Merged
merged 66 commits into from
Mar 13, 2023

Conversation

pshipton
Copy link
Member

No description provided.

GoeLin and others added 30 commits February 14, 2023 20:01
…"java.net.ConnectException"

Changed the test to use the loopback interface.

Backport-of: d176e208985f55745a60fc806dfb369a2cce0781
Backport-of: 012c399c26278aaab22c8f779a443f5e05924af9
…tently with Invalid Http response

Backport-of: 1df787692a91c35e821610c03bbaba7e024d2932
Backport-of: defc86bd5b1cd94c473edaec68aadf0f1193d5a4
Backport-of: 4a9f7612be2f4949c20c12b5faae7e215f175875
…Both.java timeout intermittently

Tests are updated to use the loopback address instead of the wildcard to avoid traffic being routed to a different server than what was intended by the test.

Backport-of: 72467d916c82ff02bc5101f91e3e7d32c1d5e5b5
…nded fails intermittently

Backport-of: 22a4313efc832bf79a172f6e6c220302173533b0
…a fails due to wrong number of MonitorContendedEntered events

Fix the synchronization issue in the test

Backport-of: fc6b87472cdad4a5d73ced2700ea799babcb48c3
…urrent thread

Extend test coverage for SuspendThreadList

Backport-of: 40918999947d6763d3f6d592bcdf828503217901
8285755: JDK-8285093 changed the default for --with-output-sync
8285919: Remove debug printout from JDK-8285093

Reviewed-by: mbaesken
Backport-of: 5b77b574685ee043dfce2b5b17cb0f166b339485
Reviewed-by: mbaesken
Backport-of: 1f484dae4efaa60cf18a3d4df947c05f1497bd5b
…e factor

Backport-of: b42c1ad1086a5c3f579e27380d23f67f8cebb437
Backport-of: 9911405e543dbe07767808bad88534abbcc03c5a
… javac tests

Reviewed-by: clanger, phh
Backport-of: a376d5dab4961ed5d9097ddf7010c64e14fdc9ec
…s - part 2

Removes (or documents) some usages of the wildcard address in intermittently failing tests.

Backport-of: 1188188ee66776e6a67c0300576a950dd64f6303
…a still fails due to wrong number of MonitorContendedEntered events

Fix one more sync issue in the test

Backport-of: 8cf8442085af928c7a601662006bd92eee4a68cb
…a fails on jvmti->InterruptThread (JVMTI_ERROR_THREAD_NOT_ALIVE)

Fix one more sync issue in the test

Backport-of: ff1f2fad6e332590197b52453ac305fc366d92ee
…r while cleaning up threads after test"

Test cleaned up to improve safe termination

Reviewed-by: clanger
Backport-of: 7b49c40ee96cb5fc78071cd87c7c4edcd50417b3
Backport-of: d7170782b5c6e2607c93400b9a98c7dce8970770
…operator

Backport-of: 25642dd30317e77bc15d36d5fa512da5fb54dad9
…java

Backport-of: 4c54fa2274ab842dbecf72e201d5d5005eb38069
Reviewed-by: phh
Backport-of: da6fca4d78465625775f7b384ba752185694f699
…d related macros

Backport-of: 1a38e26e67570ac01de6e969114b476df933d1eb
Reviewed-by: phh
Backport-of: 9561b5e041c4cc70319e60953819c521c1e68d6c
Backport-of: 17773c31b62cc4e040e69e05e63d2d4e52334221
… Windows 2016 because DirPermissionDenied directory has no read permission

Backport-of: 0518393598de764a716376a98e436fb717aef9d4
Backport-of: 064f69d6ab6e76ad5dff1fde285524ac10febc80
…ot compile

Update the test to use the method suggested in JDK-8244010.

Backport-of: 83fff054980406fa93fb17976d67fc31102a9276
Backport-of: 54490d30c86891dbc412ab69d18114f3a79fae40
GoeLin and others added 27 commits February 17, 2023 10:17
…X:TieredStopAtLevel=1

Backport-of: 9bc52afa481c476ae9c379dff44ae8266777f616
Backport-of: e90b579b294eb88f6b4e236d19b05063775ee8d7
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Back-port 493 and 495 from jdknext.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Backport-of: 72bfdd96f1499ab25081676e9725734a85fd6aa1
…ndentation

Backport-of: 4ea88512ddb89470ff5a043bc1865b9e4af661d6
…feature explicitly

Backport-of: 09ecb11927f0042ddc0c5c23d747b275ab70b36b
…data size with TieredStopAtLevel=2,3

Backport-of: a561eac912740da6a5982c47558e13f34481219f
…how instruction

Reviewed-by: phh
Backport-of: 4da45c430139fe66fab020c2f96686dc9cf26a97
Backport-of: e3d5c9e7c4ab210ae7a4417a47632603910744a1
…st.nativepath")

Reviewed-by: phh
Backport-of: 4fe6a3da68d2c75a3706ecb9a2d3639711324102
…eException: Unexpected log output:"

Backport-of: 40d69f0c41c8550605c3a1e6e572aecd3a8cf138
8277351: ProblemList runtime/jni/checked/TestPrimitiveArrayCriticalWithBadParam.java on macosx-x64

Reviewed-by: phh
Backport-of: 86112cb0899bded434cf1424be1cc5b13aa4173c
…cted GC

Backport-of: fe0118f8040ce7e5e3d605942443e3a5d442fa92
Backport-of: c5c6058fd57d4b594012035eaf18a57257f4ad85
…cumulator incorrectly

Backport-of: 251bff6beeafcd98824dab60e9831c0175fe0689
…en NSS version detection fails

Backport-of: cddd6def9f796a25137e0059e82053142747c001
…y on system resolver

Backport-of: 65c84e0cf890df2a604ac07213327be007227e77
Backport-of: c8ee076241cc7d83f423683d97ec37f9e0d6ebaa
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Signed-off-by: J9 Build <j9build@ca.ibm.com>
Additional granularity for tracking versions is needed in Native code
to make better branching decisions based upon the library versions.
Currently, there is differentiation only between <=1.0.x and >=1.1.0.
Version 1.1.1 will be supported until 2023-09-11,
versions including 1.1.0, 1.0.2, 1.0.1, 1.0.0, and 0.9.8 are no longer supported.
We need to add support for separate versions to deprecate/add features in the future.

Signed-off-by: Jinhang Zhang <Jinhang.Zhang@ibm.com>
@JasonFengJ9 JasonFengJ9 merged commit 23d2c3b into v0.38.0-release Mar 13, 2023
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.

None yet

9 participants