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.

Sign up for GitHub

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

Jump to bottom

Enable openssl support for jdk12 #4832

Merged
merged 1 commit into from
Feb 27, 2019
Merged

Enable openssl support for jdk12 #4832

merged 1 commit into from
Feb 27, 2019
+17 −5

Conversation

pshipton
Copy link
Member

@pshipton pshipton commented Feb 22, 2019 •
edited
Loading

With ibmruntimes/openj9-openjdk-jdk12#18 bundling is not required on
Linux.

See also #4291

Note these build options are only for OpenJ9 test purposes and do not affect what gets built at Adopt.

Depends on ibmruntimes/openj9-openjdk-jdk12#18

@pshipton pshipton mentioned this pull request Feb 22, 2019
Merged
@pshipton
Copy link
Member Author

jenkins test sanity zlinux,plinux,xlinux,win,aix,osx jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

jenkins test sanity aix jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

jenkins test sanity osx jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

jenkins test sanity plinux,win,aix,osx jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

jenkins test sanity plinux,win,aix,osx jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

jenkins test sanity xlinux,zlinux jdk12 depends ibmruntimes/openj9-openjdk-jdk12#18

@pshipton
Copy link
Member Author

pshipton commented Feb 27, 2019 •
edited
Loading

ibmruntimes/openj9-openjdk-jdk12#18 is merged. I need a committer for this, and will make the same change in the 0.13 branch shortly.
@DanHeidinga @keithc-ca
Looking at the jdk12 test results, you can see the CryptoTest is passing. We only have the known jsr292Test failure.
Except for AIX where the CryptoTest isn't enabled, and doesn't pass. We can tackle why that is afterwards. Openssl has never been supported on AIX because it doesn't work to bundle the libcrypto 1.1.1 (breaks the build when when bundled libcrypto is found by some AIX utility, like wget or curl)

@pshipton
Copy link
Member Author

We are still bundling on OSX because of LibreSSL, see ibmruntimes/openj9-openjdk-jdk12#18 (comment)
We are still bundling on Windows because openssl isn't on the path. This is being fixed #4293, but we can test this and unbundle Windows separately from enabling openssl support here.

@pshipton
Copy link
Member Author

The PR for the 0.13 branch is #4903

@pshipton
Copy link
Member Author

Note these options are only for OpenJ9 test purposes and do not affect what gets built at Adopt.

@pshipton pshipton mentioned this pull request Feb 27, 2019
Merged
@DanHeidinga
Copy link
Member

@pshipton Can you rebase the PR and resolve the conflicts?

@pshipton pshipton mentioned this pull request Feb 27, 2019
Merged
@pshipton
Enable openssl support for jdk12
60232de 
With ibmruntimes/openj9-openjdk-jdk12#18 bundling is not required on
Linux.

See also eclipse-openj9#4291

[ci skip]

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
@pshipton
Copy link
Member Author

@DanHeidinga I've fixed the merge conflict.

@DanHeidinga
Copy link
Member

As I've seen the builds run prior to merging the conflict, will merge without new builds

@DanHeidinga DanHeidinga merged commit e19be66 into eclipse-openj9:master Feb 27, 2019
@pshipton pshipton deleted the openssl12 branch March 1, 2019 19:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanHeidinga DanHeidinga DanHeidinga approved these changes

Assignees
No one assigned
Labels
comp:build depends:openjdk12
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pshipton @DanHeidinga