From 4b0d5c31de1293ca6e98c2f5aa7c4e6b6f7bb9f4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 15 Jan 2021 09:30:54 +0000 Subject: [PATCH] Switch to the Apache Tomcat EL implementation by default Previously we used org.glassfish:jakarta.el as our default EL implementation. Since adopting it we have learned that it can be significantly slower than Apache Tomcat's EL implementation in some scenarios. This commit switches to using org.apache.tomcat.embed:tomcat-embed-el by default instead of the Glassfish implementation. Closes gh-24744 --- .../spring-boot-starters/spring-boot-starter-jetty/build.gradle | 2 +- .../spring-boot-starter-tomcat/build.gradle | 2 +- .../spring-boot-starter-undertow/build.gradle | 2 +- .../spring-boot-starter-validation/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 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 8cac87113a..a771c7c82f 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 @@ -7,6 +7,7 @@ description = "Starter for using Jetty as the embedded servlet container. An alt dependencies { api("jakarta.servlet:jakarta.servlet-api") api("jakarta.websocket:jakarta.websocket-api") + api("org.apache.tomcat.embed:tomcat-embed-el") api("org.eclipse.jetty:jetty-servlets") api("org.eclipse.jetty:jetty-webapp") { exclude group: "javax.servlet", module: "javax.servlet-api" @@ -21,5 +22,4 @@ dependencies { exclude group: "javax.websocket", module: "javax.websocket-client-api" exclude group: "org.eclipse.jetty", module: "jetty-jndi" } - 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 c30dc1cc4a..8f57c34c35 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 @@ -9,7 +9,7 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-core") { exclude group: "org.apache.tomcat", module: "tomcat-annotations-api" } - api("org.glassfish:jakarta.el") + api("org.apache.tomcat.embed:tomcat-embed-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-undertow/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle index 5f25ead862..d8d8687a67 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/build.gradle @@ -15,5 +15,5 @@ dependencies { exclude group: "org.jboss.spec.javax.servlet", module: "jboss-servlet-api_4.0_spec" } api("jakarta.servlet:jakarta.servlet-api") - api("org.glassfish:jakarta.el") + api("org.apache.tomcat.embed:tomcat-embed-el") } 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 72b1f9318f..bc4d306b3b 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 @@ -6,6 +6,6 @@ description = "Starter for using Java Bean Validation with Hibernate Validator" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) - api("org.glassfish:jakarta.el") + api("org.apache.tomcat.embed:tomcat-embed-el") api("org.hibernate.validator:hibernate-validator") }