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
pull/19681/head
Brian Clozel 5 years ago
parent 3857a313e3
commit 18ccbf031a

@ -21,5 +21,5 @@ dependencies {
exclude group: 'javax.websocket', module: 'javax.websocket-api' exclude group: 'javax.websocket', module: 'javax.websocket-api'
exclude group: 'javax.websocket', module: 'javax.websocket-client-api' exclude group: 'javax.websocket', module: 'javax.websocket-client-api'
} }
api 'org.mortbay.jasper:apache-el' api 'org.glassfish:jakarta.el'
} }

@ -10,7 +10,7 @@ dependencies {
api ('org.apache.tomcat.embed:tomcat-embed-core') { api ('org.apache.tomcat.embed:tomcat-embed-core') {
exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api' exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api'
} }
api 'org.apache.tomcat.embed:tomcat-embed-el' api 'org.glassfish:jakarta.el'
api ('org.apache.tomcat.embed:tomcat-embed-websocket') { api ('org.apache.tomcat.embed:tomcat-embed-websocket') {
exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api' exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api'
} }

@ -7,6 +7,6 @@ description = "Starter for using Java Bean Validation with Hibernate Validator"
dependencies { dependencies {
api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies'))
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
api 'org.apache.tomcat.embed:tomcat-embed-el' api 'org.glassfish:jakarta.el'
api 'org.hibernate.validator:hibernate-validator' api 'org.hibernate.validator:hibernate-validator'
} }

@ -9,8 +9,6 @@ dependencies {
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json')
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat')
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
api 'org.hibernate.validator:hibernate-validator'
api 'org.springframework:spring-web' api 'org.springframework:spring-web'
api 'org.springframework:spring-webmvc' api 'org.springframework:spring-webmvc'
} }

@ -9,7 +9,6 @@ dependencies {
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter')
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-json')
api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-reactor-netty') api project(':spring-boot-project:spring-boot-starters:spring-boot-starter-reactor-netty')
api 'org.hibernate.validator:hibernate-validator'
api 'org.springframework:spring-web' api 'org.springframework:spring-web'
api 'org.springframework:spring-webflux' api 'org.springframework:spring-webflux'
api 'org.synchronoss.cloud:nio-multipart-parser' api 'org.synchronoss.cloud:nio-multipart-parser'

@ -10,6 +10,7 @@ dependencies {
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-jdbc')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-security')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
runtimeOnly 'com.h2database:h2' runtimeOnly 'com.h2database:h2'
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')

@ -7,6 +7,7 @@ description = 'Spring Boot web Groovy Templates smoke test'
dependencies { dependencies {
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-groovy-templates')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
if (JavaVersion.current().java9Compatible) { if (JavaVersion.current().java9Compatible) {
implementation 'jakarta.xml.bind:jakarta.xml.bind-api' implementation 'jakarta.xml.bind:jakarta.xml.bind-api'
} }

@ -8,6 +8,7 @@ description = 'Spring Boot web UI smoke test'
dependencies { dependencies {
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-thymeleaf')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web') implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-web')
implementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-validation')
testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test')
} }

Loading…
Cancel
Save