Skip to content

Commit e21b287

Browse files
axxter99Miguel Pellicer
axxter99
authored and
Miguel Pellicer
committed
SAK-41467 commons-lang => commons-lang3 (sakaiproject#6627)
calendar, chat, ciktations, common, commens,
1 parent 6937cc4 commit e21b287

File tree

26 files changed

+72
-58
lines changed

26 files changed

+72
-58
lines changed

‎calendar/calendar-impl/impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<artifactId>sakai-calendar-util</artifactId>
5353
</dependency>
5454
<dependency>
55-
<groupId>commons-lang</groupId>
56-
<artifactId>commons-lang</artifactId>
55+
<groupId>org.apache.commons</groupId>
56+
<artifactId>commons-lang3</artifactId>
5757
</dependency>
5858
<dependency>
5959
<groupId>${project.groupId}</groupId>

‎calendar/calendar-impl/impl/src/java/org/sakaiproject/calendar/impl/BaseCalendarService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import net.fortuna.ical4j.model.parameter.Value;
4646
import net.fortuna.ical4j.model.property.*;
4747

48-
import org.apache.commons.lang.StringUtils;
48+
import org.apache.commons.lang3.StringUtils;
4949

5050
import org.w3c.dom.Document;
5151
import org.w3c.dom.Element;

‎calendar/calendar-summary-tool/tool/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<type>pom</type>
8585
</dependency>
8686
<dependency>
87-
<groupId>commons-lang</groupId>
88-
<artifactId>commons-lang</artifactId>
87+
<groupId>org.apache.commons</groupId>
88+
<artifactId>commons-lang3</artifactId>
8989
</dependency>
9090
<dependency>
9191
<groupId>commons-digester</groupId>

‎calendar/calendar-summary-tool/tool/src/java/org/sakaiproject/tool/summarycalendar/ui/CalendarBean.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
import lombok.extern.slf4j.Slf4j;
4242

43-
import org.apache.commons.lang.StringUtils;
43+
import org.apache.commons.lang3.StringUtils;
4444
import org.joda.time.DateTime;
4545
import org.joda.time.DateTimeZone;
4646
import org.sakaiproject.authz.api.SecurityService;

‎calendar/calendar-tool/tool/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
<groupId>org.springframework</groupId>
7373
<artifactId>spring-beans</artifactId>
7474
</dependency>
75+
<dependency>
76+
<groupId>org.apache.commons</groupId>
77+
<artifactId>commons-lang3</artifactId>
78+
</dependency>
7579
</dependencies>
7680

7781
<build>

‎calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/entityproviders/CalendarEventEntityProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import java.util.*;
1919

20-
import org.apache.commons.lang.BooleanUtils;
21-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.BooleanUtils;
21+
import org.apache.commons.lang3.StringUtils;
2222
import org.sakaiproject.calendar.api.Calendar;
2323
import org.sakaiproject.calendar.api.CalendarEvent;
2424
import org.sakaiproject.calendar.api.CalendarEventVector;

‎calendar/calendar-tool/tool/src/java/org/sakaiproject/calendar/tool/CalendarAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
import lombok.extern.slf4j.Slf4j;
4949

50-
import org.apache.commons.lang.StringUtils;
50+
import org.apache.commons.lang3.StringUtils;
5151

5252
import org.sakaiproject.alias.api.Alias;
5353
import org.sakaiproject.alias.api.AliasService;

‎chat/chat-impl/impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<artifactId>guava</artifactId>
8484
</dependency>
8585
<dependency>
86-
<groupId>commons-lang</groupId>
87-
<artifactId>commons-lang</artifactId>
86+
<groupId>org.apache.commons</groupId>
87+
<artifactId>commons-lang3</artifactId>
8888
</dependency>
8989
</dependencies>
9090
<build>

‎chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import lombok.Setter;
5151
import lombok.extern.slf4j.Slf4j;
5252

53-
import org.apache.commons.lang.StringUtils;
54-
import org.apache.commons.lang.time.DateUtils;
53+
import org.apache.commons.lang3.StringUtils;
54+
import org.apache.commons.lang3.time.DateUtils;
5555

5656
import org.hibernate.Criteria;
5757
import org.hibernate.Query;

‎chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatMessageEntityProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import lombok.Setter;
2828
import lombok.extern.slf4j.Slf4j;
2929

30-
import org.apache.commons.lang.StringUtils;
30+
import org.apache.commons.lang3.StringUtils;
3131

3232
import org.sakaiproject.chat2.model.ChatChannel;
3333
import org.sakaiproject.chat2.model.ChatManager;

‎chat/chat-tool/tool/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
<artifactId>commons-beanutils</artifactId>
9393
</dependency>
9494
<dependency>
95-
<groupId>commons-lang</groupId>
96-
<artifactId>commons-lang</artifactId>
95+
<groupId>org.apache.commons</groupId>
96+
<artifactId>commons-lang3</artifactId>
9797
</dependency>
9898
<!--JSF 2.3 dependencies-->
9999
<dependency>

‎chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import lombok.Setter;
4949
import lombok.extern.slf4j.Slf4j;
5050

51-
import org.apache.commons.lang.StringUtils;
51+
import org.apache.commons.lang3.StringUtils;
5252

5353
import org.sakaiproject.authz.api.PermissionsHelper;
5454
import org.sakaiproject.chat2.model.ChatMessage;

‎chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Calendar;
2525
import java.util.Date;
2626

27-
import org.apache.commons.lang.time.DateUtils;
27+
import org.apache.commons.lang3.time.DateUtils;
2828
import org.sakaiproject.chat2.model.ChatChannel;
2929

3030
public class DecoratedChatChannel {

‎citations/citations-impl/impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<artifactId>OkiOSID</artifactId>
6262
</dependency>
6363
<dependency>
64-
<groupId>commons-lang</groupId>
65-
<artifactId>commons-lang</artifactId>
64+
<groupId>org.apache.commons</groupId>
65+
<artifactId>commons-lang3</artifactId>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.sakaiproject.velocity</groupId>

‎citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/BaseCitationService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
import lombok.extern.slf4j.Slf4j;
3232

33-
import org.apache.commons.lang.StringUtils;
33+
import org.apache.commons.lang3.StringUtils;
3434

3535
import org.osid.repository.Asset;
3636
import org.osid.repository.Part;

‎citations/citations-impl/impl/src/java/org/sakaiproject/citation/impl/NestedCitationValidator.java

+7-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
*/
1616
package org.sakaiproject.citation.impl;
1717

18-
import org.apache.commons.lang.*;
19-
import org.sakaiproject.citation.api.*;
20-
2118
import java.util.Arrays;
2219
import java.util.List;
23-
import org.sakaiproject.component.cover.*;
20+
21+
import org.apache.commons.lang3.StringUtils;
22+
import org.sakaiproject.citation.api.CitationCollection;
23+
import org.sakaiproject.citation.api.CitationCollectionOrder;
24+
import org.sakaiproject.citation.api.CitationService;
25+
import org.sakaiproject.citation.api.CitationValidator;
26+
import org.sakaiproject.component.cover.ComponentManager;
2427

2528
/**
2629
* Created by nickwilson on 9/29/15.

‎common/archive-impl/impl2/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<artifactId>commons-io</artifactId>
5050
</dependency>
5151
<dependency>
52-
<groupId>commons-lang</groupId>
53-
<artifactId>commons-lang</artifactId>
52+
<groupId>org.apache.commons</groupId>
53+
<artifactId>commons-lang3</artifactId>
5454
</dependency>
5555
</dependencies>
5656
<build>

‎common/archive-impl/impl2/src/java/org/sakaiproject/archive/impl/ArchiveService2Impl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import lombok.extern.slf4j.Slf4j;
2525

2626
import org.apache.commons.io.FileUtils;
27-
import org.apache.commons.lang.StringUtils;
27+
import org.apache.commons.lang3.StringUtils;
2828

2929
import org.sakaiproject.archive.api.ArchiveService;
3030
import org.sakaiproject.component.api.ServerConfigurationService;

‎common/common-composite-component/pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@
6666
<artifactId>commons-beanutils</artifactId>
6767
</dependency>
6868
<dependency>
69-
<groupId>commons-lang</groupId>
70-
<artifactId>commons-lang</artifactId>
71-
<scope>provided</scope>
72-
</dependency>
73-
74-
69+
<groupId>org.apache.commons</groupId>
70+
<artifactId>commons-lang3</artifactId>
71+
<scope>provided</scope>
72+
</dependency>
7573
</dependencies>
7674
<build>
7775
<resources>

‎common/common-composite-component/src/java/org/sakaiproject/component/common/edu/person/SakaiPersonManagerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
import lombok.extern.slf4j.Slf4j;
3333

34-
import org.apache.commons.lang.StringUtils;
34+
import org.apache.commons.lang3.StringUtils;
3535
import org.hibernate.Criteria;
3636
import org.hibernate.HibernateException;
3737
import org.hibernate.Query;

‎commons/api/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<artifactId>commons-fileupload</artifactId>
4646
</dependency>
4747
<dependency>
48-
<groupId>commons-lang</groupId>
49-
<artifactId>commons-lang</artifactId>
48+
<groupId>org.apache.commons</groupId>
49+
<artifactId>commons-lang3</artifactId>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.projectlombok</groupId>

‎commons/api/src/java/org/sakaiproject/commons/api/datamodel/Comment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.sql.SQLException;
2626
import java.util.TimeZone;
2727

28-
import org.apache.commons.lang.StringEscapeUtils;
28+
import org.apache.commons.lang3.StringEscapeUtils;
2929
import org.sakaiproject.commons.api.CommonsManager;
3030
import org.sakaiproject.entity.api.Entity;
3131
import org.sakaiproject.entity.api.ResourceProperties;
@@ -104,7 +104,7 @@ public void setContent(String text, boolean modified) {
104104
modifiedDate = Instant.now().toEpochMilli();
105105
}
106106

107-
this.content = StringEscapeUtils.unescapeHtml(text.trim());
107+
this.content = StringEscapeUtils.unescapeHtml3(text.trim());
108108
}
109109

110110
public void setCreatedDate(long createdDate) {

‎commons/impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<artifactId>commons-fileupload</artifactId>
6161
</dependency>
6262
<dependency>
63-
<groupId>commons-lang</groupId>
64-
<artifactId>commons-lang</artifactId>
63+
<groupId>org.apache.commons</groupId>
64+
<artifactId>commons-lang3</artifactId>
6565
</dependency>
6666
<dependency>
6767
<groupId>junit</groupId>

‎commons/impl/src/java/org/sakaiproject/commons/impl/CommonsSecurityManagerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.sakaiproject.commons.impl;
1919

20-
import org.apache.commons.lang.StringUtils;
20+
import org.apache.commons.lang3.StringUtils;
2121

2222
import java.time.Instant;
2323
import java.util.ArrayList;

‎commons/tool/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<artifactId>commons-fileupload</artifactId>
6262
</dependency>
6363
<dependency>
64-
<groupId>commons-lang</groupId>
65-
<artifactId>commons-lang</artifactId>
64+
<groupId>org.apache.commons</groupId>
65+
<artifactId>commons-lang3</artifactId>
6666
</dependency>
6767
<dependency>
6868
<groupId>org.projectlombok</groupId>

‎commons/tool/src/java/org/sakaiproject/commons/tool/entityprovider/CommonsEntityProvider.java

+23-14
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,53 @@
1515
*/
1616
package org.sakaiproject.commons.tool.entityprovider;
1717

18-
import java.io.*;
18+
import java.io.BufferedReader;
19+
import java.io.BufferedWriter;
20+
import java.io.IOException;
21+
import java.io.InputStreamReader;
22+
import java.io.OutputStream;
23+
import java.io.OutputStreamWriter;
1924
import java.net.CookieHandler;
2025
import java.net.CookieManager;
2126
import java.net.CookiePolicy;
22-
import java.net.MalformedURLException;
2327
import java.net.HttpURLConnection;
28+
import java.net.MalformedURLException;
2429
import java.net.URL;
2530
import java.net.URLConnection;
26-
import java.util.*;
31+
import java.util.ArrayList;
32+
import java.util.Arrays;
33+
import java.util.List;
34+
import java.util.Map;
35+
import java.util.Set;
2736

2837
import javax.servlet.http.HttpServletResponse;
2938

3039
import org.apache.commons.fileupload.FileItem;
31-
import org.apache.commons.lang.StringEscapeUtils;
32-
import org.apache.commons.lang.StringUtils;
33-
34-
import org.sakaiproject.authz.api.PermissionsHelper;
35-
import org.sakaiproject.commons.api.datamodel.Comment;
36-
import org.sakaiproject.commons.api.datamodel.Post;
37-
import org.sakaiproject.commons.api.datamodel.PostsData;
40+
import org.apache.commons.lang3.StringEscapeUtils;
41+
import org.apache.commons.lang3.StringUtils;
3842
import org.sakaiproject.commons.api.CommonsEvents;
3943
import org.sakaiproject.commons.api.CommonsManager;
4044
import org.sakaiproject.commons.api.CommonsSecurityManager;
4145
import org.sakaiproject.commons.api.PostReferenceFactory;
4246
import org.sakaiproject.commons.api.QueryBean;
4347
import org.sakaiproject.commons.api.SakaiProxy;
48+
import org.sakaiproject.commons.api.datamodel.Comment;
49+
import org.sakaiproject.commons.api.datamodel.Post;
50+
import org.sakaiproject.commons.api.datamodel.PostsData;
4451
import org.sakaiproject.entitybroker.EntityReference;
4552
import org.sakaiproject.entitybroker.EntityView;
4653
import org.sakaiproject.entitybroker.entityprovider.annotations.EntityCustomAction;
47-
import org.sakaiproject.entitybroker.entityprovider.capabilities.*;
54+
import org.sakaiproject.entitybroker.entityprovider.capabilities.ActionsExecutable;
55+
import org.sakaiproject.entitybroker.entityprovider.capabilities.AutoRegisterEntityProvider;
56+
import org.sakaiproject.entitybroker.entityprovider.capabilities.Describeable;
57+
import org.sakaiproject.entitybroker.entityprovider.capabilities.Outputable;
58+
import org.sakaiproject.entitybroker.entityprovider.capabilities.ReferenceParseable;
59+
import org.sakaiproject.entitybroker.entityprovider.capabilities.RequestAware;
4860
import org.sakaiproject.entitybroker.entityprovider.extension.ActionReturn;
4961
import org.sakaiproject.entitybroker.entityprovider.extension.Formats;
5062
import org.sakaiproject.entitybroker.entityprovider.extension.RequestGetter;
5163
import org.sakaiproject.entitybroker.exception.EntityException;
5264
import org.sakaiproject.entitybroker.util.AbstractEntityProvider;
53-
import org.sakaiproject.site.api.Site;
54-
import org.sakaiproject.site.api.ToolConfiguration;
55-
import org.sakaiproject.tool.api.Session;
5665

5766
import lombok.Setter;
5867
import lombok.extern.slf4j.Slf4j;

0 commit comments

Comments
 (0)