Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'

dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
// Should use spring-boot-starter-tomcat as provideCompile, but gradle plugin
// is putting too much in lib-provided: see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/409
// providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
}

bootJar {
Expand Down
7 changes: 6 additions & 1 deletion dev/io.openliberty.springboot.fat40.mbean.app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'

dependencies {
implementation('org.springframework.boot:spring-boot-starter-web') // + ':' + sv['springBoot'])
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
// Should use spring-boot-starter-tomcat as provideCompile, but gradle plugin
// is putting too much in lib-provided: see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/409
// providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
}

bootJar {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
TemplateTests40.class,
ApplicationStartedEventTests40.class,
ConcurrencyAppTests40.class,
ConcurrencyAppTests40War.class,
MBeanAppTests40.class,
MBeanAppTests40War.class,
JmsSpringBootAppTests40.class,
JmsWebAppTests40.class

Expand Down