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 HEAD into openj9-staging #902

Merged
merged 41 commits into from
Dec 4, 2024

Conversation

JasonFengJ9
Copy link
Member

@JasonFengJ9 JasonFengJ9 commented Dec 4, 2024

Merge master HEAD into openj9-staging

Conflicts:

	src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java

Modified:

	closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java
	closed/src/java.base/share/classes/sun/security/rsa/NativeRSACore.java
	src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java

Require

Signed-off-by: Jason Feng [email protected]

taoliult and others added 30 commits December 2, 2024 13:58
Fix the issue where profiles with the same beginnings of profile
name are treated as a single profile.

Signed-off-by: Tao Liu <[email protected]>
…ibute is unclear

Reviewed-by: dfuchs, michaelm
…e closed when hostname resolution fails or another error occurs

Reviewed-by: dfuchs, alanb
… diagnostic commands

Reviewed-by: dholmes, kevinw
…decessors

Reviewed-by: rcastanedalo, chagedorn
Fix profiles with same name beginnings being treated as one
Reviewed-by: alanb, lancea, naoto, mchung
…mpedLock.java on generic-all JTREG_TEST_THREAD_FACTORY=Virtual

Reviewed-by: alanb
- Update Xdump to catch JUnit exception and AssertionFailedError

Signed-off-by: Theresa Mammarella <[email protected]>
…mp time and run time

Reviewed-by: ccheung, dholmes
Modify JSR166TestCase to gather more error information
…ed: Selected text & clipboard contents differs

Reviewed-by: azvegint, dnguyen, prr, kizune
Damon Nguyen and others added 11 commits December 3, 2024 18:18
…java failed: Choice can't be controlled by keyboard

Reviewed-by: honkar, abhiscxk
… dialog was active

Reviewed-by: aivanov, azvegint
Co-authored-by: Francisco Ferrari Bihurriet <[email protected]>
Co-authored-by: Martin Balao <[email protected]>
Reviewed-by: weijun
…s: NoClassDefFoundError: jdk/test/lib/Utils

Reviewed-by: cjplummer
Conflicts:
	src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
Modified:
	closed/src/java.base/share/classes/jdk/crypto/jniprovider/NativeCrypto.java
	closed/src/java.base/share/classes/sun/security/rsa/NativeRSACore.java
	src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java

Signed-off-by: Jason Feng <[email protected]>
@keithc-ca keithc-ca self-assigned this Dec 4, 2024
@keithc-ca keithc-ca merged commit 3e7a1fe into ibmruntimes:openj9-staging Dec 4, 2024
1 of 2 checks passed
@JasonFengJ9 JasonFengJ9 deleted the mergestaging branch December 4, 2024 19:49
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.