search

ibmruntimes / openj9-openjdk-jdk11

Extensions for OpenJDK 11 for Eclipse OpenJ9
GNU General Public License v2.0
31 stars 112 forks source link

Merge master jdk-11.0.20+1 into openj9-staging #652

Closed JasonFengJ9 closed 1 year ago

JasonFengJ9 commented 1 year ago

Resolved conflicts:

    .gitignore

depends

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

keithc-ca commented 1 year ago

I think the conflict in .gitignore should be resolved by including all the lines from upstream (perhaps removing the obsolete or redundant ones for openj9).

JasonFengJ9 commented 1 year ago

Restored openjdk content, and removed openj9 entry /build.