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

…s-io/MIPs#57 (#50) Upgrade from Commons Lang to apache Lang 3.
exoplatform · Jan 12, 2024 · 3306786 · 3306786
1 parent 651a953
commit 3306786
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java
@@ -4,16 +4,16 @@
 import java.util.Date;
 import java.util.Objects;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java
@@ -2,7 +2,7 @@
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Calendar;
 
 /**

diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java
@@ -2,7 +2,7 @@
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Calendar;
 
 /**

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java b/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java
@@ -1,6 +1,6 @@
 package org.exoplatform.dlp.connector;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.container.component.BaseComponentPlugin;
 import org.exoplatform.container.xml.InitParams;

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java b/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java
@@ -21,7 +21,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.commons.search.index.IndexingService;
 import org.exoplatform.commons.utils.CommonsUtils;
 import org.exoplatform.container.xml.InitParams;

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 import org.exoplatform.dlp.domain.DlpPositiveItemEntity;

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java
@@ -1,7 +1,7 @@
 package org.exoplatform.dlp.dao;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 import org.exoplatform.dlp.domain.RestoredDlpItemEntity;

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java
@@ -9,7 +9,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.picocontainer.Startable;
 
 import org.exoplatform.commons.api.settings.SettingService;

diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java
@@ -1,6 +1,6 @@
 package org.exoplatform.dlp.queue.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.dlp.dao.DlpOperationDAO;
 import org.exoplatform.dlp.domain.DlpOperation;