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 jdk8u402-b03 into openj9-staging #711

Merged
merged 9 commits into from
Nov 22, 2023

Conversation

JasonFengJ9
Copy link
Member

Merge master jdk8u402-b03 into openj9-staging

Conflicts:

	common/autoconf/generated-configure.sh

Re-run common/autoconf/autogen.sh to generate common/autoconf/generated-configure.sh & jdk/make/closed/autoconf/generated-configure.sh

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

theresa-m and others added 9 commits November 10, 2023 11:23
Missing cases from eclipse-openj9/openj9#14063

Signed-off-by: Theresa Mammarella <Theresa.T.Mammarella@ibm.com>
Reviewed-by: andrew
Backport-of: 9d0bd1b495012de5de1c62f65f14c4de36aef056
Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Modify jdk.crypto.ec libsunec mpi.c to avoid writes to unallocated mem
Append cp to method annotation data to fix redefinition inconsistencies
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Add J9JCL to sourcepath for generating beaninfo
Conflicts:
	common/autoconf/generated-configure.sh

Re-run common/autoconf/autogen.sh to generate common/autoconf/generated-configure.sh & jdk/make/closed/autoconf/generated-configure.sh

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

6 participants