From 1c1a7deb19d018893bb7c228f4fe4e3755b4e2a2 Mon Sep 17 00:00:00 2001
From: lukasz-jarocki-sonarsource <lukasz.jarocki@sonarsource.com>
Date: Tue, 11 Jun 2024 15:35:20 +0200
Subject: NO-JIRA removed FIPS flag from processes

---
 .../src/main/java/org/sonar/application/command/CeJvmOptions.java      | 3 ---
 .../src/main/java/org/sonar/application/command/EsJvmOptions.java      | 2 --
 .../src/main/java/org/sonar/application/command/WebJvmOptions.java     | 3 ---
 .../src/test/java/org/sonar/application/command/CeJvmOptionsTest.java  | 3 +--
 .../src/test/java/org/sonar/application/command/EsJvmOptionsTest.java  | 2 --
 .../src/test/java/org/sonar/application/command/WebJvmOptionsTest.java | 3 +--
 6 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'server')

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");
   }
 
 }
-- 
cgit v1.2.3