Skip to content

Commit 52fd718

Browse files
committed
Try use JDK's policy file implementation
1 parent 507cab5 commit 52fd718

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Xss2m \
1818
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
1919
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
2020
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
21-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
21+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
22+
--add-exports java.base/sun.security.provider=ALL-UNNAMED
2223
options.forkOptions.memoryMaximumSize=3g
2324

2425
# Disable Gradle Enterprise Gradle plugin's test retry

server/src/main/java/org/opensearch/bootstrap/Security.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.opensearch.javaagent.bootstrap.AgentPolicy;
4545
import org.opensearch.plugins.PluginInfo;
4646
import org.opensearch.plugins.PluginsService;
47-
import org.opensearch.secure_sm.policy.PolicyFile;
4847
import org.opensearch.transport.TcpTransport;
4948

5049
import java.io.IOException;
@@ -72,6 +71,8 @@
7271
import java.util.regex.Matcher;
7372
import java.util.regex.Pattern;
7473

74+
import sun.security.provider.PolicyFile;
75+
7576
import static org.opensearch.bootstrap.FilePermissionUtils.addDirectoryPath;
7677
import static org.opensearch.bootstrap.FilePermissionUtils.addSingleFilePath;
7778
import static org.opensearch.plugins.NetworkPlugin.AuxTransport.AUX_PORT_DEFAULTS;

0 commit comments

Comments
 (0)