SAK-41623 Widget: commons-lang => commons-lang3 (sakaiproject#6748)

chundcm · Apr 4, 2019 · 067abbd · 067abbd
1 parent 917c1bb
commit 067abbd
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 36 deletions.
diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml
@@ -55,8 +55,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-io</groupId>

diff --git a/...ervice/impl/src/java/org/sakaiproject/calendaring/api/ExternalCalendaringServiceImpl.java b/...ervice/impl/src/java/org/sakaiproject/calendaring/api/ExternalCalendaringServiceImpl.java
@@ -45,9 +45,16 @@
 import java.util.Set;
 import java.util.UUID;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.sakaiproject.calendar.api.CalendarEvent;
+import org.sakaiproject.calendaring.logic.SakaiProxy;
+import org.sakaiproject.time.api.TimeRange;
+import org.sakaiproject.time.api.TimeService;
+import org.sakaiproject.user.api.User;
+
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
-
 import net.fortuna.ical4j.data.CalendarOutputter;
 import net.fortuna.ical4j.model.Calendar;
 import net.fortuna.ical4j.model.DateTime;
@@ -75,15 +82,6 @@
 import net.fortuna.ical4j.model.property.Version;
 import net.fortuna.ical4j.validate.ValidationException;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-
-import org.sakaiproject.calendar.api.CalendarEvent;
-import org.sakaiproject.calendaring.logic.SakaiProxy;
-import org.sakaiproject.time.api.TimeRange;
-import org.sakaiproject.time.api.TimeService;
-import org.sakaiproject.user.api.User;
-
 /**
  * Implementation of {@link ExternalCalendaringService}
  * 

diff --git a/...-calendaring-service/impl/src/java/org/sakaiproject/calendaring/logic/SakaiProxyImpl.java b/...-calendaring-service/impl/src/java/org/sakaiproject/calendaring/logic/SakaiProxyImpl.java
@@ -36,15 +36,16 @@
 
 import java.io.File;
 
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.authz.api.SecurityService;
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.tool.api.SessionManager;
 import org.sakaiproject.user.api.UserDirectoryService;
 import org.sakaiproject.user.api.UserNotDefinedException;
 
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * Implementation of our SakaiProxy API
  * 

diff --git a/mycalendar/pom.xml b/mycalendar/pom.xml
@@ -66,8 +66,8 @@
             <artifactId>sakai-kernel-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/mycalendar/src/java/org/sakaiproject/mycalendar/ui/WidgetPage.java b/mycalendar/src/java/org/sakaiproject/mycalendar/ui/WidgetPage.java
@@ -20,7 +20,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;

diff --git a/myconnections/pom.xml b/myconnections/pom.xml
@@ -54,8 +54,8 @@
             <artifactId>sakai-portal-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/myconnections/src/java/org/sakaiproject/myconnections/ui/WidgetPage.java b/myconnections/src/java/org/sakaiproject/myconnections/ui/WidgetPage.java
@@ -15,40 +15,35 @@
  */
 package org.sakaiproject.myconnections.ui;
 
-import java.util.Arrays;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.stream.Collectors;
-import java.io.Serializable;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnLoadHeaderItem;
 import org.apache.wicket.markup.head.PriorityHeaderItem;
 import org.apache.wicket.markup.head.StringHeaderItem;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.EmptyPanel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.sakaiproject.component.api.ServerConfigurationService;
+import org.sakaiproject.myconnections.ui.components.ConnectionsGrid;
 import org.sakaiproject.portal.util.PortalUtils;
 import org.sakaiproject.profile2.logic.ProfileConnectionsLogic;
 import org.sakaiproject.profile2.model.BasicConnection;
-import org.sakaiproject.profile2.util.ProfileConstants;
 import org.sakaiproject.profile2.model.BasicPerson;
+import org.sakaiproject.profile2.util.ProfileConstants;
 import org.sakaiproject.tool.api.SessionManager;
-import org.sakaiproject.myconnections.ui.components.ConnectionsGrid;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/taggable/taggable-hbm/hbm/pom.xml b/taggable/taggable-hbm/hbm/pom.xml
@@ -33,8 +33,8 @@
             <artifactId>sakai-taggable-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/taggable/taggable-hbm/hbm/src/java/org/sakaiproject/taggable/impl/LinkImpl.java b/taggable/taggable-hbm/hbm/src/java/org/sakaiproject/taggable/impl/LinkImpl.java
@@ -23,13 +23,12 @@
 
 import java.io.Serializable;
 import java.util.Stack;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.sakaiproject.entity.api.Entity;
-import org.sakaiproject.entity.api.Reference;
 import org.sakaiproject.entity.api.ResourceProperties;
-import org.sakaiproject.entity.cover.EntityManager;
 import org.sakaiproject.taggable.api.Link;
 import org.sakaiproject.taggable.api.TaggingManager;
 import org.w3c.dom.Document;