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 c44bae26787..976326c771d 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 5454e244cf9..ff03ce46a64 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 c8f959aca51..1527c82a380 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 85adc9003da..5b238f9a72e 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 dbfa136c506..0e3353df0a1 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 6626aa97dc4..d3257417d58 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 5079cdb18e9..8eb68347db3 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 bececbfb5d1..32198fe3b44 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') }