SAK-41408 commons-lang => commons-lang3 (sakaiproject#6601)

* SAK-41408 commons-lang => commons-lang3 * spacing in pom
thinhld80 · Mar 4, 2019 · bc2ccc2 · bc2ccc2
1 parent fd33c73
commit bc2ccc2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml
@@ -63,8 +63,8 @@
 
         <!-- provided commons -->
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
 
         <!-- parse html to text -->

diff --git a/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ComposeLogicImpl.java b/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ComposeLogicImpl.java
@@ -27,10 +27,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang.StringUtils;
-
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.authz.api.AuthzGroup;
 import org.sakaiproject.authz.api.AuthzGroupService;
 import org.sakaiproject.authz.api.GroupNotDefinedException;
@@ -48,6 +45,8 @@
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.user.api.UserNotDefinedException;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class ComposeLogicImpl implements ComposeLogic
 {

diff --git a/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ConfigLogicImpl.java b/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ConfigLogicImpl.java
@@ -19,7 +19,7 @@
 import java.io.File;
 import java.util.Properties;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.mailsender.logic.ConfigLogic;
 import org.sakaiproject.mailsender.logic.ExternalLogic;

diff --git a/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ExternalLogicImpl.java b/mailsender/impl/src/java/org/sakaiproject/mailsender/logic/impl/ExternalLogicImpl.java
@@ -20,15 +20,17 @@
 
 import java.io.InputStream;
 import java.time.Instant;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.mail.MessagingException;
 
-import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.lang.StringUtils;
-
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.authz.api.FunctionManager;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.component.api.ServerConfigurationService;
@@ -67,6 +69,8 @@
 import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.util.Validator;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * This is the implementation for logic which is external to our app logic
  */

diff --git a/mailsender/impl/src/test/org/sakaiproject/mailsender/logic/impl/ConfigLogicImplTest.java b/mailsender/impl/src/test/org/sakaiproject/mailsender/logic/impl/ConfigLogicImplTest.java
@@ -29,7 +29,7 @@
 
 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;