SONAR-11680 upgrade Tomcat to 8.5.37

diff --git a/build.gradle b/build.gradle
index 2435486fce34741014c7ec49fd0d2e4736010d6d..903c5ea626186ff9ab742ab421540b83f50ba4fb 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -164,7 +164,7 @@ subprojects {
         entry 'log4j-to-slf4j'
         entry 'log4j-core'
       }
-      dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.23') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.37') {
         entry 'tomcat-embed-core'
         entry('tomcat-embed-jasper') {
           exclude 'org.eclipse.jdt.core.compiler:ecj'

diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
index c49086527c1974cc8b5236c163eb62bd5055fc15..81cf3a59b5dad8fb52f44e9b89d30926f56b9c39 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java
@@ -23,7 +23,6 @@ import com.google.common.annotations.VisibleForTesting;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
-import javax.servlet.ServletException;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.commons.io.FileUtils;
@@ -110,7 +109,7 @@ public class TomcatContexts {
       // disable JSP and WebSocket support
       context.setContainerSciFilter("org.apache.tomcat.websocket.server.WsSci|org.apache.jasper.servlet.JasperInitializer");
       return context;
-    } catch (ServletException e) {
+    } catch (Exception e) {
       throw new IllegalStateException("Fail to configure webapp from " + dir, e);
     }
   }