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-5406] Add --add-opens to the SE 9+ VM launch for expected reflective access by the server (round 2) #4728

Merged
merged 1 commit into from
Aug 31, 2021
Merged

[WFCORE-5406] Add --add-opens to the SE 9+ VM launch for expected reflective access by the server (round 2) #4728

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core-feature-pack/common/src/main/resources/content/bin/common.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ goto :eof
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
rem Needed by JBoss Marshalling
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.io=ALL-UNNAMED"
rem Needed for marshalling of proxies
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
rem Needed by WildFly Security Manager
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.security=ALL-UNNAMED"
rem Needed for marshalling of enum maps
rem Needed for marshalling of collections
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.util=ALL-UNNAMED"
rem Needed for marshalling of concurrent collections
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
rem EE integration with sar mbeans requires deep reflection in javax.management
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.management/javax.management=ALL-UNNAMED"
rem InitialContext proxy generation requires deep reflection in javax.naming
Expand Down
6 changes: 5 additions & 1 deletion core-feature-pack/common/src/main/resources/content/bin/common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,16 @@ Param(
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang=ALL-UNNAMED"
# Needed by the MicroProfile REST Client subsystem
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
# Needed for marshalling of proxies
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
# Needed by JBoss Marshalling
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.io=ALL-UNNAMED"
# Needed by WildFly Security Manager
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.security=ALL-UNNAMED"
# Needed for marshalling of enum maps
# Needed for marshalling of collections
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.util=ALL-UNNAMED"
# Needed for marshalling of concurrent collections
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
# EE integration with sar mbeans requires deep reflection in javax.management
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.management/javax.management=ALL-UNNAMED"
# InitialContext proxy generation requires deep reflection in javax.naming
Expand Down
6 changes: 5 additions & 1 deletion core-feature-pack/common/src/main/resources/content/bin/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ setDefaultModularJvmOptions() {
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
# Needed by the MicroProfile REST Client subsystem
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang.invoke=ALL-UNNAMED"
# Needed for marshalling of proxies
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
# Needed by JBoss Marshalling
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED"
# Needed by WildFly Security Manager
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.security=ALL-UNNAMED"
# Needed for marshalling of enum maps
# Needed for marshalling of collections
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED"
# Needed for marshalling of concurrent collections
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.util.concurrent=ALL-UNNAMED"
# EE integration with sar mbeans requires deep reflection in javax.management
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.management/javax.management=ALL-UNNAMED"
# InitialContext proxy generation requires deep reflection in javax.naming
Expand Down
2 changes: 2 additions & 0 deletions host-controller/src/main/java/org/jboss/as/host/controller/jvm/JvmType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ public final class JvmType {
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.ldap=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");
modularJavaOpts.add("--add-opens=java.base/java.io=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.security=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.util=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.management/javax.management=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.naming/javax.naming=ALL-UNNAMED");
DEFAULT_MODULAR_JVM_ARGUMENTS = Collections.unmodifiableList(modularJavaOpts);
Expand Down
2 changes: 1 addition & 1 deletion ...oller/src/test/java/org/jboss/as/host/controller/ManagedServerBootCmdFactoryTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void testGetServerLaunchCommand() throws UnknownHostException {
List<String> result = instance.getServerLaunchCommand();
Assert.assertThat(result.size(), is(notNullValue()));
if (result.size() > 18) {
Assert.assertThat(result.size(), is(27));
Assert.assertThat(result.size(), is(29));
} else {
Assert.assertThat(result.size(), is(18));
}
Expand Down
2 changes: 2 additions & 0 deletions launcher/src/main/java/org/wildfly/core/launcher/AbstractCommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
modularJavaOpts.add("--add-exports=java.naming/com.sun.jndi.ldap=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");
modularJavaOpts.add("--add-opens=java.base/java.io=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.security=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.util=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.management/javax.management=ALL-UNNAMED");
modularJavaOpts.add("--add-opens=java.naming/javax.naming=ALL-UNNAMED");
// As of jboss-modules 1.9.1.Final the java.se module is no longer required to be added. However as this API is
Expand Down
6 changes: 6 additions & 0 deletions launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,11 @@ private void testModularJvmArguments(final Collection<String> command, final int
assertArgumentExists(command, "--add-exports=java.desktop/sun.awt=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-exports=java.naming/com.sun.jndi.ldap=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);
assertArgumentExists(command, "--add-opens=java.base/java.security=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.base/java.util=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.management/javax.management=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-opens=java.naming/javax.naming=ALL-UNNAMED", expectedCount);
assertArgumentExists(command, "--add-modules=java.se", expectedCount);
Expand All @@ -276,12 +278,16 @@ private void testModularJvmArguments(final Collection<String> command, final int
command.contains("--add-opens=java.base/java.lang=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.lang.reflect=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.io=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.io=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.security=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.security=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.util=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.util=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.management/javax.management=ALL-UNNAMED\" to be in the command list",
command.contains("--add-opens=java.management/javax.management=ALL-UNNAMED"));
Assert.assertFalse("Did not expect \"--add-opens=java.naming/javax.naming=ALL-UNNAMED\" to be in the command list",
Expand Down