feat: Cleanup Dependencies to rely on Spring Dependencies Tree - Meed…

…s-io/MIPs#57
Meeds-io · Dec 29, 2023 · 4271efd · 4271efd
1 parent 0b02ec8
commit 4271efd
Show file tree

Hide file tree

Showing 32 changed files with 152 additions and 485 deletions.
diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -40,6 +40,28 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <groupId>${project.groupId}</groupId>
             <artifactId>gamification-services</artifactId>
             <type>jar</type>
+            <exclusions>
+              <exclusion>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+              </exclusion>
+              <exclusion>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/services/pom.xml b/services/pom.xml
@@ -42,42 +42,10 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>xml-apis</groupId>
-          <artifactId>xml-apis</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
     </dependency>
 
     <!-- Social -->
@@ -168,31 +136,6 @@
             <includes>
               <include>**/InitContainerTestSuite.java</include>
             </includes>
-            <systemPropertyVariables>
-              <exo.profiles>hsqldb</exo.profiles>
-              <java.naming.factory.initial>org.exoplatform.services.naming.SimpleContextFactory</java.naming.factory.initial>
-              <exo.files.storage.dir>${project.build.directory}/files</exo.files.storage.dir>
-              <gatein.test.tmp.dir>${project.build.directory}</gatein.test.tmp.dir>
-              <gatein.test.output.path>${project.build.directory}</gatein.test.output.path>
-              <com.arjuna.ats.arjuna.objectstore.objectStoreDir>${project.build.directory}</com.arjuna.ats.arjuna.objectstore.objectStoreDir>
-              <ObjectStoreEnvironmentBean.objectStoreDir>${project.build.directory}</ObjectStoreEnvironmentBean.objectStoreDir>
-              <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-              <org.apache.commons.logging.simplelog.defaultlog>info</org.apache.commons.logging.simplelog.defaultlog>
-            </systemPropertyVariables>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>**/entity/*.class</exclude>
-              <exclude>**/model/*.class</exclude>
-              <exclude>**/constant/*.class</exclude>
-              <exclude>**/entity/**/*.class</exclude>
-              <exclude>**/model/**/*.class</exclude>
-              <exclude>**/constant/**/*.class</exclude>
-            </excludes>
           </configuration>
         </plugin>
       </plugins>

diff --git a/services/src/main/java/io/meeds/gamification/dao/BadgeDAO.java b/services/src/main/java/io/meeds/gamification/dao/BadgeDAO.java
@@ -20,9 +20,9 @@
 
 import io.meeds.gamification.entity.BadgeEntity;
 
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.TypedQuery;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/services/src/main/java/io/meeds/gamification/dao/ConnectorAccountDAO.java b/services/src/main/java/io/meeds/gamification/dao/ConnectorAccountDAO.java
@@ -20,8 +20,8 @@
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 
 public class ConnectorAccountDAO extends GenericDAOJPAImpl<ConnectorAccountEntity, Long> {
 

diff --git a/services/src/main/java/io/meeds/gamification/dao/EventDAO.java b/services/src/main/java/io/meeds/gamification/dao/EventDAO.java
@@ -19,14 +19,14 @@
 
 import java.util.*;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 
 import io.meeds.gamification.entity.EventEntity;
 
 import io.meeds.gamification.model.filter.EventFilter;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 
 public class EventDAO extends GenericDAOJPAImpl<EventEntity, Long> {

diff --git a/services/src/main/java/io/meeds/gamification/dao/ProgramDAO.java b/services/src/main/java/io/meeds/gamification/dao/ProgramDAO.java
@@ -22,11 +22,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+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.persistence.GenericDAO;
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;

diff --git a/services/src/main/java/io/meeds/gamification/dao/RealizationDAO.java b/services/src/main/java/io/meeds/gamification/dao/RealizationDAO.java
@@ -24,11 +24,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TypedQuery;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

diff --git a/services/src/main/java/io/meeds/gamification/dao/RuleDAO.java b/services/src/main/java/io/meeds/gamification/dao/RuleDAO.java
@@ -24,13 +24,13 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceException;
-import javax.persistence.Tuple;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.PersistenceException;
+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.persistence.GenericDAO;
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;

diff --git a/services/src/main/java/io/meeds/gamification/entity/AbstractAuditingEntity.java b/services/src/main/java/io/meeds/gamification/entity/AbstractAuditingEntity.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
 
 import lombok.Data;
 

diff --git a/services/src/main/java/io/meeds/gamification/entity/BadgeEntity.java b/services/src/main/java/io/meeds/gamification/entity/BadgeEntity.java
@@ -19,16 +19,16 @@
 import java.io.Serializable;
 import java.util.Date;
 
-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.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.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
@@ -42,7 +42,6 @@
 @NamedQuery(name = "GamificationBadge.findBadgeByDomain", query = "SELECT badge FROM GamificationBadge badge WHERE badge.domainEntity.id = :domainId  ORDER BY badge.neededScore ASC")
 @NamedQuery(name = "GamificationBadge.findEnabledBadgeByDomain", query = "SELECT badge FROM GamificationBadge badge WHERE (badge.domainEntity.id = :domainId) AND (badge.enabled = true) AND badge.isDeleted = false ORDER BY badge.neededScore ASC")
 @NamedQuery(name = "GamificationBadge.getEnabledBadges", query = "SELECT badge FROM GamificationBadge badge where badge.enabled = :isEnabled AND badge.isDeleted = false")
-@NamedQuery(name = "GamificationBadge.getValidBadges", query = "SELECT badge FROM GamificationBadge badge where (badge.startValidityDate BETWEEN :stDate AND :edDate) AND (badge.endValidityDate BETWEEN :stDate AND :edDate) AND badge.isDeleted = 0")
 @NamedQuery(name = "GamificationBadge.findBadgeByNeededScore", query = "SELECT badge FROM GamificationBadge badge where badge.neededScore = :neededScore  AND badge.isDeleted = false")
 @NamedQuery(name = "GamificationBadge.findBadgeByTitle", query = "SELECT badge FROM GamificationBadge badge where badge.title = :badgeTitle")
 @NamedQuery(name = "GamificationBadge.findBadgeByTitleAndDomain", query = "SELECT badge FROM GamificationBadge badge where badge.title = :badgeTitle and badge.domainEntity.id = :domainId")

diff --git a/services/src/main/java/io/meeds/gamification/entity/ConnectorAccountEntity.java b/services/src/main/java/io/meeds/gamification/entity/ConnectorAccountEntity.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import lombok.Data;
 import org.exoplatform.commons.api.persistence.ExoEntity;

diff --git a/services/src/main/java/io/meeds/gamification/entity/EventEntity.java b/services/src/main/java/io/meeds/gamification/entity/EventEntity.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import org.exoplatform.commons.utils.StringListConverter;
 import org.exoplatform.commons.api.persistence.ExoEntity;

diff --git a/services/src/main/java/io/meeds/gamification/entity/ProgramEntity.java b/services/src/main/java/io/meeds/gamification/entity/ProgramEntity.java
@@ -20,7 +20,7 @@
 import java.io.Serializable;
 import java.util.Set;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/services/src/main/java/io/meeds/gamification/entity/RealizationEntity.java b/services/src/main/java/io/meeds/gamification/entity/RealizationEntity.java
@@ -18,19 +18,19 @@
 
 import java.io.Serializable;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedNativeQuery;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedNativeQuery;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/services/src/main/java/io/meeds/gamification/entity/RuleEntity.java b/services/src/main/java/io/meeds/gamification/entity/RuleEntity.java
@@ -20,21 +20,21 @@
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/...ces/src/main/java/io/meeds/gamification/listener/ActionPublishedNotificationListener.java b/...ces/src/main/java/io/meeds/gamification/listener/ActionPublishedNotificationListener.java
@@ -19,7 +19,7 @@
 
 import static io.meeds.gamification.utils.Utils.*;
 
-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.model.PluginKey;

diff --git a/services/src/main/java/io/meeds/gamification/listener/AnnouncementActivityUpdater.java b/services/src/main/java/io/meeds/gamification/listener/AnnouncementActivityUpdater.java
@@ -19,7 +19,7 @@
 import static io.meeds.gamification.utils.Utils.ANNOUNCEMENT_ACTIVITY_TYPE;
 import static io.meeds.gamification.utils.Utils.ANNOUNCEMENT_COMMENT_TYPE;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.exception.ObjectNotFoundException;
 import org.exoplatform.services.log.ExoLogger;

diff --git a/services/src/main/java/io/meeds/gamification/listener/GamificationGenericListener.java b/services/src/main/java/io/meeds/gamification/listener/GamificationGenericListener.java
@@ -27,7 +27,7 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.container.ExoContainerContext;

diff --git a/services/src/main/java/io/meeds/gamification/rest/ConnectorRest.java b/services/src/main/java/io/meeds/gamification/rest/ConnectorRest.java
@@ -36,7 +36,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;

diff --git a/services/src/main/java/io/meeds/gamification/rest/ProgramRest.java b/services/src/main/java/io/meeds/gamification/rest/ProgramRest.java
@@ -46,7 +46,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.exception.ObjectNotFoundException;
 import org.exoplatform.commons.utils.IOUtil;

diff --git a/services/src/main/java/io/meeds/gamification/rest/builder/RealizationBuilder.java b/services/src/main/java/io/meeds/gamification/rest/builder/RealizationBuilder.java
@@ -7,7 +7,7 @@
 import java.util.Objects;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.portal.config.UserACL;
 import org.exoplatform.services.log.ExoLogger;