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.22+1 into openj9-staging #725

Merged
merged 110 commits into from
Nov 3, 2023

Conversation

JasonFengJ9
Copy link
Member

Merge master jdk-11.0.22+1 into openj9-staging

Conflicts:

	src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/XDHPublicKeyImpl.java
	test/jdk/java/awt/font/FontScaling/StretchedFontTest.java
	test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java

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

GoeLin and others added 30 commits August 30, 2023 08:11
8293098: GHA: Harmonize GCC version handling for host and cross builds
8293361: GHA: dump config.log in case of configure failure
8295213: Run GHA manually with user-specified make and configure arguments
8295885: GHA: Bump gcc versions
8313428: GHA: Bump GCC versions for July 2023 updates

Reviewed-by: clanger
Backport-of: d7536588b38e368eaa6395bcbcc6724a39303fc5
….unpack()

Co-authored-by: Yakov Shafranovich <yakovsh@amazon.com>
Reviewed-by: clanger, stuefe
PlainSocketImpl.socketAccept() handles EINTR incorrectly

Reviewed-by: phh
Backport-of: 955aee3bfa8cad8b60fd38fb472b431075eea9d0
Backport-of: 87298d2ade41c689d3140981a123b0e9130fc651
Backport-of: a1747ef81a10e84177f474565193204ceaa0ede8
Backport-of: c5f462e83b85ec53ec395622063a5b131aaf0827
Backport-of: cf00d09c8c37ee301e1c6657df45777647a834e9
Backport-of: e45f3d5176e4affaa08480b560ca983fdbcb2846
Backport-of: 38687f1a3eb7d1c2e8aa43b85509ab7999fe0e40
…rious failures

Reviewed-by: shade
Backport-of: 6e6202c14d0f6dd26369f21883ff317057aa469f
Backport-of: 8248e351d0bed263fb68d8468004a4286e6391af
Backport-of: 29f1d8ef50e3b4b235177fd9642a1fcf26fe3bab
Backport-of: a44f8b059847135ecd0618cb04abbb0d2be1d2d0
…libfreetype-dev

Reviewed-by: fyang
Backport-of: 69d900d2ce97e5479020cff9a63c471d07e39989
Backport-of: f8203cb272e6136b784e5c43a500f6a0bfb19c8b
…ow for JARs such as WhiteSource/Mend unified agent jar

Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750
Backport-of: 781d6d793ad4cecb774bcbcb362c726779408ffd
Backport-of: 76e5a32c52c670173ded80eb10f5afd715f472cd
Reviewed-by: mdoerr
Backport-of: 4ad3ac6317f6fc95fdf0340885d4099e785132ad
Reviewed-by: mdoerr
Backport-of: 8d696aea9e1cefca97a760c017a5fde545facaa9
…nnection/ReconnectTest.java NoSuchObjectException no such object in table

Reviewed-by: mdoerr
…h timeout

Backport-of: c4612c12e63a2d8c79beacec528ea29bc8c1c058
…run as user with Administrator privileges

Backport-of: 69c9ec92d04a399946b2157690a1dc3fec517329
…LockTest.java possible deadlock

Backport-of: f243b281ea40c04ffbb60849844e1e4c3aa6f5cc
amosshi and others added 26 commits October 19, 2023 09:32
Reviewed-by: goetz
Backport-of: 76cda9f44a80b1979e6e1b7a21431ef631f80782
… focus using TAB Key.

Backport-of: 861e1addda4a547c319c7b369f042c7aab8bf36f
…the Color Selection dialog

Backport-of: b5e162200b684897e0ec2547dc2b3f854c0da8e4
Backport-of: 9b769550242e8bf6f9e783bf0d6f4a87d0c6376d
8294673: JFR: Add SecurityProviderService#threshold to TestActiveSettingEvent.java

Reviewed-by: mbaesken
Backport-of: bc2af47e1e4e6e96020e03a60ce098ddd17f63ba
Backport-of: 46af82e5b0d176e340f46125f8a3bb17e56bd7b3
…OS machines

Backport-of: a2f67660f088559ce49f73da7401801fb826028b
…ation

Reviewed-by: phh
Backport-of: 05ea083b0563ddacf3e38dc329ba00dc4bac9b29
Backport-of: 14df5c130e5bf5139e3e2ef6d7b9d64883d94d18
Backport-of: 07f2070411b3bff5608166ceae0e0bdbf155e7c2
Backport-of: 2a791467919c9df9869e6fe1e57df0a5caa90d8f
Reviewed-by: lucy
Backport-of: 2aa7590846aa6a8cba5fc4e67300bbb676961ade
This patch fixes eclipse-openj9/openj9#18293; which is really a
duplicate of eclipse-openj9/openj9#11937. 'loop' in OJDK MHs does not
conform to the spec w.r.t. setting loop finalizers for loop's with
void return types. This patch properly sets default finalizer values.

Closes: eclipse-openj9/openj9#18293
Signed-off-by: Nathan Henderson <nathan.henderson@ibm.com>
Conform to spec for MethodHandles::loop's with void return types
Reviewed-by: phh
Backport-of: 229d923b27a6c01616291aea6c8d4c86930bf7d2
…g string with Shenandoah

Backport-of: f412bfc34eb2a3f94ba4381af365127b56e77537
Backport-of: 16ebe40a1bcd1fe43126fe1dca27bb64cb12de16
Reviewed-by: mbaesken
Backport-of: fc889577eaf3f564d896818c1d9b1eb6fa5a8758
Backport-of: f02d01934c87414eb610b67bdab55c25b3033878
Backport-of: fc288568f2c589975463d30f8c6d0e2484f0bf14
…tipleRegistries.java

Backport-of: 37c40a11a78f8b1f290cb04ce5b087904651907e
Ensure the time compensation in milliseconds is not less than the
checkpoint restore time delta.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Reviewed-by: phh
Backport-of: 1ce12c4f33d3d6905703d95df2574f4037dfd57d
Ensures time compensation is not less than checkpointRestoreTimeDelta
Conflicts:
	src/java.base/share/classes/sun/security/rsa/RSAPublicKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/ECPrivateKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/ECPublicKeyImpl.java
	src/jdk.crypto.ec/share/classes/sun/security/ec/XDHPublicKeyImpl.java
	test/jdk/java/awt/font/FontScaling/StretchedFontTest.java
	test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CertignaCA.java

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
@keithc-ca keithc-ca merged commit e43aa73 into ibmruntimes:openj9-staging Nov 3, 2023
0 of 2 checks passed
@JasonFengJ9 JasonFengJ9 deleted the mergetmp branch November 3, 2023 17:46
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