From 8b7cd93d7a751fd49e8df3faef1cf03e320f470a Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 7 Feb 2019 17:11:32 +0100
Subject: [PATCH] Revert "SONAR-11680 upgrade Tomcat to 8.5.37"

This reverts commit 1d12ea0bec9843400ec62e378df0730834220545.
---
 build.gradle                                                   | 2 +-
 .../src/main/java/org/sonar/server/app/TomcatContexts.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 903c5ea6261..2435486fce3 100644
--- 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.37') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '8.5.23') {
         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 81cf3a59b5d..c49086527c1 100644
--- 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,6 +23,7 @@ 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;
@@ -109,7 +110,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 (Exception e) {
+    } catch (ServletException e) {
       throw new IllegalStateException("Fail to configure webapp from " + dir, e);
     }
   }
-- 
2.39.5