SAK-41467 commons-lang => commons-lang3 (sakaiproject#6627)

calendar, chat, ciktations, common, commens,
stetsche · Mar 11, 2019 · e21b287 · e21b287
1 parent 6937cc4
commit e21b287
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 58 deletions.
diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
@@ -52,8 +52,8 @@
             <artifactId>sakai-calendar-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
             <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java b/calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java
@@ -45,7 +45,7 @@
 import net.fortuna.ical4j.model.parameter.Value;
 import net.fortuna.ical4j.model.property.*;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

diff --git a/calendar/calendar-summary-tool/tool/pom.xml b/calendar/calendar-summary-tool/tool/pom.xml
@@ -84,8 +84,8 @@
             <type>pom</type>
         </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/...dar-summary-tool/tool/src/java/org/sakaiproject/tool/summarycalendar/ui/CalendarBean.java b/...dar-summary-tool/tool/src/java/org/sakaiproject/tool/summarycalendar/ui/CalendarBean.java
@@ -40,7 +40,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.sakaiproject.authz.api.SecurityService;

diff --git a/calendar/calendar-tool/tool/pom.xml b/calendar/calendar-tool/tool/pom.xml
@@ -72,6 +72,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/.../tool/src/java/org/sakaiproject/calendar/entityproviders/CalendarEventEntityProvider.java b/.../tool/src/java/org/sakaiproject/calendar/entityproviders/CalendarEventEntityProvider.java
@@ -17,8 +17,8 @@
 
 import java.util.*;
 
-import org.apache.commons.lang.BooleanUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.calendar.api.Calendar;
 import org.sakaiproject.calendar.api.CalendarEvent;
 import org.sakaiproject.calendar.api.CalendarEventVector;

diff --git a/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java b/calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java
@@ -47,7 +47,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.alias.api.Alias;
 import org.sakaiproject.alias.api.AliasService;

diff --git a/chat/chat-impl/impl/pom.xml b/chat/chat-impl/impl/pom.xml
@@ -83,8 +83,8 @@
         <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java b/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java
@@ -50,8 +50,8 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 
 import org.hibernate.Criteria;
 import org.hibernate.Query;

diff --git a/.../chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatMessageEntityProvider.java b/.../chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatMessageEntityProvider.java
@@ -27,7 +27,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.chat2.model.ChatChannel;
 import org.sakaiproject.chat2.model.ChatManager;

diff --git a/chat/chat-tool/tool/pom.xml b/chat/chat-tool/tool/pom.xml
@@ -92,8 +92,8 @@
       <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
     </dependency>
     <!--JSF 2.3 dependencies-->
     <dependency>

diff --git a/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java b/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java
@@ -48,7 +48,7 @@
 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.PermissionsHelper;
 import org.sakaiproject.chat2.model.ChatMessage;

diff --git a/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java b/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java
@@ -24,7 +24,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.sakaiproject.chat2.model.ChatChannel;
 
 public class DecoratedChatChannel {

diff --git a/citations/citations-impl/impl/pom.xml b/citations/citations-impl/impl/pom.xml
@@ -61,8 +61,8 @@
       <artifactId>OkiOSID</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-lang</groupId>
-    	<artifactId>commons-lang</artifactId>
+       <groupId>org.apache.commons</groupId>
+       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>org.sakaiproject.velocity</groupId>

diff --git a/...ions/citations-impl/impl/src/java/org/sakaiproject/citation/impl/BaseCitationService.java b/...ions/citations-impl/impl/src/java/org/sakaiproject/citation/impl/BaseCitationService.java
@@ -30,7 +30,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.osid.repository.Asset;
 import org.osid.repository.Part;

diff --git a/.../citations-impl/impl/src/java/org/sakaiproject/citation/impl/NestedCitationValidator.java b/.../citations-impl/impl/src/java/org/sakaiproject/citation/impl/NestedCitationValidator.java
@@ -15,12 +15,15 @@
  */
  package org.sakaiproject.citation.impl;
 
-import org.apache.commons.lang.*;
-import org.sakaiproject.citation.api.*;
-
 import java.util.Arrays;
 import java.util.List;
-import org.sakaiproject.component.cover.*;
+
+import org.apache.commons.lang3.StringUtils;
+import org.sakaiproject.citation.api.CitationCollection;
+import org.sakaiproject.citation.api.CitationCollectionOrder;
+import org.sakaiproject.citation.api.CitationService;
+import org.sakaiproject.citation.api.CitationValidator;
+import org.sakaiproject.component.cover.ComponentManager;
 
 /**
  * Created by nickwilson on 9/29/15.

diff --git a/common/archive-impl/impl2/pom.xml b/common/archive-impl/impl2/pom.xml
@@ -49,8 +49,8 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/ArchiveService2Impl.java b/common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/ArchiveService2Impl.java
@@ -24,7 +24,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.archive.api.ArchiveService;
 import org.sakaiproject.component.api.ServerConfigurationService;

diff --git a/common/common-composite-component/pom.xml b/common/common-composite-component/pom.xml
@@ -66,12 +66,10 @@
       <artifactId>commons-beanutils</artifactId>
     </dependency>
     <dependency>
-		<groupId>commons-lang</groupId>
-		<artifactId>commons-lang</artifactId>
-		<scope>provided</scope>
-	</dependency> 
-
-
+       <groupId>org.apache.commons</groupId>
+       <artifactId>commons-lang3</artifactId>
+       <scope>provided</scope>
+    </dependency> 
   </dependencies>
   <build>
     <resources>

diff --git a/...mponent/src/java/org/sakaiproject/component/common/edu/person/SakaiPersonManagerImpl.java b/...mponent/src/java/org/sakaiproject/component/common/edu/person/SakaiPersonManagerImpl.java
@@ -31,7 +31,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;

diff --git a/commons/api/pom.xml b/commons/api/pom.xml
@@ -45,8 +45,8 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/commons/api/src/java/org/sakaiproject/commons/api/datamodel/Comment.java b/commons/api/src/java/org/sakaiproject/commons/api/datamodel/Comment.java
@@ -25,7 +25,7 @@
 import java.sql.SQLException;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.sakaiproject.commons.api.CommonsManager;
 import org.sakaiproject.entity.api.Entity;
 import org.sakaiproject.entity.api.ResourceProperties;
@@ -104,7 +104,7 @@ public void setContent(String text, boolean modified) {
             modifiedDate = Instant.now().toEpochMilli();
         }
 
-        this.content = StringEscapeUtils.unescapeHtml(text.trim());
+        this.content = StringEscapeUtils.unescapeHtml3(text.trim());
     }
 
     public void setCreatedDate(long createdDate) {

diff --git a/commons/impl/pom.xml b/commons/impl/pom.xml
@@ -60,8 +60,8 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/commons/impl/src/java/org/sakaiproject/commons/impl/CommonsSecurityManagerImpl.java b/commons/impl/src/java/org/sakaiproject/commons/impl/CommonsSecurityManagerImpl.java
@@ -17,7 +17,7 @@
 
 package org.sakaiproject.commons.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.Instant;
 import java.util.ArrayList;

diff --git a/commons/tool/pom.xml b/commons/tool/pom.xml
@@ -61,8 +61,8 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/...ons/tool/src/java/org/sakaiproject/commons/tool/entityprovider/CommonsEntityProvider.java b/...ons/tool/src/java/org/sakaiproject/commons/tool/entityprovider/CommonsEntityProvider.java
@@ -15,44 +15,53 @@
  */
 package org.sakaiproject.commons.tool.entityprovider;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
-import java.net.MalformedURLException;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-
-import org.sakaiproject.authz.api.PermissionsHelper;
-import org.sakaiproject.commons.api.datamodel.Comment;
-import org.sakaiproject.commons.api.datamodel.Post;
-import org.sakaiproject.commons.api.datamodel.PostsData;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.sakaiproject.commons.api.CommonsEvents;
 import org.sakaiproject.commons.api.CommonsManager;
 import org.sakaiproject.commons.api.CommonsSecurityManager;
 import org.sakaiproject.commons.api.PostReferenceFactory;
 import org.sakaiproject.commons.api.QueryBean;
 import org.sakaiproject.commons.api.SakaiProxy;
+import org.sakaiproject.commons.api.datamodel.Comment;
+import org.sakaiproject.commons.api.datamodel.Post;
+import org.sakaiproject.commons.api.datamodel.PostsData;
 import org.sakaiproject.entitybroker.EntityReference;
 import org.sakaiproject.entitybroker.EntityView;
 import org.sakaiproject.entitybroker.entityprovider.annotations.EntityCustomAction;
-import org.sakaiproject.entitybroker.entityprovider.capabilities.*;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.ActionsExecutable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.AutoRegisterEntityProvider;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.Describeable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.Outputable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.ReferenceParseable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.RequestAware;
 import org.sakaiproject.entitybroker.entityprovider.extension.ActionReturn;
 import org.sakaiproject.entitybroker.entityprovider.extension.Formats;
 import org.sakaiproject.entitybroker.entityprovider.extension.RequestGetter;
 import org.sakaiproject.entitybroker.exception.EntityException;
 import org.sakaiproject.entitybroker.util.AbstractEntityProvider;
-import org.sakaiproject.site.api.Site;
-import org.sakaiproject.site.api.ToolConfiguration;
-import org.sakaiproject.tool.api.Session;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;