Skip to content

Commit 18ccbf0

Browse files
committed
Remove validation starter from web starters
This commit removes the validation starter from the web and webflux starters - we've reconsidered that choice since many were not using this feature as part of their default web experience. Thit commit also changes the default EL implementation for the Jakarta implementation, aligning all servers on it and simplifying dependency management (especially exclusions that were required previously). Closes gh-19550
1 parent 3857a31 commit 18ccbf0

File tree

8 files changed

+6
-6
lines changed

8 files changed

+6
-6
lines changed

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ dependencies {
2121
exclude group: 'javax.websocket', module: 'javax.websocket-api'
2222
exclude group: 'javax.websocket', module: 'javax.websocket-client-api'
2323
}
24-
api 'org.mortbay.jasper:apache-el'
24+
api 'org.glassfish:jakarta.el'
2525
}

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
api ('org.apache.tomcat.embed:tomcat-embed-core') {
1111
exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api'
1212
}
13-
api 'org.apache.tomcat.embed:tomcat-embed-el'
13+
api 'org.glassfish:jakarta.el'
1414
api ('org.apache.tomcat.embed:tomcat-embed-websocket') {
1515
exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api'
1616
}

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ description = "Starter for using Java Bean Validation with Hibernate Validator"
77
dependencies {
88
api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
99
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
10-
api 'org.apache.tomcat.embed:tomcat-embed-el'
10+
api 'org.glassfish:jakarta.el'
1111
api 'org.hibernate.validator:hibernate-validator'
1212
}

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ dependencies {
99
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
1010
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json')
1111
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat')
12-
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
13-
api 'org.hibernate.validator:hibernate-validator'
1412
api 'org.springframework:spring-web'
1513
api 'org.springframework:spring-webmvc'
1614
}

Diff for: spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies {
99
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
1010
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json')
1111
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-reactor-netty')
12-
api 'org.hibernate.validator:hibernate-validator'
1312
api 'org.springframework:spring-web'
1413
api 'org.springframework:spring-webflux'
1514
api 'org.synchronoss.cloud:nio-multipart-parser'

Diff for: spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc')
1111
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security')
1212
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')
13+
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
1314
runtimeOnly 'com.h2database:h2'
1415

1516
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')

Diff for: spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description = 'Spring Boot web Groovy Templates smoke test'
77

88
dependencies {
99
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates')
10+
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
1011
if (JavaVersion.current().java9Compatible) {
1112
implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
1213
}

Diff for: spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ description = 'Spring Boot web UI smoke test'
88
dependencies {
99
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf')
1010
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')
11+
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
1112

1213
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
1314
}

0 commit comments

Comments
 (0)