Merge pull request wildfly#18056 from wildfly/revert-18033-WFLY-19525

Revert "[WFLY-19525] Switching JSTL implementation from org.glassfish.web:jakarta.servlet.jsp.jstl to org.glassfish.wasp:wasp"
darranl · Jul 16, 2024 · 69b6557 · 69b6557
2 parents 01de696 + fa67b8a
commit 69b6557
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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/...ed/src/main/resources/modules/system/layers/base/jakarta/servlet/jstl/api/main/module.xml b/...ed/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
@@ -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>