SONAR-19091 Fix SSF-383

(cherry picked from commit 9708d98955560e51ecc3d1089a7d68e81277114c)

diff --git a/build.gradle b/build.gradle
index 3f6e5536ece24e274a9d47a927f843f92885c85a..f3e70cccb31c68c7b74a5c175ada8f86112f35bd 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -295,7 +295,7 @@ subprojects {
         entry 'log4j-api'
         entry 'log4j-to-slf4j'
       }
-      dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.70') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.74') {
         entry 'tomcat-embed-core'
         entry('tomcat-embed-jasper') {
           exclude 'org.eclipse.jdt.core.compiler:ecj'

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java
index b9d31776b8c1578e3f75c9522bfa39896947a86f..7f5487903d31cd3fafd912080969803bbc2db421 100644 (file)
--- a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatConnectors.java
@@ -89,7 +89,7 @@ class TomcatConnectors {
   private static void configureCompression(Connector connector) {
     connector.setProperty("compression", "on");
     connector.setProperty("compressionMinSize", "1024");
-    connector.setProperty("compressableMimeType", "text/html,text/xml,text/plain,text/css,application/json,application/javascript");
+    connector.setProperty("compressibleMimeType", "text/html,text/xml,text/plain,text/css,application/json,application/javascript,text/javascript");
   }
 
   private static void setConnectorAttribute(Connector c, String key, @Nullable Object value) {

diff --git a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
index 5da0f634a6a07643f87f18e3b75fb72fb5bb3d08..88062ad50d1ffccdf35d2acd64df32291fb52e0e 100644 (file)
--- a/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
+++ b/sonar-ws/src/main/java/org/sonarqube/ws/MediaTypes.java
@@ -32,7 +32,7 @@ public final class MediaTypes {
   public static final String CSV = "text/csv";
   public static final String DEFAULT = "application/octet-stream";
   public static final String HTML = "text/html";
-  public static final String JAVASCRIPT = "application/javascript";
+  public static final String JAVASCRIPT = "text/javascript";
   public static final String JSON = "application/json";
   public static final String PROTOBUF = "application/x-protobuf";
   public static final String SVG = "image/svg+xml";