From 55404d8b206e49d15c01817e2d015cfe69de153e Mon Sep 17 00:00:00 2001
From: Mattias Reichel <mattias.reichel@gmail.com>
Date: Thu, 14 Mar 2024 13:33:07 +0100
Subject: [PATCH] fix(deps): Remove dependency org.glassfish.web:el-impl (#285)

There is no need for this dependency.
An el-impl is already provided by Spring Boot/tomcat-embed-el.
tomcat-embed-el is also used for other servlet containers.

Related: https://github.com/spring-projects/spring-boot/issues/24744
---
 .../org/grails/forge/feature/database/HibernateGorm.java    | 4 ----
 grails-forge-core/src/main/resources/pom.xml                | 5 -----
 .../groovy/org/grails/forge/build/gradle/GradleSpec.groovy  | 6 +++---
 .../grails/forge/feature/database/HibernateGormSpec.groovy  | 1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java b/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java
index b9d85dbf..37e6769a 100644
--- a/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java
+++ b/grails-forge-core/src/main/java/org/grails/forge/feature/database/HibernateGorm.java
@@ -87,10 +87,6 @@ public void apply(GeneratorContext generatorContext) {
                 .groupId("org.grails.plugins")
                 .artifactId("hibernate5")
                 .compile());
-        generatorContext.addDependency(Dependency.builder()
-                .groupId("org.glassfish.web")
-                .lookupArtifactId("el-impl")
-                .runtime());
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.apache.tomcat")
                 .artifactId("tomcat-jdbc")
diff --git a/grails-forge-core/src/main/resources/pom.xml b/grails-forge-core/src/main/resources/pom.xml
index 8f221aef..46cf7022 100644
--- a/grails-forge-core/src/main/resources/pom.xml
+++ b/grails-forge-core/src/main/resources/pom.xml
@@ -12,11 +12,6 @@
         </repository>
     </repositories>
     <dependencies>
-        <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>el-impl</artifactId>
-            <version>2.2.1-b05</version>
-        </dependency>
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy
index 34c5190b..d916f8fe 100644
--- a/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy
+++ b/grails-forge-core/src/test/groovy/org/grails/forge/build/gradle/GradleSpec.groovy
@@ -60,7 +60,7 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
         settingsGradle.contains("maven { url \"https://repo.grails.org/grails/core/\" }")
         settingsGradle.contains("gradlePluginPortal()")
         settingsGradle.contains("id \"org.grails.grails-web\" version \"6.1.2\"")
-        settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.1\"")
+        settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.2\"")
         !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.2\"")
         !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
     }
@@ -77,8 +77,8 @@ class GradleSpec extends ApplicationContextSpec implements CommandOutputFixture
         settingsGradle.contains("maven { url \"https://repo.grails.org/grails/core/\" }")
         settingsGradle.contains("gradlePluginPortal()")
         settingsGradle.contains("id \"org.grails.grails-web\" version \"6.1.2\"")
-        settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"3.1.1\"")
-        !settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.1\"")
+        settingsGradle.contains("id \"org.grails.plugins.views-markup\" version \"3.1.2\"")
+        !settingsGradle.contains("id \"org.grails.plugins.views-json\" version \"3.1.2\"")
         !settingsGradle.contains("id \"org.grails.grails-gsp\" version \"6.1.1\"")
         !settingsGradle.contains("id \"com.bertramlabs.asset-pipeline\" version \"4.3.0\"")
     }
diff --git a/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy b/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy
index de56142f..2b1eab6b 100644
--- a/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy
+++ b/grails-forge-core/src/test/groovy/org/grails/forge/feature/database/HibernateGormSpec.groovy
@@ -29,7 +29,6 @@ class HibernateGormSpec extends ApplicationContextSpec implements CommandOutputF
 
         then:
         template.contains('implementation("org.grails.plugins:hibernate5")')
-        template.contains("runtimeOnly(\"org.glassfish.web:el-impl:2.2.1-b05\")")
         template.contains("runtimeOnly(\"org.apache.tomcat:tomcat-jdbc\")")
         template.contains("runtimeOnly(\"com.h2database:h2\")")
     }