From 18ccbf031ae85fe0aec2a8ba0577a64efae1c6da Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 13 Jan 2020 09:14:21 +0100 Subject: [PATCH] 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 --- .../spring-boot-starters/spring-boot-starter-jetty/build.gradle | 2 +- .../spring-boot-starter-tomcat/build.gradle | 2 +- .../spring-boot-starter-validation/build.gradle | 2 +- .../spring-boot-starters/spring-boot-starter-web/build.gradle | 2 -- .../spring-boot-starter-webflux/build.gradle | 1 - .../spring-boot-smoke-test-actuator/build.gradle | 1 + .../spring-boot-smoke-test-web-groovy-templates/build.gradle | 1 + .../spring-boot-smoke-test-web-ui/build.gradle | 1 + 8 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle index c44bae2678..976326c771 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle @@ -21,5 +21,5 @@ dependencies { exclude group: 'javax.websocket', module: 'javax.websocket-api' exclude group: 'javax.websocket', module: 'javax.websocket-client-api' } - api 'org.mortbay.jasper:apache-el' + api 'org.glassfish:jakarta.el' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle index 5454e244cf..ff03ce46a6 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/build.gradle @@ -10,7 +10,7 @@ dependencies { api ('org.apache.tomcat.embed:tomcat-embed-core') { 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') { exclude group: 'org.apache.tomcat', module: 'tomcat-annotations-api' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle index c8f959aca5..1527c82a38 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/build.gradle @@ -7,6 +7,6 @@ description = "Starter for using Java Bean Validation with Hibernate Validator" dependencies { api enforcedPlatform(project(':spring-boot-project:spring-boot-dependencies')) 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' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle index 85adc9003d..5b238f9a72 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/build.gradle @@ -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-json') 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-webmvc' } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle index dbfa136c50..0e3353df0a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/build.gradle @@ -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-json') 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-webflux' api 'org.synchronoss.cloud:nio-multipart-parser' diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle index 6626aa97dc..d3257417d5 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/build.gradle @@ -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-security') 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' testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle index 5079cdb18e..8eb68347db 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle @@ -7,6 +7,7 @@ description = 'Spring Boot web Groovy Templates smoke test' 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-validation') if (JavaVersion.current().java9Compatible) { implementation 'jakarta.xml.bind:jakarta.xml.bind-api' } diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle index bececbfb5d..32198fe3b4 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-ui/build.gradle @@ -8,6 +8,7 @@ description = 'Spring Boot web UI smoke test' dependencies { 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-validation') testImplementation project(':spring-boot-project:spring-boot-starters:spring-boot-starter-test') }