Restore Tomcat in CLI

Seems to work. I think the problem was the race conditions
that we hopefully already eliminated. I got an out of memory
error running the samples tests in Eclipse, but then it went
away again (something to look out for).

[Fixes #54925992] [bs-280]
This commit is contained in:
Dave Syer 2013-08-19 16:00:50 +01:00 committed by Phillip Webb
parent 52144fbbb6
commit 0993f3da0a
1 changed files with 6 additions and 3 deletions

View File

@ -43,9 +43,12 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
.add("org.springframework", "spring-webmvc",
dependencies.getProperty("spring.version"));
dependencies.ifAnyMissingClasses("org.eclipse.jetty.server.Server").add(
"org.eclipse.jetty", "jetty-webapp",
dependencies.getProperty("jetty.version"));
dependencies
.ifAnyMissingClasses("org.apache.catalina.startup.Tomcat")
.add("org.apache.tomcat.embed", "tomcat-embed-core",
dependencies.getProperty("tomcat.version"))
.add("org.apache.tomcat.embed", "tomcat-embed-logging-juli",
dependencies.getProperty("tomcat.version"));
dependencies.add("org.codehaus.groovy", "groovy-templates",
dependencies.getProperty("groovy.version"));