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

wcm-io-devops · Jan 8, 2025 · 184b829 · 184b829
1 parent 182b302
commit 184b829
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 38 deletions.
diff --git a/parent_toplevel/changes.xml b/parent_toplevel/changes.xml
@@ -23,12 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
-    <release version="1.4.6" date="not released">
+    <release version="1.5.0" date="not released">
       <action type="update" dev="sseifert">
-        Update to global-parent 60.
+        Switch to latest maven-site-plugin and update to reflow-maven-skin 1.3.2.
       </action>
       <action type="update" dev="sseifert">
-        Update to reflow-maven-skin 1.2.0.
+        Update to global-parent 60.
       </action>
       <action type="update" dev="sseifert">
         Update testing dependencies.

diff --git a/parent_toplevel/pom.xml b/parent_toplevel/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops</groupId>
   <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-  <version>1.4.7-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -222,13 +222,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>
@@ -304,18 +298,6 @@
           </dependencies>
         </plugin>
 
-        <!-- Stick with old versions of site plugins because latest ones use Doxia 2.x, which is not compatible with our io.wcm.maven.skins.reflow-velocity-tools -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.5.0</version>
-        </plugin>
-
       </plugins>
     </pluginManagement>
   </build>

diff --git a/parent_toplevel/src/site/site.xml b/parent_toplevel/src/site/site.xml
@@ -19,23 +19,20 @@
   #L%
   -->
 
-<project name="devops.wcm.io"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0"
+<site name="devops.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/favicon-16@3x.png"/> wcm.io DevOps]]></name>
-    <href>https://devops.wcm.io</href>
-  </bannerLeft>
+  <bannerLeft name="&lt;img src='https://wcm.io/images/favicon-16@3x.png'/&gt; wcm.io DevOps" href="https://devops.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>
@@ -134,4 +131,4 @@
     <menu name="Maven documentation" inherit="top" ref="reports"/>
   </body>
 
-</project>
+</site>
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.4.6</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>parent_toplevel/pom.xml</relativePath>
   </parent>
 

diff --git a/public_site/pom.xml b/public_site/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>1.4.6</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../parent_toplevel/pom.xml</relativePath>
   </parent>
 

diff --git a/public_site/src/site/site.xml b/public_site/src/site/site.xml
@@ -19,10 +19,10 @@
   #L%
   -->
 
-<project name="devops.wcm.io"
-  xmlns="http://maven.apache.org/DECORATION/1.8.0"
+<site name="devops.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>