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

[WFCORE-6087] Adding --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED to default JPMS settings #5242

Merged
merged 1 commit into from Oct 14, 2022
Merged

[WFCORE-6087] Adding --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED to default JPMS settings #5242

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions core-feature-pack/common/src/main/resources/content/bin/common.bat
View file
Open in desktop
Expand Up @@ -44,6 +44,8 @@ goto :eof
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED"
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
rem Needed by Netty
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
rem Needed if Hibernate applications use Javassist
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang=ALL-UNNAMED"
rem Needed by the MicroProfile REST Client subsystem
Expand Down
2 changes: 2 additions & 0 deletions core-feature-pack/common/src/main/resources/content/bin/common.ps1
View file
Open in desktop
Expand Up @@ -172,6 +172,8 @@ Param(
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED"
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
# Needed by Netty
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
# Needed if Hibernate applications use Javassist
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang=ALL-UNNAMED"
# Needed by the MicroProfile REST Client subsystem
Expand Down
2 changes: 2 additions & 0 deletions core-feature-pack/common/src/main/resources/content/bin/common.sh
View file
Open in desktop
Expand Up @@ -42,6 +42,8 @@ setDefaultModularJvmOptions() {
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED"
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED"
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED"
# Needed by Netty
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED"
# Needed if Hibernate applications use Javassist
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
# Needed by the MicroProfile REST Client subsystem
Expand Down
1 change: 1 addition & 0 deletions host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
View file
Open in desktop
Expand Up @@ -62,6 +62,7 @@ public final class JvmType {
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
Expand Down
2 changes: 1 addition & 1 deletion ...oller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
View file
Open in desktop
Expand Up @@ -129,7 +129,7 @@ public void testGetServerLaunchCommand() throws UnknownHostException {
List<String> result = instance.getServerLaunchCommand();
MatcherAssert.assertThat(result.size(), is(notNullValue()));
if (result.size() > 18) {
MatcherAssert.assertThat(result.size(), is(31));
MatcherAssert.assertThat(result.size(), is(32));
} else {
MatcherAssert.assertThat(result.size(), is(18));
}
Expand Down
1 change: 1 addition & 0 deletions launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
View file
Open in desktop
Expand Up @@ -67,6 +67,7 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED");
modularJavaOpts.add("--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED");
Expand Down
1 change: 1 addition & 0 deletions launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
View file
Open in desktop
Expand Up @@ -272,6 +272,7 @@ private void testJPMSArguments(final Collection<String> command, final int expec
assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.base/java.io=ALL-UNNAMED", expectedCount);
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -89,6 +89,7 @@
--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED
--add-exports=java.naming/com.sun.jndi.url.ldap=ALL-UNNAMED
--add-exports=java.naming/com.sun.jndi.url.ldaps=ALL-UNNAMED
--add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
Expand Down Expand Up @@ -170,7 +171,7 @@
e.g. a bootable jar or a jboss-cli-client.jar.
NB: In case an update is made to these exports and opens, make sure that the common.sh script is in sync.
-->
<embedding.jar.jpms.exports>java.desktop/sun.awt java.naming/com.sun.jndi.ldap java.naming/com.sun.jndi.url.ldap java.naming/com.sun.jndi.url.ldaps</embedding.jar.jpms.exports>
<embedding.jar.jpms.exports>java.desktop/sun.awt java.naming/com.sun.jndi.ldap java.naming/com.sun.jndi.url.ldap java.naming/com.sun.jndi.url.ldaps jdk.naming.dns/com.sun.jndi.dns</embedding.jar.jpms.exports>
<embedding.jar.jpms.opens>java.base/java.lang java.base/java.lang.invoke java.base/java.lang.reflect java.base/java.io java.base/java.security java.base/java.util java.base/java.util.concurrent java.management/javax.management java.naming/javax.naming</embedding.jar.jpms.opens>

<!--
Expand Down