Update dependencies

sakaicontrib · Apr 10, 2024 · 4bd9a76 · 4bd9a76
1 parent e4ffe45
commit 4bd9a76
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 21 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,22 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  pull_request:
+
+jobs:
+  maven-build:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Git Checkout
+        uses: actions/checkout@v5
+      - name: JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+      - name: Build with Maven
+        env:
+          MAVEN_OPTS: -Djava.awt.headless=true -Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dmaven.wagon.http.retryHandler.count=2 -Dmaven.wagon.http.pool=true
+        run: mvn clean install -Psnapshots -V -B
diff --git a/api/pom.xml b/api/pom.xml
@@ -36,8 +36,8 @@
       <artifactId>search-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>

diff --git a/api/src/java/org/sakaiproject/clog/api/datamodel/Comment.java b/api/src/java/org/sakaiproject/clog/api/datamodel/Comment.java
@@ -20,7 +20,7 @@
 import java.util.Date;
 import java.util.Stack;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.sakaiproject.clog.api.ClogManager;
 import org.sakaiproject.clog.api.cover.SakaiProxy;
 import org.sakaiproject.entity.api.Entity;
@@ -69,7 +69,7 @@ public void setContent(String text, boolean modified) {
             modifiedDate = new Date().getTime();
         }
 
-        this.content = StringEscapeUtils.unescapeHtml(text.trim());
+        this.content = StringEscapeUtils.unescapeHtml4(text.trim());
     }
 
     public String getContent() {

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -51,10 +51,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/tool/pom.xml b/tool/pom.xml
@@ -56,22 +56,23 @@
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
+      <groupId>jakarta.servlet.jsp.jstl</groupId>
+      <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+      <version>${sakai.jakarta.jstl-api.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>1.1.2</version>
+      <groupId>org.apache.taglibs</groupId>
+      <artifactId>taglibs-standard-impl</artifactId>
+      <version>1.2.5</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/tool/src/java/org/sakaiproject/clog/tool/ClogTool.java b/tool/src/java/org/sakaiproject/clog/tool/ClogTool.java
@@ -9,7 +9,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.sakaiproject.clog.api.ClogManager;
 import org.sakaiproject.clog.api.SakaiProxy;
 import org.sakaiproject.component.api.ComponentManager;
@@ -107,7 +107,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         request.setAttribute("sakaiHtmlHead", (String) request.getAttribute("sakai.html.head"));
 
         request.setAttribute("userId", userId);
-        request.setAttribute("userDisplayName", StringEscapeUtils.escapeJavaScript(displayName));
+        request.setAttribute("userDisplayName", StringEscapeUtils.escapeEcmaScript(displayName));
         request.setAttribute("siteId", siteId);
         request.setAttribute("state", state);
 

diff --git a/tool/src/webapp/WEB-INF/functions.tld b/tool/src/webapp/WEB-INF/functions.tld
@@ -28,9 +28,7 @@
 
     <function>
         <name>escapeJS</name>
-        <!--<function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>-->
-        <!--<function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>-->
-        <function-class>org.apache.commons.lang.StringEscapeUtils</function-class>
-        <function-signature>java.lang.String escapeJavaScript(java.lang.String)</function-signature>
+        <function-class>org.apache.commons.lang3.StringEscapeUtils</function-class>
+        <function-signature>java.lang.String escapeEcmaScript(java.lang.String)</function-signature>
     </function>
 </taglib>