Skip to content

Fix the library path for MacOS for SSL support #904

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

Merged
merged 1 commit into from
Feb 14, 2019
Merged

Fix the library path for MacOS for SSL support #904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ...eployment/src/main/java/org/jboss/shamrock/deployment/steps/SubstrateConfigBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
package org.jboss.shamrock.deployment.steps;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -80,12 +83,18 @@ void build(List<SubstrateConfigBuildItem> substrateConfigBuildItems,
String graalVmHome = System.getenv("GRAALVM_HOME");

if (graalVmHome != null) {
String graalVmLibDirectory = graalVmHome + File.separator + "jre" + File.separator + "lib" + File.separator;
Path graalVmLibDirectory = Paths.get(graalVmHome, "jre", "lib");
Path linuxLibDirectory = graalVmLibDirectory.resolve("amd64");

if (Files.exists(linuxLibDirectory)) {
// On Linux, the SunEC library is in jre/lib/amd64/
systemProperty.produce(new SystemPropertyBuildItem("java.library.path", linuxLibDirectory.toString()));
} else {
// On MacOS, the SunEC library is directly in jre/lib/
systemProperty.produce(new SystemPropertyBuildItem("java.library.path", graalVmLibDirectory.toString()));
}
systemProperty.produce(
new SystemPropertyBuildItem("java.library.path", graalVmLibDirectory + "amd64"));
systemProperty.produce(
new SystemPropertyBuildItem("javax.net.ssl.trustStore", graalVmLibDirectory + "security" + File.separator + "cacerts"));
new SystemPropertyBuildItem("javax.net.ssl.trustStore", graalVmLibDirectory.resolve(Paths.get("security", "cacerts")).toString()));
} else {
log.warn(
"SSL is enabled but the GRAALVM_HOME environment variable is not set. The java.library.path property has not been set and will need to be set manually.");
Expand Down