Skip to content

Commit 1f8fe4f

Browse files
committed
Mark tomcat dependencies provided
Marking just the tomcat starter dependency as provided did not work as expected for Spring Boot 4.0.0 version.
1 parent e9203bd commit 1f8fe4f

File tree

10 files changed

+30
-11
lines changed

10 files changed

+30
-11
lines changed

dev/io.openliberty.springboot.fat40.concurrency.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2828

2929
dependencies {
3030
implementation('org.springframework.boot:spring-boot-starter-web')
31-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
31+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3234
}

dev/io.openliberty.springboot.fat40.data.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ dependencies {
3030
implementation('org.springframework.boot:spring-boot-starter-data-jpa')
3131
implementation('org.hibernate.orm:hibernate-community-dialects:7.1.0.Final')
3232
runtimeOnly 'com.h2database:h2'
33-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
35+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3436
providedCompile 'org.hibernate.orm:hibernate-core:7.1.0.Final'
3537
providedCompile 'jakarta.transaction:jakarta.transaction-api'
3638
providedCompile 'jakarta.persistence:jakarta.persistence-api'

dev/io.openliberty.springboot.fat40.http.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
3030

3131
dependencies {
3232
implementation('org.springframework.boot:spring-boot-starter-web')
33-
providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
35+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3436
}

dev/io.openliberty.springboot.fat40.http.contextroot.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
3030

3131
dependencies {
3232
implementation('org.springframework.boot:spring-boot-starter-web')
33-
providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
35+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3436
}

dev/io.openliberty.springboot.fat40.jms.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@ dependencies {
3131
implementation('org.springframework.integration:spring-integration-jms')
3232
implementation('org.springframework.boot:spring-boot-starter-jdbc')
3333
providedCompile('jakarta.jms:jakarta.jms-api:3.1.0')
34-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
35+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
36+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3537
}

dev/io.openliberty.springboot.fat40.mbean.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2828

2929
dependencies {
3030
implementation('org.springframework.boot:spring-boot-starter-web')
31-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
31+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3234
}

dev/io.openliberty.springboot.fat40.transactions.app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2727
dependencies {
2828
implementation('org.springframework.boot:spring-boot-starter-web')
2929
implementation('org.springframework.boot:spring-boot-starter-jdbc')
30-
31-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
30+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
31+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3233
}

dev/io.openliberty.springboot.fat40.validation.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2727

2828
dependencies {
2929
implementation('org.springframework.boot:spring-boot-starter-web')
30-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
30+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
31+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3133
implementation ('org.springframework.boot:spring-boot-starter-validation') {
3234
exclude group: 'org.hibernate.validator', module: 'hibernate-validator'
3335
}

dev/io.openliberty.springboot.fat40.war.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2929

3030
dependencies {
3131
implementation('org.springframework.boot:spring-boot-starter-web')
32-
providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3335
}

dev/io.openliberty.springboot.fat40.websocket.app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,7 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
2929

3030
dependencies {
3131
implementation('org.springframework.boot:spring-boot-starter-websocket')
32-
providedRuntime('org.springframework.boot:spring-boot-tomcat-runtime')
32+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
33+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
34+
providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
3335
}

0 commit comments

Comments
 (0)