XWIKI-17003: Getting "ResourceNotFoundException: Unable to find resource...

XWIKI-17003: Getting "ResourceNotFoundException: Unable to find resource '/templates/macros.vm'" when building xwiki-platform-distribution-flavor-data-hsqldb

xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml

@@ -79,11 +79,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-velocity-webapp</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.xwiki.commons</groupId>
       <artifactId>xwiki-commons-environment-standard</artifactId>
@@ -342,6 +337,15 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+
+    <!-- Dependencies not needed by the plugin itself but included in the WAR it generates,
+         listed to be sure it's built before the plugin -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-velocity-webapp</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>