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

…s-io/MIPs#57
Meeds-io · Dec 30, 2023 · 3ffefc5 · 3ffefc5
1 parent 058ea42
commit 3ffefc5
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 92 deletions.
diff --git a/...ion-github-services/src/main/java/org/exoplatform/gamification/github/dao/WebHookDAO.java b/...ion-github-services/src/main/java/org/exoplatform/gamification/github/dao/WebHookDAO.java
@@ -18,8 +18,8 @@
 import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl;
 import org.exoplatform.gamification.github.entity.WebhookEntity;
 
-import javax.persistence.NoResultException;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.TypedQuery;
 import java.util.List;
 
 public class WebHookDAO extends GenericDAOJPAImpl<WebhookEntity, Long> {

diff --git a/...thub-services/src/main/java/org/exoplatform/gamification/github/entity/WebhookEntity.java b/...thub-services/src/main/java/org/exoplatform/gamification/github/entity/WebhookEntity.java
@@ -19,7 +19,7 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import org.exoplatform.commons.api.persistence.ExoEntity;
 

diff --git a/...ces/src/main/java/org/exoplatform/gamification/github/model/GithubAccessTokenContext.java b/...ces/src/main/java/org/exoplatform/gamification/github/model/GithubAccessTokenContext.java
@@ -20,7 +20,7 @@
 
 import com.github.scribejava.core.model.OAuth2AccessToken;
 import io.meeds.oauth.spi.AccessTokenContext;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 public class GithubAccessTokenContext extends AccessTokenContext implements Serializable {
 

diff --git a/...vices/src/main/java/org/exoplatform/gamification/github/plugin/GithubConnectorPlugin.java b/...vices/src/main/java/org/exoplatform/gamification/github/plugin/GithubConnectorPlugin.java
@@ -24,7 +24,7 @@
 import io.meeds.gamification.service.ConnectorSettingService;
 import io.meeds.oauth.exception.OAuthException;
 import io.meeds.oauth.exception.OAuthExceptionCode;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.exoplatform.gamification.github.model.GithubAccessTokenContext;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;

diff --git a/...-services/src/main/java/org/exoplatform/gamification/github/rest/HooksManagementRest.java b/...-services/src/main/java/org/exoplatform/gamification/github/rest/HooksManagementRest.java
@@ -24,7 +24,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.ObjectAlreadyExistsException;
 import org.exoplatform.commons.exception.ObjectNotFoundException;

diff --git a/...services/src/main/java/org/exoplatform/gamification/github/utils/StringListConverter.java b/...services/src/main/java/org/exoplatform/gamification/github/utils/StringListConverter.java
@@ -15,8 +15,8 @@
  */
 package org.exoplatform.gamification.github.utils;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 import java.util.Arrays;
 import java.util.List;
 

diff --git a/gamification-github-services/src/test/resources/conf/configuration.properties b/gamification-github-services/src/test/resources/conf/configuration.properties
diff --git a/gamification-github-services/src/test/resources/conf/configuration.xml b/gamification-github-services/src/test/resources/conf/configuration.xml
diff --git a/gamification-github-services/src/test/resources/conf/portal/configuration.xml b/gamification-github-services/src/test/resources/conf/portal/configuration.xml
@@ -25,21 +25,6 @@
       <type>org.exoplatform.gamification.github.services.impl.WebhookServiceImpl</type>
     </component>
 
-    <component>
-        <key>org.exoplatform.commons.api.persistence.DataInitializer</key>
-        <type>org.exoplatform.commons.persistence.impl.LiquibaseDataInitializer</type>
-        <init-params>
-            <value-param>
-                <name>liquibase.datasource</name>
-                <value>java:/comp/env/exo-jpa_portal</value>
-            </value-param>
-            <value-param>
-                <name>liquibase.contexts</name>
-                <value>${exo.liquibase.contexts}</value>
-            </value-param>
-        </init-params>
-    </component>
-
     <remove-configuration>org.exoplatform.commons.search.index.IndexingOperationProcessor</remove-configuration>
     <remove-configuration>org.exoplatform.commons.search.rest.IndexingManagementRestServiceV1</remove-configuration>