diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2019-02-07 13:52:57 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2019-02-07 17:08:19 +0100 |
| commit | 1d12ea0bec9843400ec62e378df0730834220545 (patch) | |
| tree | 150ef2781c6c0aa54dbc1617f41bc9bfbe401a6b | |
| parent | d2f6a51f791ab430da08bea7dc46373288274ffb (diff) | |
| download | sonarqube-1d12ea0bec9843400ec62e378df0730834220545.tar.gz sonarqube-1d12ea0bec9843400ec62e378df0730834220545.zip | |
SONAR-11680 upgrade Tomcat to 8.5.37
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index 2435486fce3..903c5ea6261 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.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 c49086527c1..81cf3a59b5d 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,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); } } |