From 0993f3da0a39843626ec943b7fcdb7046253e435 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 19 Aug 2013 16:00:50 +0100 Subject: [PATCH] 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] --- .../SpringMvcCompilerAutoConfiguration.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index f74a9535b30..fe08ac6d8f2 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -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"));