diff --git a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/dao/WebHookDAO.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/dao/WebHookDAO.java index ab7749b6..df398ff8 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/dao/WebHookDAO.java +++ b/gamification-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 { diff --git a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/entity/WebhookEntity.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/entity/WebhookEntity.java index 198d153c..6765af68 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/entity/WebhookEntity.java +++ b/gamification-github-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/gamification-github-services/src/main/java/org/exoplatform/gamification/github/model/GithubAccessTokenContext.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/model/GithubAccessTokenContext.java index 43d50fef..b62f0184 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/model/GithubAccessTokenContext.java +++ b/gamification-github-services/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/gamification-github-services/src/main/java/org/exoplatform/gamification/github/plugin/GithubConnectorPlugin.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/plugin/GithubConnectorPlugin.java index 8aab73d5..fd686ae1 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/plugin/GithubConnectorPlugin.java +++ b/gamification-github-services/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/gamification-github-services/src/main/java/org/exoplatform/gamification/github/rest/HooksManagementRest.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/rest/HooksManagementRest.java index d9b09f38..f33e0710 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/rest/HooksManagementRest.java +++ b/gamification-github-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/gamification-github-services/src/main/java/org/exoplatform/gamification/github/utils/StringListConverter.java b/gamification-github-services/src/main/java/org/exoplatform/gamification/github/utils/StringListConverter.java index d13af68b..1c426e84 100644 --- a/gamification-github-services/src/main/java/org/exoplatform/gamification/github/utils/StringListConverter.java +++ b/gamification-github-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 deleted file mode 100644 index e69de29b..00000000 diff --git a/gamification-github-services/src/test/resources/conf/configuration.xml b/gamification-github-services/src/test/resources/conf/configuration.xml deleted file mode 100644 index ec608fd4..00000000 --- a/gamification-github-services/src/test/resources/conf/configuration.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - org.exoplatform.services.naming.InitialContextInitializer - org.exoplatform.services.naming.InitialContextInitializer - true - - - default-properties - Default initial context properties - - - - - - - - org.exoplatform.services.naming.InitialContextInitializer - - bind.datasource - addPlugin - org.exoplatform.services.naming.BindReferencePlugin - - - bind-name - java:/comp/env/exo-jpa_portal - - - class-name - javax.sql.DataSource - - - factory - org.apache.commons.dbcp.BasicDataSourceFactory - - - ref-addresses - ref-addresses - - - - - - - - - - org.exoplatform.commons.api.persistence.DataInitializer - diff --git a/gamification-github-services/src/test/resources/conf/portal/configuration.xml b/gamification-github-services/src/test/resources/conf/portal/configuration.xml index b18fef3a..1f1cae71 100644 --- 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 @@ org.exoplatform.gamification.github.services.impl.WebhookServiceImpl - - org.exoplatform.commons.api.persistence.DataInitializer - org.exoplatform.commons.persistence.impl.LiquibaseDataInitializer - - - liquibase.datasource - java:/comp/env/exo-jpa_portal - - - liquibase.contexts - ${exo.liquibase.contexts} - - - - org.exoplatform.commons.search.index.IndexingOperationProcessor org.exoplatform.commons.search.rest.IndexingManagementRestServiceV1