From 0f735473265400bd7c78c7dc7d582a1aa828652c Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 12 Jan 2024 14:53:33 +0100 Subject: [PATCH] feat: Cleanup Dependencies to rely on Spring Dependencies Tree - Meeds-io/MIPs#57 (#180) Upgrade from Commons Lang to Apache Lang 3 and to Jakarta Persistence API 3.1. This change will delete useless artifacts declarations as well since the packaging needs the project artifacts only which will enhance the maintainability and ensure to not need to change this addon a lot due to lower layer dependencies changes. --- data-upgrade-app-registry/pom.xml | 2 +- .../upgrade/AppRegistryUpgradePlugin.java | 4 +- ...CleanAppRegistryCategoryUpgradePlugin.java | 4 +- .../TemplateParamsUpgradePlugin.java | 4 +- .../NodeTypeTemplateUpgradePlugin.java | 2 +- .../templates/WCMTemplateUpgradePlugin.java | 2 +- .../SiteExplorerTemplateUpgradePlugin.java | 2 +- .../migration/NavigationNotesMigration.java | 4 +- .../PortalConfigPermissionMigration.java | 6 +- .../PublishedNewsDisplayedPropUpgrade.java | 4 +- ...PublishedNewsDisplayedPropUpgradeTest.java | 4 +- data-upgrade-packaging/pom.xml | 43 ------------ .../assemblies/data-upgrade-addon-package.xml | 70 +------------------ data-upgrade-pages/pom.xml | 17 ----- .../exoplatform/migration/PagesMigration.java | 4 +- .../PopularSpacesRemovePreferences.java | 4 +- .../migration/SpaceApplicationMigration.java | 4 +- .../migration/AddCSSClassToPageTest.java | 13 +++- .../PopularSpacesRemovePreferencesTest.java | 7 +- ...eloadPortalConfigurationMigrationTest.java | 28 +++++--- .../SpaceApplicationMigrationTest.java | 20 ++++-- ...de-application-registry-configuration.xml} | 0 ...pgrade-spaces-templates-configuration.xml} | 0 .../resources/conf/portal/configuration.xml | 4 +- .../UsersLastLoginTimeMigration.java | 4 +- .../upgrade/WikiPageNameUpgradePlugin.java | 4 +- 26 files changed, 80 insertions(+), 180 deletions(-) rename data-upgrade-pages/src/test/resources/conf/{application-registry-configuration.xml => data-upgrade-application-registry-configuration.xml} (100%) rename data-upgrade-pages/src/test/resources/conf/{spaces-templates-configuration.xml => data-upgrade-spaces-templates-configuration.xml} (100%) diff --git a/data-upgrade-app-registry/pom.xml b/data-upgrade-app-registry/pom.xml index 448ac9851..4d5551a6d 100644 --- a/data-upgrade-app-registry/pom.xml +++ b/data-upgrade-app-registry/pom.xml @@ -32,7 +32,7 @@ eXo Add-on:: Data Upgrade Add-on - ApplicationRegistery - Upgrade - 0.82 + 0.80 diff --git a/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/AppRegistryUpgradePlugin.java b/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/AppRegistryUpgradePlugin.java index 1158c9bc2..81a2e2526 100644 --- a/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/AppRegistryUpgradePlugin.java +++ b/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/AppRegistryUpgradePlugin.java @@ -1,7 +1,7 @@ package org.exoplatform.application.upgrade; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.persistence.impl.EntityManagerService; diff --git a/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/CleanAppRegistryCategoryUpgradePlugin.java b/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/CleanAppRegistryCategoryUpgradePlugin.java index 2a77917b0..a6a781b53 100644 --- a/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/CleanAppRegistryCategoryUpgradePlugin.java +++ b/data-upgrade-app-registry/src/main/java/org/exoplatform/application/upgrade/CleanAppRegistryCategoryUpgradePlugin.java @@ -16,8 +16,8 @@ */ package org.exoplatform.application.upgrade; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.exoplatform.commons.persistence.impl.EntityManagerService; import org.exoplatform.commons.upgrade.UpgradeProductPlugin; diff --git a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/activities/TemplateParamsUpgradePlugin.java b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/activities/TemplateParamsUpgradePlugin.java index b351672ae..e28aebc3d 100644 --- a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/activities/TemplateParamsUpgradePlugin.java +++ b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/activities/TemplateParamsUpgradePlugin.java @@ -27,8 +27,8 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; public class TemplateParamsUpgradePlugin extends UpgradeProductPlugin { private static final Log LOG = ExoLogger.getExoLogger(TemplateParamsUpgradePlugin.class); diff --git a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/NodeTypeTemplateUpgradePlugin.java b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/NodeTypeTemplateUpgradePlugin.java index 7f11bd9b3..de3d33e07 100644 --- a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/NodeTypeTemplateUpgradePlugin.java +++ b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/NodeTypeTemplateUpgradePlugin.java @@ -25,7 +25,7 @@ import javax.jcr.NodeIterator; import javax.jcr.Workspace; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.info.MissingProductInformationException; import org.exoplatform.commons.info.ProductInformations; diff --git a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/WCMTemplateUpgradePlugin.java b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/WCMTemplateUpgradePlugin.java index 6f97a81b4..9f86764b9 100644 --- a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/WCMTemplateUpgradePlugin.java +++ b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/templates/WCMTemplateUpgradePlugin.java @@ -26,7 +26,7 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.upgrade.UpgradeProductPlugin; import org.exoplatform.commons.utils.PrivilegedSystemHelper; diff --git a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/views/SiteExplorerTemplateUpgradePlugin.java b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/views/SiteExplorerTemplateUpgradePlugin.java index a7f6bb456..00bc3b1e6 100644 --- a/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/views/SiteExplorerTemplateUpgradePlugin.java +++ b/data-upgrade-ecms/src/main/java/org/exoplatform/ecms/upgrade/views/SiteExplorerTemplateUpgradePlugin.java @@ -25,7 +25,7 @@ import javax.jcr.NodeIterator; import javax.jcr.Session; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.upgrade.UpgradeProductPlugin; import org.exoplatform.commons.utils.PrivilegedSystemHelper; diff --git a/data-upgrade-navigations/src/main/java/org/exoplatform/migration/NavigationNotesMigration.java b/data-upgrade-navigations/src/main/java/org/exoplatform/migration/NavigationNotesMigration.java index 47b3b7d06..e15409ec7 100644 --- a/data-upgrade-navigations/src/main/java/org/exoplatform/migration/NavigationNotesMigration.java +++ b/data-upgrade-navigations/src/main/java/org/exoplatform/migration/NavigationNotesMigration.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.commons.lang3.StringUtils; diff --git a/data-upgrade-navigations/src/main/java/org/exoplatform/migration/PortalConfigPermissionMigration.java b/data-upgrade-navigations/src/main/java/org/exoplatform/migration/PortalConfigPermissionMigration.java index ed1f2782a..cff94c3b4 100644 --- a/data-upgrade-navigations/src/main/java/org/exoplatform/migration/PortalConfigPermissionMigration.java +++ b/data-upgrade-navigations/src/main/java/org/exoplatform/migration/PortalConfigPermissionMigration.java @@ -31,9 +31,9 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -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 java.io.Serializable; import java.util.List; diff --git a/data-upgrade-news/src/main/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgrade.java b/data-upgrade-news/src/main/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgrade.java index 9d9fb539e..0eeef6e39 100644 --- a/data-upgrade-news/src/main/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgrade.java +++ b/data-upgrade-news/src/main/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgrade.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; diff --git a/data-upgrade-news/src/test/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgradeTest.java b/data-upgrade-news/src/test/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgradeTest.java index 66abdf681..3dfa4e99a 100644 --- a/data-upgrade-news/src/test/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgradeTest.java +++ b/data-upgrade-news/src/test/java/org/exoplatform/news/upgrade/targets/PublishedNewsDisplayedPropUpgradeTest.java @@ -10,8 +10,8 @@ import java.util.LinkedList; import java.util.List; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.hibernate.Transaction; import org.junit.AfterClass; diff --git a/data-upgrade-packaging/pom.xml b/data-upgrade-packaging/pom.xml index ab5dca9e7..cc9977026 100644 --- a/data-upgrade-packaging/pom.xml +++ b/data-upgrade-packaging/pom.xml @@ -84,49 +84,6 @@ ${project.groupId} data-upgrade-move-folders - - - - commons-beanutils - commons-beanutils - provided - - - commons-lang - commons-lang - provided - - - org.apache.commons - commons-lang3 - provided - - - commons-codec - commons-codec - provided - - - commons-collections - commons-collections - provided - - - commons-io - commons-io - provided - - - javax.inject - javax.inject - provided - - - xerces - xercesImpl - provided - - data-upgrade-addon diff --git a/data-upgrade-packaging/src/main/assemblies/data-upgrade-addon-package.xml b/data-upgrade-packaging/src/main/assemblies/data-upgrade-addon-package.xml index 15b2988ec..7b7449b7f 100644 --- a/data-upgrade-packaging/src/main/assemblies/data-upgrade-addon-package.xml +++ b/data-upgrade-packaging/src/main/assemblies/data-upgrade-addon-package.xml @@ -30,76 +30,8 @@ /lib - *:*:jar + ${project.groupId}:*:jar - - - org.apache.tomcat:* - - org.apache.ant:* - org.apache.axis:axis-ant:* - - commons-logging:* - - log4j:* - org.apache.logging.log4j:* - - org.slf4j:slf4j-jcl:* - - org.slf4j:slf4j-logj12:* - - org.slf4j:slf4j-jdk14:* - - jdom:*:* - - javax.servlet:* - com.google.gwt:gwt-user:* - javax.servlet.jsp:* - - junit:* - org.testng:* - org.exoplatform.tool:exo.tool.framework.junit - org.jmock:* - jmock:* - org.mockito:* - - jdom:* - - xpp3:xpp3_min - - xpp3:xpp3 - - commons-beanutils:commons-beanutils-core - - org.jboss.logging:jboss-logging-spi - - org.codehaus.woodstox:wstx-asl - - xml-apis:* - org.apache.geronimo.specs:geronimo-stax-api_1.0_spec - stax:* - javax.xml.stream:* - org.apache.geronimo.specs:geronimo-activation_1.0.2_spec - org.jboss.javaee:jboss-transaction-api - org.jboss.spec.javax.transaction:* - org.ow2.spec.ee:ow2-jta-1.1-spec - - rome:modules:* - - org.exoplatform.resources:exo-lgpl-license-resource-bundle:* - - *:xmlParserAPIs:* - - org.icepdf:icepdf-core:* - - org.apache.poi:poi-ooxml:[3.8] - org.slf4j:*:* - javax.*:*:* - org.gatein.mop:mop-api:* - org.gatein.mop:mop-spi:* - *:jdom2:* - *:dom4j:* - ${artifact.artifactId}.${artifact.extension} false diff --git a/data-upgrade-pages/pom.xml b/data-upgrade-pages/pom.xml index c7da5d950..6c6a1fe08 100644 --- a/data-upgrade-pages/pom.xml +++ b/data-upgrade-pages/pom.xml @@ -36,26 +36,9 @@ - - org.exoplatform.commons - commons-component-upgrade - provided - - - org.exoplatform.gatein.portal - exo.portal.component.api - provided - org.exoplatform.social social-component-core - provided - - - org.exoplatform.gatein.portal - exo.portal.component.portal - test-jar - test org.exoplatform.social diff --git a/data-upgrade-pages/src/main/java/org/exoplatform/migration/PagesMigration.java b/data-upgrade-pages/src/main/java/org/exoplatform/migration/PagesMigration.java index 5ca1ca163..7b0ba86dd 100644 --- a/data-upgrade-pages/src/main/java/org/exoplatform/migration/PagesMigration.java +++ b/data-upgrade-pages/src/main/java/org/exoplatform/migration/PagesMigration.java @@ -4,8 +4,8 @@ import java.util.*; import java.util.Map.Entry; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.commons.lang3.StringUtils; diff --git a/data-upgrade-pages/src/main/java/org/exoplatform/migration/PopularSpacesRemovePreferences.java b/data-upgrade-pages/src/main/java/org/exoplatform/migration/PopularSpacesRemovePreferences.java index 05389fc22..4862e39fd 100644 --- a/data-upgrade-pages/src/main/java/org/exoplatform/migration/PopularSpacesRemovePreferences.java +++ b/data-upgrade-pages/src/main/java/org/exoplatform/migration/PopularSpacesRemovePreferences.java @@ -24,8 +24,8 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; public class PopularSpacesRemovePreferences extends UpgradeProductPlugin { diff --git a/data-upgrade-pages/src/main/java/org/exoplatform/migration/SpaceApplicationMigration.java b/data-upgrade-pages/src/main/java/org/exoplatform/migration/SpaceApplicationMigration.java index a71d4528e..335f23d00 100644 --- a/data-upgrade-pages/src/main/java/org/exoplatform/migration/SpaceApplicationMigration.java +++ b/data-upgrade-pages/src/main/java/org/exoplatform/migration/SpaceApplicationMigration.java @@ -36,8 +36,8 @@ import org.exoplatform.social.core.space.model.Space; import org.exoplatform.social.core.space.spi.SpaceService; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.Arrays; public class SpaceApplicationMigration extends UpgradeProductPlugin { diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/AddCSSClassToPageTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/AddCSSClassToPageTest.java index a9980158b..9209fb376 100644 --- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/AddCSSClassToPageTest.java +++ b/data-upgrade-pages/src/test/java/org/exoplatform/migration/AddCSSClassToPageTest.java @@ -1,5 +1,9 @@ package org.exoplatform.migration; +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; import org.exoplatform.portal.config.model.Container; @@ -16,11 +20,16 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; import static org.mockito.Mockito.*; +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration-local.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/portal/config/conf/configuration.xml"), +}) @RunWith(MockitoJUnitRunner.class) -public class AddCSSClassToPageTest { +public class AddCSSClassToPageTest extends AbstractKernelTest { private PageStorage pageStorage; diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java index e8022e677..05f17fe2d 100644 --- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java +++ b/data-upgrade-pages/src/test/java/org/exoplatform/migration/PopularSpacesRemovePreferencesTest.java @@ -24,9 +24,12 @@ import java.util.ArrayList; import static org.junit.Assert.*; + @ConfiguredBy({ - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration-local.xml"), - @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/portal/config/conf/configuration.xml") + @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration-local.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/portal/config/conf/configuration.xml"), }) public class PopularSpacesRemovePreferencesTest extends AbstractKernelTest { diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/ReloadPortalConfigurationMigrationTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/ReloadPortalConfigurationMigrationTest.java index dd6f675ff..0b68a2d4e 100644 --- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/ReloadPortalConfigurationMigrationTest.java +++ b/data-upgrade-pages/src/test/java/org/exoplatform/migration/ReloadPortalConfigurationMigrationTest.java @@ -1,21 +1,31 @@ package org.exoplatform.migration; -import org.exoplatform.container.xml.InitParams; -import org.exoplatform.container.xml.ValueParam; -import org.exoplatform.portal.config.UserPortalConfigService; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.times; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.times; +import org.exoplatform.component.test.AbstractKernelTest; +import org.exoplatform.component.test.ConfigurationUnit; +import org.exoplatform.component.test.ConfiguredBy; +import org.exoplatform.component.test.ContainerScope; +import org.exoplatform.container.xml.InitParams; +import org.exoplatform.container.xml.ValueParam; +import org.exoplatform.portal.config.UserPortalConfigService; +@ConfiguredBy({ + @ConfigurationUnit(scope = ContainerScope.ROOT, path = "conf/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/portal/configuration.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/exo.portal.component.portal-configuration-local.xml"), + @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "org/exoplatform/portal/config/conf/configuration.xml"), +}) @RunWith(MockitoJUnitRunner.class) -public class ReloadPortalConfigurationMigrationTest { +public class ReloadPortalConfigurationMigrationTest extends AbstractKernelTest { @Mock UserPortalConfigService userPortalConfigService; diff --git a/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java b/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java index 270fd0a56..95fcab5bc 100644 --- a/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java +++ b/data-upgrade-pages/src/test/java/org/exoplatform/migration/SpaceApplicationMigrationTest.java @@ -67,13 +67,6 @@ public void setUp() { this.identityRegistry = container.getComponentInstanceOfType(IdentityRegistry.class); this.entityManagerService = container.getComponentInstanceOfType(EntityManagerService.class); this.settingService = container.getComponentInstanceOfType(SettingService.class); - HashSet memberships = new HashSet(); - memberships.add(new MembershipEntry("/platform/users", "*")); - memberships.add(new MembershipEntry("/platform/administrators", "*")); - Identity root = new Identity("root", memberships); - identityRegistry.register(root); - ConversationState conversationState = new ConversationState(root); - ConversationState.setCurrent(conversationState); RequestLifeCycle.begin(container); InitParams initParams = new InitParams(); @@ -104,6 +97,8 @@ public void tearDown() throws Exception { @Test public void processUpgrade() throws Exception { + startAdminSession(); + Space space = new Space(); space.setDisplayName("testspace"); space.setPrettyName(space.getDisplayName()); @@ -136,4 +131,15 @@ public void afterUpgrade() { "SpaceApplicationMigrationEnded"); assertEquals(true , settingValue.getValue()); } + + private void startAdminSession() { + HashSet memberships = new HashSet(); + memberships.add(new MembershipEntry("/platform/users", "*")); + memberships.add(new MembershipEntry("/platform/administrators", "*")); + Identity root = new Identity("root", memberships); + identityRegistry.register(root); + ConversationState conversationState = new ConversationState(root); + ConversationState.setCurrent(conversationState); + } + } diff --git a/data-upgrade-pages/src/test/resources/conf/application-registry-configuration.xml b/data-upgrade-pages/src/test/resources/conf/data-upgrade-application-registry-configuration.xml similarity index 100% rename from data-upgrade-pages/src/test/resources/conf/application-registry-configuration.xml rename to data-upgrade-pages/src/test/resources/conf/data-upgrade-application-registry-configuration.xml diff --git a/data-upgrade-pages/src/test/resources/conf/spaces-templates-configuration.xml b/data-upgrade-pages/src/test/resources/conf/data-upgrade-spaces-templates-configuration.xml similarity index 100% rename from data-upgrade-pages/src/test/resources/conf/spaces-templates-configuration.xml rename to data-upgrade-pages/src/test/resources/conf/data-upgrade-spaces-templates-configuration.xml diff --git a/data-upgrade-pages/src/test/resources/conf/portal/configuration.xml b/data-upgrade-pages/src/test/resources/conf/portal/configuration.xml index b52c48051..6bb56eb11 100644 --- a/data-upgrade-pages/src/test/resources/conf/portal/configuration.xml +++ b/data-upgrade-pages/src/test/resources/conf/portal/configuration.xml @@ -3,6 +3,6 @@ xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd"> - jar:/conf/spaces-templates-configuration.xml - jar:/conf/application-registry-configuration.xml + jar:/conf/data-upgrade-spaces-templates-configuration.xml + jar:/conf/data-upgrade-application-registry-configuration.xml diff --git a/data-upgrade-users/src/main/java/org/exoplatform/migration/UsersLastLoginTimeMigration.java b/data-upgrade-users/src/main/java/org/exoplatform/migration/UsersLastLoginTimeMigration.java index 6654f169f..ae8b71e1d 100644 --- a/data-upgrade-users/src/main/java/org/exoplatform/migration/UsersLastLoginTimeMigration.java +++ b/data-upgrade-users/src/main/java/org/exoplatform/migration/UsersLastLoginTimeMigration.java @@ -27,8 +27,8 @@ import org.exoplatform.services.log.Log; import org.exoplatform.social.core.jpa.search.ProfileIndexingServiceConnector; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/data-upgrade-wiki/src/main/java/org/exoplatform/wiki/upgrade/WikiPageNameUpgradePlugin.java b/data-upgrade-wiki/src/main/java/org/exoplatform/wiki/upgrade/WikiPageNameUpgradePlugin.java index fc25761b4..9c353da59 100644 --- a/data-upgrade-wiki/src/main/java/org/exoplatform/wiki/upgrade/WikiPageNameUpgradePlugin.java +++ b/data-upgrade-wiki/src/main/java/org/exoplatform/wiki/upgrade/WikiPageNameUpgradePlugin.java @@ -1,7 +1,7 @@ package org.exoplatform.wiki.upgrade; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.persistence.impl.EntityManagerService;