Separate java.vendor and java.vm.vendor #5041
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
As I mentioned in #5002 (comment) |
Removed the setting of java.vm.vendor with java.vm value; Added JAVA_VM_VENDOR to be set for java.vm.vendor regardless of java.vendor values. Signed-off-by: Jason Feng <fengj@ca.ibm.com>
|
@pshipton it has been fixed. Please have another look. |
|
jenkins test sanity plinux jdk11,jdk12 |
|
@JasonFengJ9 please create a PR for the 0.13 branch. |
|
The jdk12 failures are unrelated to this change. |
pshipton
approved these changes
Mar 9, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Separate
java.vendorandjava.vm.vendorRemoved the setting of
java.vm.vendorwithjava.vmvalue;Added
JAVA_VM_VENDORto be set forjava.vm.vendorregardless ofjava.vendorvalues.Additional notes:
JDK12+, it can be built with--with-vendor-nameand--with-vendor-url, and the values specified will be set tojava.vendorandjava.vendor.urlviajava.lang.VersionProps.init(systemProperties);JDK8 & 11, change to following defines are required:https://github.com/eclipse/openj9/blob/0bd089b36679fe0e3c5bfd63df0fcfc22c16c36d/runtime/include/vendor_version.h#L57-L58
just like AdoptOpenJDK patch;
--with-vendor-namefor JDK 8 & 11 builds (particularly for JDK 11), it requires passing the value toclosed/OpenJ9.gmkand toinclude/j9cfg.h.ftlviauma.spec.propertieswhich requires more changes for legacy builds without incoming makefile options.JDK12+provides a generic way to set a customizedjava.vendorand it doesn't seem worth to duplicate the effort for earlier versions;java.vendor.url.bugwas set byRIbut notOpenJ9, not adding it in this PR.closes: #5002
Reviewer: @pshipton
FYI: @DanHeidinga @smlambert
Signed-off-by: Jason Feng fengj@ca.ibm.com