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-6346] Module java.base must open java.net package to all unnamed modules #5498

Merged
merged 1 commit into from May 11, 2023
Merged

[WFCORE-6346] Module java.base must open java.net package to all unnamed modules #5498

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
6 changes: 4 additions & 2 deletions core-feature-pack/common/src/main/resources/content/bin/common.bat
View file
Open in desktop
Expand Up @@ -50,10 +50,12 @@ goto :eof
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
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 JBoss Marshalling
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.io=ALL-UNNAMED"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional? Different open than java.net

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mchoma This one should be fine, it was already there and down from L53 to keep it in the same order as it was declared in the other files

rem Needed by WildFly Http Client
set "DEFAULT_MODULAR_JVM_OPTIONS=!DEFAULT_MODULAR_JVM_OPTIONS! --add-opens=java.base/java.net=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 collections
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 @@ -182,6 +182,8 @@ Param(
$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 Http Client
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.net=ALL-UNNAMED"
# Needed by WildFly Security Manager
$DEFAULT_MODULAR_JVM_OPTIONS += "--add-opens=java.base/java.security=ALL-UNNAMED"
# Needed for marshalling of collections
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 @@ -52,6 +52,8 @@ setDefaultModularJvmOptions() {
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 Http Client
DEFAULT_MODULAR_JVM_OPTIONS="$DEFAULT_MODULAR_JVM_OPTIONS --add-opens=java.base/java.net=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 collections
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 @@ -67,6 +67,7 @@ public final class JvmType {
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.net=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");
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(32));
MatcherAssert.assertThat(result.size(), is(33));
} 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 @@ -72,6 +72,7 @@ abstract class AbstractCommandBuilder<T extends AbstractCommandBuilder<T>> imple
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.net=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");
Expand Down
2 changes: 2 additions & 0 deletions launcher/src/test/java/org/wildfly/core/launcher/CommandBuilderTest.java
View file
Open in desktop
Expand Up @@ -273,9 +273,11 @@ private void testJPMSArguments(final Collection<String> command, final int expec
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=ALL-UNNAMED", expectedCount);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems as out of scope of this change.

Double checking if this is intentional.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine; this test is testing that the expected JVM modular options are also used when launching jar files or the server for the tests

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this was just a missing assert that Rio took the opportunity to correct.

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.net=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);
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -94,6 +94,7 @@
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.security=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
Expand Down Expand Up @@ -159,7 +160,7 @@
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 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>
<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.net 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>

<!--
Dependency versions. Please keep alphabetical.
Expand Down