Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2

wcm-io-training · Jan 8, 2025 · 2a118a1 · 2a118a1
1 parent b43fa8e
commit 2a118a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>57</version>
+    <version>60</version>
     <relativePath />
   </parent>
 
@@ -133,13 +133,7 @@
           <dependency>
             <groupId>io.wcm.maven.skins</groupId>
             <artifactId>reflow-velocity-tools</artifactId>
-            <version>1.0.2</version>
-          </dependency>
-          <!-- Reflow skin requires Velocity >= 1.7  -->
-          <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.7</version>
+            <version>1.1.0</version>
           </dependency>
         </dependencies>
         <configuration>

diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml
@@ -19,23 +19,20 @@
   #L%
   -->
 
-<project name="training.wcm.io"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0"
+<site name="training.wcm.io"
+  xmlns="http://maven.apache.org/SITE/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
-  <bannerLeft>
-    <name><![CDATA[<img src="https://wcm.io/images/[email protected]"/> wcm.io Training]]></name>
-    <href>https://training.wcm.io</href>
-  </bannerLeft>
+  <bannerLeft name="&lt;img src='https://wcm.io/images/[email protected]'/&gt; wcm.io Training" href="https://training.wcm.io"/>
 
   <publishDate position="bottom" format="yyyy-MM-dd" />
   <version position="bottom" />
 
   <skin>
     <groupId>io.wcm.maven.skins</groupId>
     <artifactId>reflow-maven-skin</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.2</version>
   </skin>
   <custom>
     <reflowSkin>
@@ -136,4 +133,4 @@
     <menu name="Maven documentation" inherit="top" ref="reports"/>
   </body>
 
-</project>
+</site>
diff --git a/public_site/src/site/site.xml b/public_site/src/site/site.xml
@@ -19,10 +19,10 @@
   #L%
   -->
 
-<project name="training.wcm.io"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0"
+<site name="training.wcm.io"
+  xmlns="http://maven.apache.org/SITE/2.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">
 
   <custom>
     <reflowSkin>
@@ -58,4 +58,4 @@
     </reflowSkin>
   </custom>
 
-</project>
+</site>