Skip to content

Merge master jdk-17.0.9+1 into openj9-staging - #243

Merged
keithc-ca merged 147 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergetmp
Aug 3, 2023
Merged

Merge master jdk-17.0.9+1 into openj9-staging#243
keithc-ca merged 147 commits into
ibmruntimes:openj9-stagingfrom
JasonFengJ9:mergetmp

Conversation

@JasonFengJ9

Copy link
Copy Markdown
Member

Merge master jdk-17.0.9+1 into openj9-staging

Resolved conflicts:

	make/autoconf/lib-bundled.m4
	src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c

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

GoeLin and others added 30 commits May 30, 2023 16:27
Backport-of: 74a51ccc86525eb4b1eb2e5cb11e605ca9e9fc5d
…for value ( 1.00)"

Backport-of: c16eb89ce0d59f2ff83b6db0bee3e384ec8d5efe
…heck inflated bytes

Backport-of: 0c472c8a4ff01b3bc8fba5df82c24c240586e5c5
…rayIndexOutOfBoundsException: Array index out of range: -4

Backport-of: 1a7b70a8be0a236b98925a8320d25d88a405d595
…ree()

Reviewed-by: shade, stsypanov, phh
Backport-of: 438c969b7b07eeef0158b089e5a168849e04bf56
Reviewed-by: aph
Backport-of: 33d9a857308eed53e06b448691910bc8aa2f8fc9
Backport-of: 5a92aae1d967f5be01f05d9cc56c433a5eca61e8
Backport-of: 69f508a2ac344eb61cef7be985348873b8265171
Backport-of: 7551529854b325488b58481e11103b08a211aff4
Backport-of: ec55539534d43629c1a47407a8e2e94913034a71
…ically linking with JDK native libraries

Backport-of: 2bbbff209dc21633e08fe4d565dfc649eea2c883
Backport-of: 834e50e9efc16effad7469cae99ab8f918a30e86
…a and HeapByteBufferTest.java

Backport-of: 7c1ebcc4ce74bb06f7c911e59a86bcfb5c5da844
…ith exit code 97

Backport-of: 1f438a8a702034c2f10c0008e72395f526b15ef5
Backport-of: 16a4f02f2d4f5574af3b20f2f0c788d15dd503ac
Reviewed-by: mdoerr
Backport-of: 3b85f84f026973a2abdbce8d9baf1329c8a4ebf8
Reviewed-by: mdoerr
Backport-of: e7795851d2e02389e63950fef939084b18ec4bfb
… -XX:+StressGCM

8301959: Compile command in compiler.loopopts.TestRemoveEmptyCountedLoop does not work

Reviewed-by: roland
Backport-of: 97c611d029b614bb462a8f5398ea75b2715c3f07
… use by headful testing.

Backport-of: 81c56c700a47c7f1b7855052de17eb88fac84674
8271898: disable os.release_multi_mappings_vm on macOS-X64

Reviewed-by: lucy
Backport-of: d1efb0cc56127a40f2b23ccc608b27be2b39a389
…"PKCS11Exception: CKR_ATTRIBUTE_SENSITIVE"

Backport-of: d64820dfefc0bac578df43fe58d2bce8577ec94e
Backport-of: 86723d4892485651bcae735ed13545ea89b9bb22
…tton

Backport-of: 67f1bd7ff1bb218fd6de9ef1e957f729013e133c
Backport-of: 3312d8c620003125a88540fd5b2bacff34732ade
Backport-of: 45c3e898ed538545921395372fe507e9111401e1
Reviewed-by: phh
Backport-of: 62a7fc60d3b3a27525fc01930834dab6f89bd451
Backport-of: 14874779eeb9a279479c5aaddb40c056780d6152
…fully handle amounts equal to Long.MIN_VALUE

Reviewed-by: stuefe, sgehwolf
Backport-of: a1ab377d995dce4d636b908e96bd168dc3a9f3e5
Ben Taylor and others added 25 commits July 21, 2023 17:15
Reviewed-by: simonis
Backport-of: caadad4fdc78799dab2d492dba9b9f74b22d036e
8284090: com/sun/security/auth/module/AllPlatforms.java fails to compile

Reviewed-by: mdoerr
Backport-of: fbb8ca55a80683a730179303b31c5c150bcca8a9
Reviewed-by: mdoerr
Backport-of: 0c37008917789e7b631b5c18e6f54454b1bfe038
Backport-of: df5209e70fd92ec6bda4e7356a3ad121732f6c66
8293180: JQuery UI license file not updated

Reviewed-by: mdoerr
Backport-of: 404d5bddb9177c3bda03db81e14209e372a00027
Reviewed-by: mdoerr
Backport-of: 6a44120a16d0f06b4ed9f0ebf6b0919da7070287
Reviewed-by: stuefe
Backport-of: 0845b39caf6f04dca9cb7a5852f05b4b5ffbc034
Backport-of: 14df5c130e5bf5139e3e2ef6d7b9d64883d94d18
…ava/awt/print/PrinterJob/InitToBlack.java

Backport-of: 2ef9767aae8e1798661fea615b096833bdb9d985
Backport-of: 3d254d3c8ea7f409e8f709413f80d88913eb0ce8
Backport-of: 69ede5baeda6645aa3e961a02cbd40db965fc6a1
…ecTest.java intermittently timeout

Backport-of: 82561de722b9ca580c0c1a53050c711b64611352
Backport-of: d5b80abcbfff57c7728d3e42a696a762f08bc7ad
Backport-of: 03b23a1e1bd724019ef4fdbee3463d0646329164
* 8275509: ModuleDescriptor.hashCode isn't reproducible across builds
* 8290041: ModuleDescriptor.hashCode is inconsistent

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Reviewed-by: lucy
Backport-of: 66d2736521611fbe7652356894d046c17d7cf743
Back-port fix for ModuleDescriptor.hashCode()
Allow loading of OpenSSL 3.x native library for Mac, Windows and AIX
Partially revert "8304291: [AIX] Broken build after JDK-8301998"
(commit a0085be);

Backport fix for harfbuzz issue 4138.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Reviewed-by: mbaesken
Backport-of: 955fc2fabafc4c4d79d137bf86194228d5cf8ad8
Fix missing definition of harfbuzz function on AIX
Conflicts:
	make/autoconf/lib-bundled.m4
	src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@JasonFengJ9
JasonFengJ9 requested a review from keithc-ca August 3, 2023 18:28
@keithc-ca
keithc-ca merged commit afec503 into ibmruntimes:openj9-staging Aug 3, 2023
@JasonFengJ9
JasonFengJ9 deleted the mergetmp branch August 3, 2023 21:10
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.