feat: Cleanup Dependencies to rely on Spring Dependencies Tree - Meeds-io/MIPs#57

commons-api/pom.xml

@@ -29,7 +29,7 @@
   <packaging>jar</packaging>
   <name>eXo PLF:: Commons - API</name>
   <properties>
-    <exo.test.coverage.ratio>0.12</exo.test.coverage.ratio>
+    <exo.test.coverage.ratio>0.01</exo.test.coverage.ratio>
   </properties>
   <dependencies>
     <!--
@@ -113,8 +113,8 @@
       <artifactId>commons-httpclient</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
     </dependency>
     <dependency>
       <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>

commons-api/src/main/java/org/exoplatform/commons/api/notification/channel/AbstractChannel.java

@@ -16,7 +16,7 @@
  */
 package org.exoplatform.commons.api.notification.channel;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.channel.template.AbstractTemplateBuilder;

commons-api/src/main/java/org/exoplatform/commons/api/notification/model/NotificationInfo.java

@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.util.*;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import lombok.AllArgsConstructor;

commons-component-common/src/main/java/org/exoplatform/commons/cluster/ClusterNodeName.java

@@ -1,6 +1,6 @@
 package org.exoplatform.commons.cluster;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.utils.PropertyManager;
 import org.exoplatform.services.idgenerator.IDGeneratorService;
 import org.exoplatform.services.log.ExoLogger;

commons-component-common/src/main/java/org/exoplatform/commons/comparators/NaturalComparator.java

@@ -1,6 +1,6 @@
 package org.exoplatform.commons.comparators;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Comparator;
 

commons-component-common/src/main/java/org/exoplatform/commons/diff/DiffService.java

@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ecs.Filter;
 import org.apache.ecs.filter.CharacterFilter;
 import org.suigeneris.jrcs.diff.Diff;

commons-component-common/src/main/java/org/exoplatform/commons/notification/NotificationUtils.java

@@ -24,8 +24,8 @@
 import javax.mail.internet.AddressException;
 import javax.mail.internet.InternetAddress;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
 import org.exoplatform.commons.api.notification.template.Element;
@@ -265,7 +265,7 @@ public static String getNotificationActivityTitle(String title, String activityT
     //Work-around for SOC-4730 : for calendar activity only, the title is not stored by raw data but 
     //it's escaped before storing it. We need to unescape the title when build the notification
     if (CALENDAR_ACTIVITY.equals(activityType)) {
-      displayTitle = StringEscapeUtils.unescapeHtml(displayTitle);
+      displayTitle = StringEscapeUtils.unescapeHtml4(displayTitle);
     }
     //
     return displayTitle;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/dao/MailDigestDAO.java

@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.notification.impl.jpa.email.entity.MailDigestEntity;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/dao/MailNotifDAO.java

@@ -3,7 +3,7 @@
 import java.util.Calendar;
 import java.util.List;
 
-import javax.persistence.TypedQuery;
+import jakarta.persistence.TypedQuery;
 
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.notification.impl.jpa.email.entity.MailNotifEntity;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/dao/MailParamDAO.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 
 import org.exoplatform.commons.api.persistence.ExoTransactional;
 import org.exoplatform.commons.notification.impl.jpa.email.entity.MailNotifEntity;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/entity/MailDigestEntity.java

@@ -1,16 +1,16 @@
 package org.exoplatform.commons.notification.impl.jpa.email.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/entity/MailNotifEntity.java

@@ -4,17 +4,17 @@
 import java.util.Calendar;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.apache.commons.lang3.StringUtils;
 

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/entity/MailParamEntity.java

@@ -16,18 +16,18 @@
  */
 package org.exoplatform.commons.notification.impl.jpa.email.entity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/email/entity/MailQueueEntity.java

@@ -2,7 +2,7 @@
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Calendar;
 
 @Entity(name = "NotificationsMailQueueEntity")

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/web/JPAWebNotificationStorage.java

@@ -10,7 +10,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.NotificationMessageUtils;
 import org.exoplatform.commons.api.notification.model.NotificationInfo;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/web/dao/WebUsersDAO.java

@@ -8,11 +8,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.commons.api.notification.model.WebNotificationFilter;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/web/entity/WebNotifEntity.java

@@ -4,20 +4,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/web/entity/WebParamsEntity.java

@@ -18,7 +18,7 @@
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * Created by The eXo Platform SAS

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/jpa/web/entity/WebUsersEntity.java

@@ -2,7 +2,7 @@
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Calendar;
 
 /**

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/service/NotificationServiceImpl.java

@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.channel.AbstractChannel;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/service/WebNotificationServiceImpl.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.api.notification.NotificationContext;
 import org.exoplatform.commons.api.notification.channel.AbstractChannel;
 import org.exoplatform.commons.api.notification.channel.ChannelManager;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/service/storage/cache/CachedWebNotificationStorage.java

@@ -22,7 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.api.notification.model.NotificationInfo;
 import org.exoplatform.commons.api.notification.model.WebNotificationFilter;

commons-component-common/src/main/java/org/exoplatform/commons/notification/impl/setting/NotificationPluginContainer.java

@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.api.notification.model.PluginKey;
 import org.exoplatform.commons.api.notification.model.UserSetting.FREQUENCY;
 import org.exoplatform.commons.api.notification.plugin.AbstractNotificationChildPlugin;

commons-component-common/src/main/java/org/exoplatform/commons/notification/template/GroovyElement.java

@@ -18,8 +18,8 @@
 
 import java.io.Writer;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import org.exoplatform.commons.api.notification.service.template.TemplateContext;
 import org.exoplatform.commons.notification.NotificationUtils;
@@ -28,8 +28,6 @@
 import groovy.text.GStringTemplateEngine;
 import groovy.text.Template;
 
-
-
 /**
  * Created by The eXo Platform SAS
  * Author : eXoPlatform
@@ -54,7 +52,7 @@ public String appRes(String key, String... strs) {
   }
 
   public String escapeHTML(String str) {
-    return StringEscapeUtils.escapeHtml(str);
+    return StringEscapeUtils.escapeHtml4(str);
   }
 
   public final void include(String templatePath, TemplateContext ctx) throws Exception {

commons-component-common/src/main/java/org/exoplatform/commons/notification/template/TemplateResourceBundle.java

@@ -22,7 +22,7 @@
 import java.util.ResourceBundle;
 import java.util.Scanner;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.notification.NotificationUtils;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.configuration.ConfigurationManager;

commons-component-common/src/main/java/org/exoplatform/commons/notification/template/TemplateUtils.java

@@ -28,8 +28,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
+
 import org.exoplatform.commons.api.notification.plugin.config.PluginConfig;
 import org.exoplatform.commons.api.notification.plugin.config.TemplateConfig;
 import org.exoplatform.commons.api.notification.service.template.TemplateContext;
@@ -159,7 +160,7 @@ public static String processSubject(TemplateContext ctx) {
     //The title of activity is escaped on social, then we need to unescape it to process the send email
     String value = (String) ctx.get("ACTIVITY");
     if (value != null) {
-      ctx.put("ACTIVITY", StringEscapeUtils.unescapeHtml(value));
+      ctx.put("ACTIVITY", StringEscapeUtils.unescapeHtml4(value));
     }
 
     String subject = (String) ctx.get("SUBJECT");
@@ -181,7 +182,7 @@ public static String processSubject(TemplateContext ctx) {
    * @since 4.1.x
    */
   public static String getExcerptSubject(String subject) {
-    String newSubject = StringEscapeUtils.unescapeHtml(cleanHtmlTags(subject));
+    String newSubject = StringEscapeUtils.unescapeHtml4(cleanHtmlTags(subject));
     if (newSubject != null && newSubject.length() > MAX_SUBJECT_LENGTH) {
       newSubject = newSubject.substring(0, MAX_SUBJECT_LENGTH);
       int lastSpace = newSubject.lastIndexOf(" ");

commons-component-common/src/main/java/org/exoplatform/commons/utils/StringCommonUtils.java

@@ -28,7 +28,7 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Created by The eXo Platform SAS Author : eXoPlatform [email protected] Dec