aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorlukasz-jarocki-sonarsource <lukasz.jarocki@sonarsource.com>2024-06-11 15:35:20 +0200
committersonartech <sonartech@sonarsource.com>2024-06-18 20:02:41 +0000
commit1c1a7deb19d018893bb7c228f4fe4e3755b4e2a2 (patch)
treeec1d15d5c33db3a8659a7551fd3cd9386db055d5 /server
parentc5a79c9f7724e1a7699bb3053fbabcfdaa14a1a9 (diff)
downloadsonarqube-1c1a7deb19d018893bb7c228f4fe4e3755b4e2a2.tar.gz
sonarqube-1c1a7deb19d018893bb7c228f4fe4e3755b4e2a2.zip
NO-JIRA removed FIPS flag from processes
Diffstat (limited to 'server')
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java3
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java2
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java3
-rw-r--r--server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java3
-rw-r--r--server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java2
-rw-r--r--server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java3
6 files changed, 2 insertions, 14 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java b/server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java
index f49c41e7db8..da3628325c9 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/command/CeJvmOptions.java
@@ -46,9 +46,6 @@ public class CeJvmOptions extends JvmOptions<CeJvmOptions> {
res.put("--add-opens=java.management/sun.management=ALL-UNNAMED", "");
res.put("--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED", "");
- // disable FIPS mode for the JVM so SonarQube can use certain algorithms
- res.put("-Dcom.redhat.fips=", "false");
-
return res;
}
}
diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java
index 939be9cc0df..150a4065770 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/command/EsJvmOptions.java
@@ -123,8 +123,6 @@ public class EsJvmOptions extends JvmOptions<EsJvmOptions> {
* parsing will break in an incompatible way for some date patterns and locales.
*/
res.put("-Djava.locale.providers=", "COMPAT");
- // disable FIPS mode for the JVM so SonarQube can use certain algorithms
- res.put("-Dcom.redhat.fips=", "false");
}
public void writeToJvmOptionFile(File file) {
diff --git a/server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java b/server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java
index 59a4c36fdfe..0a45489c5be 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/command/WebJvmOptions.java
@@ -49,9 +49,6 @@ public class WebJvmOptions extends JvmOptions<WebJvmOptions> {
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", "");
-
- // disable FIPS mode for the JVM so SonarQube can use certain algorithms
- res.put("-Dcom.redhat.fips=", "false");
return res;
}
diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java
index 5e58916323c..f1844b45fa8 100644
--- a/server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/command/CeJvmOptionsTest.java
@@ -51,7 +51,6 @@ public class CeJvmOptionsTest {
"--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",
- "-Dcom.redhat.fips=false");
+ "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
}
}
diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java
index 4e238f54230..b26ff72651d 100644
--- a/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/command/EsJvmOptionsTest.java
@@ -74,7 +74,6 @@ public class EsJvmOptionsTest {
"-Dlog4j2.disable.jmx=true",
"-Dlog4j2.formatMsgNoLookups=true",
"-Djava.locale.providers=COMPAT",
- "-Dcom.redhat.fips=false",
"-Des.enforce.bootstrap.checks=true",
"-Xlog:disable");
}
@@ -212,7 +211,6 @@ public class EsJvmOptionsTest {
"-Dlog4j2.disable.jmx=true\n" +
"-Dlog4j2.formatMsgNoLookups=true\n" +
"-Djava.locale.providers=COMPAT\n" +
- "-Dcom.redhat.fips=false\n" +
"-Des.enforce.bootstrap.checks=true\n" +
"-foo\n" +
"-bar");
diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java
index 988d2bbfc2d..7b84ca9eb18 100644
--- a/server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/command/WebJvmOptionsTest.java
@@ -54,8 +54,7 @@ public class WebJvmOptionsTest {
"--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",
- "-Dcom.redhat.fips=false");
+ "--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED");
}
}