SAK-41540 admin tool: commons-lang => comment-lang3

BruceMcl · Mar 25, 2019 · af317fe · af317fe
1 parent 2270c1b
commit af317fe
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 16 deletions.
diff --git a/admin-tools/src/java/org/sakaiproject/user/tool/ImportedUser.java b/admin-tools/src/java/org/sakaiproject/user/tool/ImportedUser.java
@@ -15,11 +15,10 @@
  */
 package org.sakaiproject.user.tool;
 
-import lombok.Data;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
 import org.sakaiproject.entity.api.ResourceProperties;
 
+import lombok.Data;
+
 /**
  * Model object to store a record about an imported user
  * 

diff --git a/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java b/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -34,7 +34,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.sakaiproject.accountvalidator.logic.ValidationLogic;

diff --git a/reset-pass/account-validator-tool/pom.xml b/reset-pass/account-validator-tool/pom.xml
@@ -90,8 +90,8 @@
 			<version>${joda.time.version}</version>
 		</dependency>
       <dependency>
-         <groupId>commons-lang</groupId>
-         <artifactId>commons-lang</artifactId>
+         <groupId>org.apache.commons</groupId>
+         <artifactId>commons-lang3</artifactId>
       </dependency>
    </dependencies>
 

diff --git a/...tor-tool/src/java/org/sakaiproject/accountvalidator/tool/otp/AcountValidationLocator.java b/...tor-tool/src/java/org/sakaiproject/accountvalidator/tool/otp/AcountValidationLocator.java
@@ -50,7 +50,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 @Slf4j
 public class AcountValidationLocator implements BeanLocator  {

diff --git a/site/admin-perms-tool/pom.xml b/site/admin-perms-tool/pom.xml
@@ -67,8 +67,8 @@
     </dependency>
     <!-- utility libs -->
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/...in-perms-tool/src/main/java/org/sakaiproject/adminsiteperms/tool/SitePermsController.java b/...in-perms-tool/src/main/java/org/sakaiproject/adminsiteperms/tool/SitePermsController.java
@@ -23,7 +23,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.AbstractController;
 

diff --git a/site/sakai-message-bundle-manager-tool/pom.xml b/site/sakai-message-bundle-manager-tool/pom.xml
@@ -76,8 +76,8 @@
 
 		<!-- third party dependencies -->
     	<dependency>
-	      <groupId>commons-lang</groupId>
-	      <artifactId>commons-lang</artifactId>
+	      <groupId>org.apache.commons</groupId>
+	      <artifactId>commons-lang3</artifactId>
     	</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>

diff --git a/...sage-bundle-manager-tool/src/main/java/org/sakaiproject/mbm/servlet/SakaiToolServlet.java b/...sage-bundle-manager-tool/src/main/java/org/sakaiproject/mbm/servlet/SakaiToolServlet.java
@@ -24,7 +24,7 @@
 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.tool.api.Tool;
 
 /**

diff --git a/usermembership/tool/pom.xml b/usermembership/tool/pom.xml
@@ -71,8 +71,8 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-digester</groupId>

diff --git a/usermembership/tool/src/java/org/sakaiproject/umem/tool/jsf/HtmlSortHeaderRenderer.java b/usermembership/tool/src/java/org/sakaiproject/umem/tool/jsf/HtmlSortHeaderRenderer.java
@@ -53,7 +53,7 @@
 import javax.faces.context.ResponseWriter;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.ext.HtmlDataTable;