XWIKI-22627: Pinned Pages are lost on space move

* Workaround for cyclic dependency (cherry picked from commit 47d43ab)
xwiki · Nov 21, 2024 · 43b943b · 43b943b
1 parent 54c6f8d
commit 43b943b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/...PinnedPagesAdministrationSectionPage.java → ...PinnedPagesAdministrationSectionPage.java b/...PinnedPagesAdministrationSectionPage.java → ...PinnedPagesAdministrationSectionPage.java
@@ -17,11 +17,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.xwiki.index.tree.test.po;
+package org.xwiki.administration.test.po;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.xwiki.administration.test.po.AdministrationSectionPage;
 import org.xwiki.model.reference.SpaceReference;
 import org.xwiki.test.ui.po.SuggestInputElement;
 

diff --git a/...e/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml b/...e/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
@@ -83,6 +83,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- Required for the Pinned Pages administration section. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-administration-test-pageobjects</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <testSourceDirectory>src/test/it</testSourceDirectory>

diff --git a/...-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/PinnedPagesIT.java b/...-platform-index-test-docker/src/test/it/org/xwiki/index/test/ui/docker/PinnedPagesIT.java
@@ -27,9 +27,9 @@
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Keys;
+import org.xwiki.administration.test.po.PinnedPagesAdministrationSectionPage;
 import org.xwiki.index.tree.test.po.BreadcrumbTree;
 import org.xwiki.index.tree.test.po.DocumentTreeElement;
-import org.xwiki.index.tree.test.po.PinnedPagesAdministrationSectionPage;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.EntityReference;
 import org.xwiki.model.reference.SpaceReference;

diff --git a/...ex-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml b/...ex-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
@@ -38,12 +38,6 @@
       <artifactId>xwiki-platform-tree-test-pageobjects</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!-- Required for the Pinned Pages administration section. -->
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-administration-test-pageobjects</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <!-- Used to serialize entity references in order to compute tree node identifiers. -->
       <groupId>org.xwiki.platform</groupId>