Automatic merge from branch-6.6

* origin/branch-6.6:
  Prepare for next development iteration
  SONAR-9721 Fix potential OkHttpClient connection leak
  Publish 6.6 Release Candidate 1
  fix quality flaws
  Propagate parameters of SQ analysis required by burgr
  fix unwanted text wrapping in the header in ie11
  SONAR-9908 on Windows, launch Elasticsearch directly, without batch files (#2642)
  SONAR-9694 Ignore when secondary locations are out of current file for backdating
  Fix sidebar position helper in IE

1 files changed, 11 insertions, 0 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/System2.java b/server/sonar-process/src/main/java/org/sonar/process/System2.java
index 1c9ca5c51c6..0e32165046c 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/System2.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/System2.java
@@ -20,6 +20,7 @@
 package org.sonar.process;
 
 import java.util.Map;
+import org.apache.commons.lang.SystemUtils;
 
 /**
  * An interface allowing to wrap around static call to {@link System} class.
@@ -35,6 +36,11 @@ public interface System2 {
     public String getenv(String name) {
       return System.getenv(name);
     }
+
+    @Override
+    public boolean isOsWindows() {
+      return SystemUtils.IS_OS_WINDOWS;
+    }
   };
 
   /**
@@ -46,4 +52,9 @@ public interface System2 {
    * Proxy to {@link System#getenv(String)}.
    */
   String getenv(String name);
+
+  /**
+   * True if this is MS Windows.
+   */
+  boolean isOsWindows();
 }