From fa67b8a1bf55762dd46f29ccf4bec7027bd06550 Mon Sep 17 00:00:00 2001
From: Brian Stansberry <brian.stansberry@redhat.com>
Date: Mon, 15 Jul 2024 18:22:19 -0500
Subject: [PATCH] Revert "[WFLY-19525] Switching JSTL implementation from
 org.glassfish.web:jakarta.servlet.jsp.jstl to org.glassfish.wasp:wasp"

---
 boms/common-ee/pom.xml                                      | 6 +++---
 ee-feature-pack/galleon-shared/pom.xml                      | 4 ++--
 .../layers/base/jakarta/servlet/jstl/api/main/module.xml    | 2 +-
 pom.xml                                                     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/boms/common-ee/pom.xml b/boms/common-ee/pom.xml
index 799e5f7c52f8..5614d3af6cfc 100644
--- a/boms/common-ee/pom.xml
+++ b/boms/common-ee/pom.xml
@@ -3345,9 +3345,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.glassfish.wasp</groupId>
-                <artifactId>wasp</artifactId>
-                <version>${version.org.glassfish.wasp}</version>
+                <groupId>org.glassfish.web</groupId>
+                <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+                <version>${version.org.glassfish.web.jakarta.servlet.jsp.jstl}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>*</groupId>
diff --git a/ee-feature-pack/galleon-shared/pom.xml b/ee-feature-pack/galleon-shared/pom.xml
index 15b534f4e638..944868e5889d 100644
--- a/ee-feature-pack/galleon-shared/pom.xml
+++ b/ee-feature-pack/galleon-shared/pom.xml
@@ -1458,8 +1458,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.glassfish.wasp</groupId>
-            <artifactId>wasp</artifactId>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
         </dependency>
 
         <dependency>
diff --git a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jstl/api/main/module.xml b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jstl/api/main/module.xml
index 0e6f8ecc0e07..925cb656c5a3 100644
--- a/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jstl/api/main/module.xml
+++ b/ee-feature-pack/galleon-shared/src/main/resources/modules/system/layers/base/jakarta/servlet/jstl/api/main/module.xml
@@ -8,7 +8,7 @@
 
     <resources>
         <artifact name="${jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api}"/>
-        <artifact name="${org.glassfish.wasp:wasp}"/>
+        <artifact name="${org.glassfish.web:jakarta.servlet.jsp.jstl}"/>
     </resources>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 228c5554f8a6..a1402e58b089 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,7 +513,7 @@
         <version.org.glassfish.jaxb>4.0.4</version.org.glassfish.jaxb>
         <version.org.glassfish.jaxb.jaxb-xjc>${version.org.glassfish.jaxb}</version.org.glassfish.jaxb.jaxb-xjc>
         <version.org.glassfish.soteria>3.0.3</version.org.glassfish.soteria>
-        <version.org.glassfish.wasp>3.2.2</version.org.glassfish.wasp>
+        <version.org.glassfish.web.jakarta.servlet.jsp.jstl>3.0.1</version.org.glassfish.web.jakarta.servlet.jsp.jstl>
         <version.org.hibernate.commons.annotations>6.0.6.Final</version.org.hibernate.commons.annotations>
         <version.org.hibernate>6.4.4.Final</version.org.hibernate>
         <version.org.hibernate.search>7.1.1.Final</version.org.hibernate.search>