Skip to content

Add JNI_VERSION_19 for Java 19+ - #15368

Merged
pshipton merged 1 commit into
eclipse-openj9:masterfrom
keithc-ca:jni19
Jun 20, 2022
Merged

Add JNI_VERSION_19 for Java 19+#15368
pshipton merged 1 commit into
eclipse-openj9:masterfrom
keithc-ca:jni19

Conversation

@keithc-ca

Copy link
Copy Markdown
Contributor

See:

  • 8286176: Add JNI_VERSION_19 to jni.h and JNI spec

Also a little tidying up: mostly trailing whitespace.

See:
* 8286176: Add JNI_VERSION_19 to jni.h and JNI spec

Also a little tidying up.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@pshipton
pshipton requested a review from tajila June 20, 2022 15:40
@pshipton

Copy link
Copy Markdown
Member

jenkins compile amac jdk19

@pshipton
pshipton removed the request for review from tajila June 20, 2022 16:20
@pshipton

Copy link
Copy Markdown
Member

@tajila fyi

@pshipton
pshipton merged commit 7fc73ff into eclipse-openj9:master Jun 20, 2022
@keithc-ca
keithc-ca deleted the jni19 branch June 20, 2022 16:22
@pshipton

Copy link
Copy Markdown
Member

@keithc-ca it didn't actually work, JNI_VERSION_19 didn't show up in the build. Perhaps we aren't defining JAVA_SPEC_VERSION properly yet?

@keithc-ca

Copy link
Copy Markdown
Contributor Author

I explicitly looked for and found it in vm/runtime/include/jni.h.
I'll investigate why that didn't make it into the jdk image.

@pshipton

Copy link
Copy Markdown
Member

Actually, we use the OpenJDK version in the builds. I'm assuming the jdk19 change hasn't promoted yet.

@keithc-ca

Copy link
Copy Markdown
Contributor Author

It appears that jni.h is a copy from upstream; when 8286176: Add JNI_VERSION_19 to jni.h and JNI spec gets promoted to the openj9 branch we should see JNI_VERSION_19 defined.

CopyCommon.gmk is responsible for copying that file. So we don't have a real problem other than ensuring that OpenJ9 (mostly test?) code sees a consistent copy of jni.h.

@keithc-ca

Copy link
Copy Markdown
Contributor Author

I'm inclined to adjust the build of OpenJ9 to use that file from upstream instead of the one defined by this repo.

@pshipton

Copy link
Copy Markdown
Member

I think the OpenJ9 jni.h is only used for IBM Java 8.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants