Update the JSTL libaries and fix webapp-tests

veithen · veithen · commit bd0a77d47599 · 2024-02-17T18:21:56.000Z
diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml
@@ -214,8 +214,8 @@
                     <include>org/apache/axis2/soapmonitor/applet/**/*</include>
                     <include>WEB-INF/classes/**/*</include>
                     <include>WEB-INF/include/**/*</include>
-                    <include>WEB-INF/lib/taglibs-standard-impl-*.jar</include>
-                    <include>WEB-INF/lib/taglibs-standard-spec-*.jar</include>
+                    <include>WEB-INF/lib/jakarta.el-api-*.jar</include>
+                    <include>WEB-INF/lib/jakarta.servlet.jsp.jstl-*.jar</include>
                     <include>WEB-INF/lib/axis2-soapmonitor-servlet-*.jar</include>
                     <include>WEB-INF/tags/**/*</include>
                     <include>WEB-INF/views/**/*</include>
diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml
@@ -223,14 +223,14 @@
             <type>mar</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-spec</artifactId>
-            <version>1.2.5</version>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.taglibs</groupId>
-            <artifactId>taglibs-standard-impl</artifactId>
-            <version>1.2.5</version>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>3.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/pom.xml b/pom.xml
@@ -1207,7 +1207,7 @@
                 <plugin>
                     <groupId>com.github.veithen.daemon</groupId>
                     <artifactId>daemon-maven-plugin</artifactId>
-                    <version>0.4.2</version>
+                    <version>0.6.1-SNAPSHOT</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.veithen.maven</groupId>
diff --git a/systests/pom.xml b/systests/pom.xml
@@ -37,11 +37,7 @@
         <module>SOAP12TestModuleC</module>
         <module>SOAP12TestServiceB</module>
         <module>SOAP12TestServiceC</module>
-	<!-- FIXME AXIS2-6051 jwebunit hasn't been update since 2015
-             and is too broke to fix in a post jakarta world. 
-             TODO: find a replacement, or remove the code.
         <module>webapp-tests</module>
-	-->
     </modules>
 
     <scm>
