Browse Source

SONAR-15230 Fix JVM startup args for Hazelcast

tags/9.1.0.47736
Duarte Meneses 2 years ago
parent
commit
c9676adac6

+ 8
- 0
server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java View File

@@ -37,6 +37,14 @@ public class CeJvmOptions extends JvmOptions<CeJvmOptions> {
res.put("-XX:-OmitStackTraceInFastThrow", "");
// avoid illegal reflective access operations done by MyBatis
res.put("--add-opens=java.base/java.util=ALL-UNNAMED", "");

// avoid illegal reflective access operations done by Hazelcast
res.put("--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED", "");
res.put("--add-opens=java.base/java.lang=ALL-UNNAMED", "");
res.put("--add-opens=java.base/java.nio=ALL-UNNAMED", "");
res.put("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED", "");
res.put("--add-opens=java.management/sun.management=ALL-UNNAMED", "");
res.put("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED", "");
return res;
}
}

+ 8
- 0
server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java View File

@@ -42,6 +42,14 @@ public class WebJvmOptions extends JvmOptions<WebJvmOptions> {
res.put("--add-opens=java.base/java.lang=ALL-UNNAMED", "");
res.put("--add-opens=java.base/java.io=ALL-UNNAMED", "");
res.put("--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED", "");

// avoid illegal reflective access operations done by Hazelcast
res.put("--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED", "");
res.put("--add-opens=java.base/java.nio=ALL-UNNAMED", "");
res.put("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED", "");
res.put("--add-opens=java.management/sun.management=ALL-UNNAMED", "");
res.put("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED", "");

return res;
}
}

+ 7
- 1
server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java View File

@@ -45,6 +45,12 @@ public class CeJvmOptionsTest {
underTest = new CeJvmOptions(tmpDir);
assertThat(underTest.getAll()).containsExactly(
"-Djava.awt.headless=true", "-Dfile.encoding=UTF-8", "-Djava.io.tmpdir=" + tmpDir.getAbsolutePath(), "-XX:-OmitStackTraceInFastThrow",
"--add-opens=java.base/java.util=ALL-UNNAMED");
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
}
}

+ 6
- 1
server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java View File

@@ -49,7 +49,12 @@ public class WebJvmOptionsTest {
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.io=ALL-UNNAMED",
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED");
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED",
"--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED",
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.management/sun.management=ALL-UNNAMED",
"--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
}

}

+ 8
- 0
sonar-application/src/main/assembly/conf/wrapper.conf View File

@@ -14,6 +14,14 @@ wrapper.java.command=java
#********************************************************************
wrapper.java.additional.1=-Dsonar.wrapped=true
wrapper.java.additional.2=-Djava.awt.headless=true
# extra args needed by hazelcast
wrapper.java.additional.3=--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED
wrapper.java.additional.4=--add-opens=java.base/java.lang=ALL-UNNAMED
wrapper.java.additional.5=--add-opens=java.base/java.nio=ALL-UNNAMED
wrapper.java.additional.6=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
wrapper.java.additional.7=--add-opens=java.management/sun.management=ALL-UNNAMED
wrapper.java.additional.8=--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED

wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
wrapper.java.classpath.1=../../lib/sonar-application-@sqversion@.jar
wrapper.java.classpath.2=../../lib/jsw/wrapper-3.2.3.jar

Loading…
Cancel
Save