Skip to content

Commit 229943a

Browse files
author
Dave Syer
committed
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]
1 parent 12241ec commit 229943a

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ public void applyDependencies(DependencyCustomizer dependencies) {
4343
.add("org.springframework", "spring-webmvc",
4444
dependencies.getProperty("spring.version"));
4545

46-
dependencies.ifAnyMissingClasses("org.eclipse.jetty.server.Server").add(
47-
"org.eclipse.jetty", "jetty-webapp",
48-
dependencies.getProperty("jetty.version"));
46+
dependencies
47+
.ifAnyMissingClasses("org.apache.catalina.startup.Tomcat")
48+
.add("org.apache.tomcat.embed", "tomcat-embed-core",
49+
dependencies.getProperty("tomcat.version"))
50+
.add("org.apache.tomcat.embed", "tomcat-embed-logging-juli",
51+
dependencies.getProperty("tomcat.version"));
4952

5053
dependencies.add("org.codehaus.groovy", "groovy-templates",
5154
dependencies.getProperty("groovy.version"));

0 commit comments

Comments
 (0)