XWIKI-21991: Mail Prepare Thread error occurred in some cases when triggering...

XWIKI-21991: Mail Prepare Thread error occurred in some cases when triggering the mail sending job from Scheduler

  * Fix page test to not include UserDefaultComponentList everywhere
    because it's causing regression in modules where user-default is not
pulled

(cherry picked from commit ba813f69)

xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml

@@ -98,12 +98,6 @@
       <version>${project.version}</version>
       <type>test-jar</type>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-user-default</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-    </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-rendering-transformation-macro</artifactId>

xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/src/main/java/org/xwiki/test/page/PageComponentList.java

@@ -88,7 +88,6 @@
 import org.xwiki.sheet.internal.DefaultSheetManager;
 import org.xwiki.sheet.internal.SheetDocumentDisplayer;
 import org.xwiki.test.annotation.ComponentList;
-import org.xwiki.user.DefaultUserComponentList;
 import org.xwiki.velocity.internal.DefaultVelocityContextFactory;
 import org.xwiki.velocity.internal.InternalVelocityEngine;
 import org.xwiki.velocity.internal.VelocityExecutionContextInitializer;
@@ -308,7 +307,6 @@
 })
 @Inherited
 @XWikiDocumentFilterUtilsComponentList
-@DefaultUserComponentList
 public @interface PageComponentList
 {
 }

xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java

@@ -49,6 +49,7 @@
 import org.xwiki.test.annotation.ComponentList;
 import org.xwiki.test.page.HTML50ComponentList;
 import org.xwiki.test.page.PageTest;
+import org.xwiki.user.DefaultUserComponentList;
 
 import com.xpn.xwiki.doc.XWikiDocument;
 
@@ -70,6 +71,7 @@
     TemplateScriptService.class
 })
 @HTML50ComponentList
+@DefaultUserComponentList
 class NotificationMailDefaultHtmlTest extends PageTest
 {
     private static final DocumentReference TEST_DOCUMENT_REFERENCE = new DocumentReference("xwiki", "Test", "WebHome");