Browse Source

SONAR-11680 upgrade Tomcat to 8.5.37

tags/7.7
Simon Brandhof 5 years ago
parent
commit
27d19d7a35

+ 1
- 1
build.gradle View File

entry 'log4j-to-slf4j' entry 'log4j-to-slf4j'
entry 'log4j-core' 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-core'
entry('tomcat-embed-jasper') { entry('tomcat-embed-jasper') {
exclude 'org.eclipse.jdt.core.compiler:ecj' exclude 'org.eclipse.jdt.core.compiler:ecj'

+ 1
- 2
server/sonar-server/src/main/java/org/sonar/server/app/TomcatContexts.java View File

import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import javax.servlet.ServletException;
import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
// disable JSP and WebSocket support // disable JSP and WebSocket support
context.setContainerSciFilter("org.apache.tomcat.websocket.server.WsSci|org.apache.jasper.servlet.JasperInitializer"); context.setContainerSciFilter("org.apache.tomcat.websocket.server.WsSci|org.apache.jasper.servlet.JasperInitializer");
return context; return context;
} catch (ServletException e) {
} catch (Exception e) {
throw new IllegalStateException("Fail to configure webapp from " + dir, e); throw new IllegalStateException("Fail to configure webapp from " + dir, e);
} }
} }

Loading…
Cancel
Save