diff --git a/packaging/pom.xml b/packaging/pom.xml index e3af1aa303..82150ceebe 100644 --- a/packaging/pom.xml +++ b/packaging/pom.xml @@ -40,6 +40,28 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ${project.groupId} gamification-services jar + + + commons-codec + commons-codec + + + commons-io + commons-io + + + org.apache.commons + commons-collections4 + + + log4j + log4j + + + xml-apis + xml-apis + + diff --git a/services/pom.xml b/services/pom.xml index 21aeb6a668..6b42b8f273 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -42,42 +42,10 @@ org.apache.poi poi - - - commons-codec - commons-codec - - - commons-io - commons-io - - org.apache.poi poi-ooxml - - - commons-codec - commons-codec - - - commons-io - commons-io - - - log4j - log4j - - - xml-apis - xml-apis - - - - - org.apache.logging.log4j - log4j-api @@ -168,31 +136,6 @@ **/InitContainerTestSuite.java - - hsqldb - org.exoplatform.services.naming.SimpleContextFactory - ${project.build.directory}/files - ${project.build.directory} - ${project.build.directory} - ${project.build.directory} - ${project.build.directory} - org.apache.commons.logging.impl.SimpleLog - info - - - - - org.jacoco - jacoco-maven-plugin - - - **/entity/*.class - **/model/*.class - **/constant/*.class - **/entity/**/*.class - **/model/**/*.class - **/constant/**/*.class - diff --git a/services/src/main/java/io/meeds/gamification/dao/BadgeDAO.java b/services/src/main/java/io/meeds/gamification/dao/BadgeDAO.java index e1461bffda..bdacdb9a44 100644 --- 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 index 46d6c69ef6..720e3d4ba1 100644 --- 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 { diff --git a/services/src/main/java/io/meeds/gamification/dao/EventDAO.java b/services/src/main/java/io/meeds/gamification/dao/EventDAO.java index 20fb4e27e5..735547abb2 100644 --- 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 { diff --git a/services/src/main/java/io/meeds/gamification/dao/ProgramDAO.java b/services/src/main/java/io/meeds/gamification/dao/ProgramDAO.java index a11739b33c..f901a66bc9 100644 --- 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 index 2746dd09bf..b3317d0417 100644 --- 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 index 3e32f932f4..80ab625d89 100644 --- 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 index e324e14f7f..1aba76aadc 100644 --- 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 index ba431d3090..2ac8c1ebfc 100644 --- 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 index 30e4c189c6..aa5c16f20f 100644 --- 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 index 0f4054970b..6ec79126d7 100644 --- 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 index f69235e825..f52a7a2ad5 100644 --- 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 index d7cc961e97..cfe3c6e383 100644 --- 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 index b81c3e0dbb..5359f6c673 100644 --- 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/services/src/main/java/io/meeds/gamification/listener/ActionPublishedNotificationListener.java b/services/src/main/java/io/meeds/gamification/listener/ActionPublishedNotificationListener.java index e10ef7c586..768935d8fe 100644 --- a/services/src/main/java/io/meeds/gamification/listener/ActionPublishedNotificationListener.java +++ b/services/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 index fbb168c020..a8faf3e790 100644 --- 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 index 7319aa1a51..2a9fad05b7 100644 --- 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 index fd70949e96..de8a726d07 100644 --- 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 index a2e96375cf..afcb1adf44 100644 --- 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 index 69294fb4be..c9ca8850d1 100644 --- 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; diff --git a/services/src/main/java/io/meeds/gamification/search/RuleIndexingServiceConnector.java b/services/src/main/java/io/meeds/gamification/search/RuleIndexingServiceConnector.java index 09ee00133b..211ca90692 100644 --- a/services/src/main/java/io/meeds/gamification/search/RuleIndexingServiceConnector.java +++ b/services/src/main/java/io/meeds/gamification/search/RuleIndexingServiceConnector.java @@ -25,7 +25,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.exception.ObjectNotFoundException; import org.exoplatform.commons.search.domain.Document; diff --git a/services/src/main/java/io/meeds/gamification/search/RuleSearchConnector.java b/services/src/main/java/io/meeds/gamification/search/RuleSearchConnector.java index 0c453ee918..a99b33dfe1 100644 --- a/services/src/main/java/io/meeds/gamification/search/RuleSearchConnector.java +++ b/services/src/main/java/io/meeds/gamification/search/RuleSearchConnector.java @@ -28,7 +28,7 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java b/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java index d65bc0c2cc..1855c056d7 100644 --- a/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java +++ b/services/src/main/java/io/meeds/gamification/service/impl/RealizationServiceImpl.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.CreationHelper; import org.apache.poi.ss.usermodel.Row; diff --git a/services/src/main/java/io/meeds/gamification/service/impl/RuleServiceImpl.java b/services/src/main/java/io/meeds/gamification/service/impl/RuleServiceImpl.java index 0aff92f63b..04c3624c71 100644 --- a/services/src/main/java/io/meeds/gamification/service/impl/RuleServiceImpl.java +++ b/services/src/main/java/io/meeds/gamification/service/impl/RuleServiceImpl.java @@ -39,7 +39,7 @@ import java.util.Objects; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.ObjectAlreadyExistsException; diff --git a/services/src/main/java/io/meeds/gamification/upgrade/ProgramVisibilityUpgradePlugin.java b/services/src/main/java/io/meeds/gamification/upgrade/ProgramVisibilityUpgradePlugin.java index 392a8fc618..27f548d421 100644 --- a/services/src/main/java/io/meeds/gamification/upgrade/ProgramVisibilityUpgradePlugin.java +++ b/services/src/main/java/io/meeds/gamification/upgrade/ProgramVisibilityUpgradePlugin.java @@ -21,9 +21,9 @@ import java.util.List; import java.util.Objects; -import javax.persistence.EntityManager; -import javax.persistence.Query; -import javax.persistence.TypedQuery; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; import org.exoplatform.commons.api.persistence.ExoTransactional; import org.exoplatform.commons.api.settings.SettingService; diff --git a/services/src/main/java/io/meeds/gamification/utils/Utils.java b/services/src/main/java/io/meeds/gamification/utils/Utils.java index fdcbad28a3..dea7b44e72 100644 --- a/services/src/main/java/io/meeds/gamification/utils/Utils.java +++ b/services/src/main/java/io/meeds/gamification/utils/Utils.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.exoplatform.analytics.model.StatisticData; @@ -381,7 +381,7 @@ public static String escapeIllegalCharacterInMessage(String message) { return null; } message = message.replaceAll("<[^>]+>", ""); - message = StringEscapeUtils.unescapeHtml(message); + message = StringEscapeUtils.unescapeHtml4(message); for (char c : ILLEGAL_MESSAGE_CHARACTERS) { message = message.replace(c, ' '); } @@ -403,12 +403,12 @@ public static String buildAttachmentUrl(String programId, } String token = generateAttachmentToken(programId, type, lastModifiedDate); - if (org.apache.commons.lang.StringUtils.isNotBlank(token)) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(token)) { try { token = URLEncoder.encode(token, "UTF8"); } catch (UnsupportedEncodingException e) { LOG.warn("Error encoding token", e); - token = org.apache.commons.lang.StringUtils.EMPTY; + token = org.apache.commons.lang3.StringUtils.EMPTY; } } @@ -429,14 +429,14 @@ public static String generateAttachmentToken(String programId, String attachment CodecInitializer codecInitializer = ExoContainerContext.getService(CodecInitializer.class); if (codecInitializer == null) { LOG.debug("Can't find an instance of CodecInitializer, an empty token will be generated"); - token = org.apache.commons.lang.StringUtils.EMPTY; + token = org.apache.commons.lang3.StringUtils.EMPTY; } else { try { String tokenPlain = attachmentType + ":" + programId + ":" + lastModifiedDate; token = codecInitializer.getCodec().encode(tokenPlain); } catch (TokenServiceInitializationException e) { LOG.warn("Error generating token of {} for program {}. An empty token will be used", attachmentType, programId, e); - token = org.apache.commons.lang.StringUtils.EMPTY; + token = org.apache.commons.lang3.StringUtils.EMPTY; } } return token; @@ -597,7 +597,7 @@ public static void addRealizationStatisticParameters(IdentityManager identityMan } public static String removeSpecialCharacters(String content) { - return Normalizer.normalize(StringEscapeUtils.unescapeHtml(content), Normalizer.Form.NFD) + return Normalizer.normalize(StringEscapeUtils.unescapeHtml4(content), Normalizer.Form.NFD) .replaceAll("[\\p{InCombiningDiacriticalMarks}]", "") .replace("'", ""); } diff --git a/services/src/main/resources/db/changelog/gamification.db.changelog-1.0.0.xml b/services/src/main/resources/db/changelog/gamification.db.changelog-1.0.0.xml index d4b1cd01a2..80d960c5b7 100644 --- a/services/src/main/resources/db/changelog/gamification.db.changelog-1.0.0.xml +++ b/services/src/main/resources/db/changelog/gamification.db.changelog-1.0.0.xml @@ -765,4 +765,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + + diff --git a/services/src/test/java/io/meeds/gamification/search/RuleSearchConnectorTest.java b/services/src/test/java/io/meeds/gamification/search/RuleSearchConnectorTest.java index 60aa270ebb..5f8dcd1b2f 100644 --- a/services/src/test/java/io/meeds/gamification/search/RuleSearchConnectorTest.java +++ b/services/src/test/java/io/meeds/gamification/search/RuleSearchConnectorTest.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Locale; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/services/src/test/java/io/meeds/gamification/test/AbstractServiceTest.java b/services/src/test/java/io/meeds/gamification/test/AbstractServiceTest.java index 003a20266c..4ab66be420 100644 --- a/services/src/test/java/io/meeds/gamification/test/AbstractServiceTest.java +++ b/services/src/test/java/io/meeds/gamification/test/AbstractServiceTest.java @@ -92,7 +92,7 @@ @ConfiguredBy({ @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"), @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/standalone/gamification-test-configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/gamification-test-configuration.xml"), }) public abstract class AbstractServiceTest extends BaseExoTestCase { // NOSONAR diff --git a/services/src/test/resources/conf/configuration.xml b/services/src/test/resources/conf/configuration.xml new file mode 100644 index 0000000000..e84cc31148 --- /dev/null +++ b/services/src/test/resources/conf/configuration.xml @@ -0,0 +1,40 @@ + + + + + + org.exoplatform.commons.api.persistence.DataInitializer + + GamificationManagementChangeLogsPlugin + addChangeLogsPlugin + org.exoplatform.commons.persistence.impl.ChangeLogsPlugin + + + changelogs + Change logs of Gamification + db/changelog/gamification.db.changelog-1.0.0.xml + + + + + + org.exoplatform.portal.config.UserPortalConfigListener + org.exoplatform.portal.config.GroupPortalConfigListener + diff --git a/services/src/test/resources/conf/standalone/gamification-test-configuration.xml b/services/src/test/resources/conf/portal/gamification-test-configuration.xml similarity index 61% rename from services/src/test/resources/conf/standalone/gamification-test-configuration.xml rename to services/src/test/resources/conf/portal/gamification-test-configuration.xml index 33ebb94df2..97aa1aa2cb 100644 --- a/services/src/test/resources/conf/standalone/gamification-test-configuration.xml +++ b/services/src/test/resources/conf/portal/gamification-test-configuration.xml @@ -166,26 +166,6 @@ - - org.exoplatform.commons.api.persistence.DataInitializer - org.exoplatform.commons.persistence.impl.LiquibaseDataInitializer - - - liquibase.datasource - exo-jpa_portal - - - liquibase.contexts - production - - - - - - org.exoplatform.services.jdbc.DataSourceProvider - org.exoplatform.services.jdbc.impl.DataSourceProviderImpl - - io.meeds.gamification.search.RuleIndexingServiceConnector @@ -206,327 +186,6 @@ org.exoplatform.social.notification.mock.MockNotificationService - - org.exoplatform.commons.api.persistence.DataInitializer - - GamificationManagementChangeLogsPlugin - addChangeLogsPlugin - org.exoplatform.commons.persistence.impl.ChangeLogsPlugin - - - changelogs - Change logs of Gamification - db/changelog/gamification.db.changelog-1.0.0.xml - - - - - - - org.exoplatform.services.organization.OrganizationService - - init.service.listener - addListenerPlugin - org.exoplatform.services.organization.OrganizationDatabaseInitializer - this listener populate organization data for the first launch - - - checkDatabaseAlgorithm - check database - entry - - - printInformation - Print information init database - true - - - configuration - description - - - - - - - manager - - - manager membership type - - - - - - - member - - - member membership type - - - - - - - validator - - - validator membership type - - - - - - - * - - - any membership type - - - - - - - - - - - - platform - - - - - - the /platform group - - - Platform - - - - - - - administrators - - - /platform - - - the /platform/administrators group - - - Administrators - - - - - - - users - - - /platform - - - the /platform/users group - - - Users - - - - - - - spaces - - - - - - the /spaces group - - - Spaces - - - - - - - api-access - - - /platform - - - the /platform/api-access group - - - api-access - - - - - - - - - - - - - root - - - gtn - - - Root - - - Root - - - root@localhost.com - - - manager:/platform/administrators,member:/platform/users - - - - - - - john - - - gtn - - - John - - - Anthony - - - john@localhost.com - - - member:/platform/administrators,member:/platform/users - - - - - - - mary - - - gtn - - - Mary - - - Kelly - - - mary@localhost.com - - - member:/platform/users - - - - - - - jack - - - gtn - - - Jack - - - Smith - - - jack@localhost.com - - - member:/platform/users - - - - - - - api - - - password - - - Api - - - Smith - - - api@localhost.com - - - member:/platform/users - - - - - - - - - - - - - - org.exoplatform.services.naming.InitialContextInitializer - - bind.datasource - addPlugin - org.exoplatform.services.naming.BindReferencePlugin - - - bind-name - exo-jpa_portal - - - class-name - javax.sql.DataSource - - - factory - org.apache.commons.dbcp.BasicDataSourceFactory - - - ref-addresses - ref-addresses - - - - - - - - - org.exoplatform.commons.file.services.NameSpaceService