Switch to org.apache.tomcat.embed:tomcat-embed-el dependency insteaf …

…of org.glassfish:jakarta.el to be inline with spring (see spring-projects/spring-boot#24744 for details)
croz-ltd · Apr 20, 2022 · 077b320 · 077b320
1 parent 05f04aa
commit 077b320
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/nrich-form-configuration-spring-boot-starter/build.gradle b/nrich-form-configuration-spring-boot-starter/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
   implementation project(":nrich-form-configuration")
 
-  implementation "org.glassfish:jakarta.el"
+  implementation "org.apache.tomcat.embed:tomcat-embed-el"
   implementation "org.hibernate.validator:hibernate-validator"
   implementation "org.springframework.boot:spring-boot-autoconfigure"
 

diff --git a/nrich-form-configuration/build.gradle b/nrich-form-configuration/build.gradle
@@ -18,8 +18,8 @@ dependencies {
   testRuntimeOnly "ch.qos.logback:logback-classic"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
+  testImplementation "org.apache.tomcat.embed:tomcat-embed-el"
   testImplementation "org.assertj:assertj-core"
-  testImplementation "org.glassfish:jakarta.el"
   testImplementation "org.hibernate.validator:hibernate-validator"
   testImplementation "org.hamcrest:hamcrest"
   testImplementation "com.jayway.jsonpath:json-path"

diff --git a/nrich-notification/build.gradle b/nrich-notification/build.gradle
@@ -17,8 +17,8 @@ dependencies {
   testRuntimeOnly "ch.qos.logback:logback-classic"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
+  testImplementation "org.apache.tomcat.embed:tomcat-embed-el"
   testImplementation "org.assertj:assertj-core"
-  testImplementation "org.glassfish:jakarta.el"
   testImplementation "org.hibernate.validator:hibernate-validator"
   testImplementation "org.junit.jupiter:junit-jupiter-api"
   testImplementation "org.mockito:mockito-core"

diff --git a/nrich-registry-spring-boot-starter/build.gradle b/nrich-registry-spring-boot-starter/build.gradle
@@ -10,8 +10,8 @@ dependencies {
   implementation project(":nrich-registry")
   implementation project(":nrich-spring-boot")
 
-  implementation "org.hibernate.validator:hibernate-validator"
   implementation "org.apache.tomcat.embed:tomcat-embed-el"
+  implementation "org.hibernate.validator:hibernate-validator"
   implementation "org.springframework.boot:spring-boot-starter-data-jpa"
 
   testAnnotationProcessor "org.projectlombok:lombok"

diff --git a/nrich-registry/build.gradle b/nrich-registry/build.gradle
@@ -28,8 +28,8 @@ dependencies {
   testRuntimeOnly "com.h2database:h2"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
+  testImplementation "org.apache.tomcat.embed:tomcat-embed-el"
   testImplementation "org.assertj:assertj-core"
-  testImplementation "org.glassfish:jakarta.el"
   testImplementation "org.hibernate:hibernate-core"
   testImplementation "org.hibernate.validator:hibernate-validator"
   testImplementation "org.hamcrest:hamcrest"

diff --git a/nrich-validation/build.gradle b/nrich-validation/build.gradle
@@ -6,8 +6,8 @@ dependencies {
   annotationProcessor "org.projectlombok:lombok"
   compileOnly "org.projectlombok:lombok"
 
+  implementation "org.apache.tomcat.embed:tomcat-embed-el"
   implementation "org.hibernate.validator:hibernate-validator"
-  implementation "org.glassfish:jakarta.el"
   implementation "org.springframework:spring-context"
 
   webImplementation "org.springframework:spring-web"

diff --git a/nrich-webmvc/build.gradle b/nrich-webmvc/build.gradle
@@ -23,8 +23,8 @@ dependencies {
 
   testImplementation "com.fasterxml.jackson.core:jackson-core"
   testImplementation "com.fasterxml.jackson.core:jackson-databind"
+  testImplementation "org.apache.tomcat.embed:tomcat-embed-el"
   testImplementation "org.assertj:assertj-core"
-  testImplementation "org.glassfish:jakarta.el"
   testImplementation "org.hibernate.validator:hibernate-validator"
   testImplementation "org.hamcrest:hamcrest"
   testImplementation "com.jayway.jsonpath:json-path"