SAK-41613 jsf, velocity: commons-lang => commons-lang3

mrmodise · Apr 3, 2019 · 6707a7f · 6707a7f
1 parent a445284
commit 6707a7f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/jsf/jsf-spreadsheet/pom.xml b/jsf/jsf-spreadsheet/pom.xml
@@ -63,5 +63,9 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...f-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetDataFileWriterPdf.java b/...f-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetDataFileWriterPdf.java
@@ -1,5 +1,16 @@
 package org.sakaiproject.jsf.spreadsheet;
 
+import java.awt.Color;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.sakaiproject.component.cover.ServerConfigurationService;
+
 import com.lowagie.text.BadElementException;
 import com.lowagie.text.Cell;
 import com.lowagie.text.Chunk;
@@ -14,20 +25,8 @@
 import com.lowagie.text.pdf.BaseFont;
 import com.lowagie.text.pdf.PdfWriter;
 
-import java.awt.Color;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
-
-import org.sakaiproject.component.cover.ServerConfigurationService;
-
 @Slf4j
 public class SpreadsheetDataFileWriterPdf implements SpreadsheetDataFileWriter {
 	private List<List<String>> studentInfo = new ArrayList<List<String>>();

diff --git a/jsf/jsf-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetUtil.java b/jsf/jsf-spreadsheet/src/java/org/sakaiproject/jsf/spreadsheet/SpreadsheetUtil.java
@@ -30,7 +30,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *

diff --git a/velocity/tool/pom.xml b/velocity/tool/pom.xml
@@ -68,10 +68,6 @@
             <version>1.4</version>
         </dependency>
         <!-- Required for velocity -->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

diff --git a/velocity/tool/src/java/org/sakaiproject/cheftool/VelocityPortletPaneledAction.java b/velocity/tool/src/java/org/sakaiproject/cheftool/VelocityPortletPaneledAction.java
@@ -24,23 +24,21 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.authz.cover.SecurityService;
 import org.sakaiproject.cheftool.api.Alert;
 import org.sakaiproject.cheftool.api.Menu;
@@ -67,6 +65,8 @@
 import org.sakaiproject.util.Web;
 import org.sakaiproject.vm.ActionURL;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * <p>
  * VelocityPortletPaneledAction ...