diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
index 7354f2f6cf72..260683087964 100644
--- a/assignment/impl/pom.xml
+++ b/assignment/impl/pom.xml
@@ -89,12 +89,12 @@
             <artifactId>commons-collections</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <artifactId>commons-text</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
index 9a65163882ab..a3bb4b6c4cc3 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -56,7 +56,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -2978,7 +2978,7 @@ private void zipSubmissions(String assignmentReference, String assignmentTitle,
                                 if (!notes.isEmpty()) {
                                     final StringBuilder noteList = new StringBuilder("<ul>");
                                     for (String note : notes) {
-                                        noteList.append("<li>" + StringEscapeUtils.escapeHtml(note) + "</li>");
+                                        noteList.append("<li>" + StringEscapeUtils.escapeHtml3(note) + "</li>");
                                     }
                                     noteList.append("</ul>");
                                     submittersAdditionalNotesHtml.append("<tr><td style='padding-right:10px;padding-left:10px'>" + submittersString + "</td><td style='padding-right:10px'>" + noteList + "</td></tr>");
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java
index fbf1637d0f90..4af395fabb8f 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java
@@ -30,7 +30,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
@@ -41,7 +40,6 @@
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.sakaiproject.assignment.api.AssignmentReferenceReckoner;
 import org.sakaiproject.assignment.api.AssignmentService;
-import org.sakaiproject.assignment.api.AssignmentServiceConstants;
 import org.sakaiproject.assignment.api.model.Assignment;
 import org.sakaiproject.assignment.api.model.AssignmentSubmission;
 import org.sakaiproject.assignment.api.model.AssignmentSubmissionSubmitter;
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/AssignmentSubmissionAccess.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/AssignmentSubmissionAccess.java
index 555b2cb3d390..90ba9ebf9666 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/AssignmentSubmissionAccess.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/AssignmentSubmissionAccess.java
@@ -34,7 +34,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.assignment.api.AssignmentConstants;
 import org.sakaiproject.entity.api.serialize.EntityParseException;
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/CombineDuplicateSubmissionsConversionHandler.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/CombineDuplicateSubmissionsConversionHandler.java
index c188cf1fbda3..3dd704b6bd45 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/CombineDuplicateSubmissionsConversionHandler.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/CombineDuplicateSubmissionsConversionHandler.java
@@ -36,7 +36,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.util.conversion.SchemaConversionHandler;
 
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/O11Property.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/O11Property.java
index 2c4fc461ef36..52261c7f9dbb 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/O11Property.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/conversion/O11Property.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 @EqualsAndHashCode(of = "name")
diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/reminder/AssignmentDueReminderServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/reminder/AssignmentDueReminderServiceImpl.java
index 9dbdae136cbb..383fee1cb19c 100644
--- a/assignment/impl/src/java/org/sakaiproject/assignment/impl/reminder/AssignmentDueReminderServiceImpl.java
+++ b/assignment/impl/src/java/org/sakaiproject/assignment/impl/reminder/AssignmentDueReminderServiceImpl.java
@@ -17,7 +17,7 @@
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.api.app.scheduler.ScheduledInvocationManager;
 import org.sakaiproject.assignment.api.AssignmentService;
 import org.sakaiproject.assignment.api.model.Assignment;
diff --git a/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentConversionTest.java b/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentConversionTest.java
index fd8b8dc7d35a..451efa99f08c 100644
--- a/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentConversionTest.java
+++ b/assignment/impl/src/test/org/sakaiproject/assignment/impl/AssignmentConversionTest.java
@@ -23,7 +23,7 @@
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/assignment/impl/src/test/org/sakaiproject/assignment/impl/SpreadsheetExporterTest.java b/assignment/impl/src/test/org/sakaiproject/assignment/impl/SpreadsheetExporterTest.java
index 57b305a3e918..1db1589a82ee 100644
--- a/assignment/impl/src/test/org/sakaiproject/assignment/impl/SpreadsheetExporterTest.java
+++ b/assignment/impl/src/test/org/sakaiproject/assignment/impl/SpreadsheetExporterTest.java
@@ -15,7 +15,7 @@
  */
 package org.sakaiproject.assignment.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
diff --git a/master/pom.xml b/master/pom.xml
index 6c08767d817d..96f61c250a5b 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -27,6 +27,7 @@
     <sakai.commons.lang3.version>3.8.1</sakai.commons.lang3.version>
     <sakai.commons.fileupload.version>1.3.3</sakai.commons.fileupload.version>
     <sakai.commons-math3.version>3.6.1</sakai.commons-math3.version>
+    <sakai.commons-text.version>1.5</sakai.commons-text.version>
     <sakai.commons-validator.version>1.6</sakai.commons-validator.version>
     <sakai.commons-logging.version>1.2</sakai.commons-logging.version>
     <sakai.commons.configuration.version>1.6</sakai.commons.configuration.version>
@@ -643,6 +644,11 @@
         <version>${sakai.commons.lang3.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${sakai.commons-text.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-math3</artifactId>