From 8e686273e58bab23755253a520a8ed0a2ef45afa Mon Sep 17 00:00:00 2001 From: Ekaterina Dimitrova Date: Thu, 7 Nov 2024 16:36:38 -0500 Subject: [PATCH] Sort alphabetically add-exports/add-opens as per review request --- build.xml | 37 ++++++++++++++++++------------------- conf/jvm22-clients.options | 10 +++++----- conf/jvm22-server.options | 37 +++++++++++++++++++++---------------- 3 files changed, 44 insertions(+), 40 deletions(-) diff --git a/build.xml b/build.xml index 81aa9c22a94a..0b0e660c59ac 100644 --- a/build.xml +++ b/build.xml @@ -285,38 +285,37 @@ --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports java.base/jdk.internal.perf=ALL-UNNAMED + --add-exports java.base/jdk.internal.util.jar=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED - --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED - --add-exports java.base/jdk.internal.util.jar=ALL-UNNAMED - --add-opens java.base/jdk.internal.module=ALL-UNNAMED - --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED - --add-opens java.base/jdk.internal.loader=ALL-UNNAMED - --add-opens java.base/jdk.internal.ref=ALL-UNNAMED - --add-opens java.base/jdk.internal.math=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED - --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED - --add-opens 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.module=ALL-UNNAMED + --add-opens java.base/java.lang.ref=ALL-UNNAMED + --add-opens java.base/java.lang.reflect=ALL-UNNAMED + --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.io=ALL-UNNAMED - --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.nio.file.spi=ALL-UNNAMED - --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.lang.reflect=ALL-UNNAMED - --add-opens java.base/java.lang.ref=ALL-UNNAMED - --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED - --add-opens java.base/jdk.internal.vm=ALL-UNNAMED --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED - + --add-opens java.base/jdk.internal.loader=ALL-UNNAMED + --add-opens java.base/jdk.internal.math=ALL-UNNAMED + --add-opens java.base/jdk.internal.module=ALL-UNNAMED + --add-opens java.base/jdk.internal.ref=ALL-UNNAMED + --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED + --add-opens java.base/jdk.internal.vm=ALL-UNNAMED + --add-opens java.base/sun.nio.ch=ALL-UNNAMED + --add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED + --add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED + --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED + --add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens java.base/java.nio.file.attribute=ALL-UNNAMED diff --git a/conf/jvm22-clients.options b/conf/jvm22-clients.options index 29a60115447c..42ee72e33a67 100644 --- a/conf/jvm22-clients.options +++ b/conf/jvm22-clients.options @@ -18,15 +18,15 @@ --add-exports java.sql/java.sql=ALL-UNNAMED --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED +--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.module=ALL-UNNAMED +--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/jdk.internal.loader=ALL-UNNAMED ---add-opens java.base/jdk.internal.ref=ALL-UNNAMED ---add-opens java.base/jdk.internal.reflect=ALL-UNNAMED --add-opens java.base/jdk.internal.math=ALL-UNNAMED --add-opens java.base/jdk.internal.module=ALL-UNNAMED ---add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED ---add-opens java.base/java.io=ALL-UNNAMED +--add-opens java.base/jdk.internal.ref=ALL-UNNAMED +--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED +--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED # The newline in the end of file is intentional diff --git a/conf/jvm22-server.options b/conf/jvm22-server.options index 1e5260882fe1..c28e659a6edd 100644 --- a/conf/jvm22-server.options +++ b/conf/jvm22-server.options @@ -43,34 +43,34 @@ --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-exports java.base/jdk.internal.perf=ALL-UNNAMED +--add-exports java.base/jdk.internal.util.jar=ALL-UNNAMED --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED --add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports java.rmi/sun.rmi.server=ALL-UNNAMED +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming --add-exports jdk.unsupported/sun.misc=ALL-UNNAMED ---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED ---add-exports java.base/jdk.internal.util.jar=ALL-UNNAMED ---add-opens java.base/jdk.internal.loader=ALL-UNNAMED ---add-opens java.base/jdk.internal.ref=ALL-UNNAMED ---add-opens java.base/jdk.internal.reflect=ALL-UNNAMED ---add-opens java.base/jdk.internal.math=ALL-UNNAMED ---add-opens java.base/jdk.internal.module=ALL-UNNAMED ---add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED +--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.lang.module=ALL-UNNAMED ---add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED ---add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED ---add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED +--add-opens java.base/java.lang=ALL-UNNAMED +--add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/java.nio.file.spi=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED ---add-opens java.base/java.lang=ALL-UNNAMED ---add-opens java.base/java.lang.reflect=ALL-UNNAMED ---add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED ---add-opens java.base/jdk.internal.vm=ALL-UNNAMED --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED +--add-opens java.base/jdk.internal.loader=ALL-UNNAMED +--add-opens java.base/jdk.internal.math=ALL-UNNAMED +--add-opens java.base/jdk.internal.module=ALL-UNNAMED +--add-opens java.base/jdk.internal.ref=ALL-UNNAMED +--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED +--add-opens java.base/jdk.internal.vm=ALL-UNNAMED +--add-opens jdk.compiler/com.sun.tools.javac=ALL-UNNAMED +--add-opens jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED +--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED +--add-opens jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED # required for org.apache.cassandra.Util.getSupportedMTimeGranularity --add-opens java.base/java.nio.file.attribute=ALL-UNNAMED @@ -107,7 +107,12 @@ --add-modules jdk.incubator.vector ### Compatibility Options ---add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED +--add-opens java.base/java.io=ALL-UNNAMED +--add-opens java.base/java.lang=ALL-UNNAMED +--add-opens java.base/java.nio=ALL-UNNAMED +--add-opens java.base/java.util=ALL-UNNAMED +--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED +--add-opens java.base/sun.nio.ch=ALL-UNNAMED -Djava.security.manager=allow # The newline in the end of file is intentional