From c9c1396f8cbbe8f369d73ceae2f18b30a51f66bd Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sun, 30 Oct 2022 16:56:10 +0100
Subject: [PATCH] Work on site output

---
 model-report/pom.xml                          |  34 +-----
 {model => model-ruleset}/pom.xml              |  40 +------
 .../src/main/mdo/rule.mdo                     |   2 +-
 model-ruleset/src/site/markdown/xsd/index.md  |  12 ++
 model-ruleset/src/site/site.xml               |  13 +++
 pom.xml                                       | 110 +++++++++++++++---
 src/site/site.xml                             |  32 +----
 versions-maven-plugin/pom.xml                 |  14 +--
 .../src/site/markdown/version-rules.md.vm     |   4 +-
 .../src/site/markdown/xsd/index.md.vm         |  20 ----
 versions-maven-plugin/src/site/site.xml       |  10 +-
 11 files changed, 146 insertions(+), 145 deletions(-)
 rename {model => model-ruleset}/pom.xml (67%)
 rename {model => model-ruleset}/src/main/mdo/rule.mdo (98%)
 create mode 100644 model-ruleset/src/site/markdown/xsd/index.md
 create mode 100644 model-ruleset/src/site/site.xml
 delete mode 100644 versions-maven-plugin/src/site/markdown/xsd/index.md.vm

diff --git a/model-report/pom.xml b/model-report/pom.xml
index a8220b7376..6b7c918785 100644
--- a/model-report/pom.xml
+++ b/model-report/pom.xml
@@ -11,6 +11,9 @@
 
     <artifactId>model-report</artifactId>
 
+    <name>Versions reports model</name>
+    <description>Modello model for reports</description>
+
     <dependencies>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -60,14 +63,7 @@
                         <model>src/main/mdo/dependency-updates-report.mdo</model>
                         <model>src/main/mdo/plugin-updates-report.mdo</model>
                     </models>
-                    <version>${modelloNamespaceVersion}</version>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
+                    <version>${modelloNamespaceReportVersion}</version>
                 </configuration>
             </plugin>
 
@@ -79,28 +75,8 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-java18</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>java18</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
 
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/model/pom.xml b/model-ruleset/pom.xml
similarity index 67%
rename from model/pom.xml
rename to model-ruleset/pom.xml
index 98406b4e19..dcb473b22c 100644
--- a/model/pom.xml
+++ b/model-ruleset/pom.xml
@@ -9,7 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>model</artifactId>
+    <artifactId>model-ruleset</artifactId>
+
+    <name>Versions ruleSet model</name>
+    <description>Modello model for ruleSet</description>
 
     <dependencies>
         <dependency>
@@ -31,8 +34,6 @@
                         <goals>
                             <!-- Generate the xpp3 reader code -->
                             <goal>xpp3-reader</goal>
-                            <!-- Generate the xpp3 writer code -->
-                            <goal>xpp3-writer</goal>
                             <!-- Generate the Java sources for the model itself -->
                             <goal>java</goal>
                         </goals>
@@ -59,14 +60,7 @@
                     <models>
                         <model>src/main/mdo/rule.mdo</model>
                     </models>
-                    <version>${modelloNamespaceVersion}</version>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
+                    <version>${modelloNamespaceRuleVersion}</version>
                 </configuration>
             </plugin>
 
@@ -77,29 +71,7 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-java18</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>java18</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
-
     </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/model/src/main/mdo/rule.mdo b/model-ruleset/src/main/mdo/rule.mdo
similarity index 98%
rename from model/src/main/mdo/rule.mdo
rename to model-ruleset/src/main/mdo/rule.mdo
index d86917ae49..c4c9c27095 100644
--- a/model/src/main/mdo/rule.mdo
+++ b/model-ruleset/src/main/mdo/rule.mdo
@@ -22,7 +22,7 @@ under the License.
 <model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0 https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd"
        xml.namespace="https://www.mojohaus.org/VERSIONS/RULE/${version}"
-       xml.schemaLocation="https://www.mojohaus.org/versions-maven-plugin/xsd/rule-${version}.xsd">
+       xml.schemaLocation="https://www.mojohaus.org/versions/model-ruleset/xsd/rule-${version}.xsd">
   <id>rule</id>
   <name>Rule</name>
   <description>
diff --git a/model-ruleset/src/site/markdown/xsd/index.md b/model-ruleset/src/site/markdown/xsd/index.md
new file mode 100644
index 0000000000..3df2653a53
--- /dev/null
+++ b/model-ruleset/src/site/markdown/xsd/index.md
@@ -0,0 +1,12 @@
+title: XML schemas for ruleSet
+author: Slawomir Jaranowski
+date: 2022-10-17
+
+<!-- GitHub pages doesn't generate index page ... we need prepare one -->
+
+Versions - XML schemas for ruleSet
+======================
+
+- [rule-2.1.0.xsd](rule-2.1.0.xsd)
+- [rule-2.0.0.xsd](https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd)
+
diff --git a/model-ruleset/src/site/site.xml b/model-ruleset/src/site/site.xml
new file mode 100644
index 0000000000..1c0969b142
--- /dev/null
+++ b/model-ruleset/src/site/site.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
+  <body>
+
+    <menu name="Overview">
+      <item name="Version number comparison rule-sets" href="rule.html"/>
+      <item name="XML schemas" href="xsd/index.html"/>
+    </menu>
+
+    <menu ref="parent"/>
+
+  </body>
+</project>
diff --git a/pom.xml b/pom.xml
index 2fe60a985f..3b9a9f2c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,10 @@
   <version>2.14.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-  <name>Versions Maven Plugin</name>
-  <url>https://www.mojohaus.org/versions-maven-plugin/</url>
+  <name>Versions</name>
+  <description>Managing Maven versions in projects.</description>
+  <url>https://www.mojohaus.org/versions/</url>
 
-  <description>
-    Versions Plugin for Maven. The Versions Plugin updates the versions of components in the POM.
-  </description>
   <inceptionYear>2008</inceptionYear>
 
   <licenses>
@@ -97,23 +95,29 @@
     </contributor>
   </contributors>
 
-  <prerequisites>
-    <maven>${mavenVersion}</maven>
-  </prerequisites>
-
-  <scm>
-    <connection>scm:git:https://github.com/mojohaus/versions-maven-plugin.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/mojohaus/versions-maven-plugin.git</developerConnection>
-    <url>https://github.com/mojohaus/versions-maven-plugin/tree/master</url>
-    <tag>2.13.0</tag>
-  </scm>
-
   <modules>
     <module>versions-maven-plugin</module>
-    <module>model</module>
+    <module>model-ruleset</module>
     <module>model-report</module>
   </modules>
 
+  <scm>
+    <connection>scm:git:https://github.com/mojohaus/versions.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/mojohaus/versions.git</developerConnection>
+    <url>https://github.com/mojohaus/versions/tree/master</url>
+    <tag>HEAD</tag>
+  </scm>
+
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/mojohaus/versions/issues</url>
+  </issueManagement>
+
+  <ciManagement>
+    <system>GitHub</system>
+    <url>https://github.com/mojohaus/versions/actions</url>
+  </ciManagement>
+
   <properties>
     <mojo.java.target>1.8</mojo.java.target>
     <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
@@ -124,7 +128,9 @@
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <pluginVersion>${project.version}</pluginVersion>
     <sitePluginVersion>3.7</sitePluginVersion>
-    <modelloNamespaceVersion>2.0.0</modelloNamespaceVersion>
+    <modelloNamespaceRuleVersion>2.1.0</modelloNamespaceRuleVersion>
+    <modelloNamespaceReportVersion>2.0.0</modelloNamespaceReportVersion>
+    <scmpublish.content>${project.build.directory}/staging</scmpublish.content><!-- mono-module doesn't require site:stage for scm-publish -->
     <project.build.outputTimestamp>2022-10-23T15:41:47Z</project.build.outputTimestamp>
   </properties>
 
@@ -219,4 +225,72 @@
     </plugins>
   </build>
 
+  <reporting>
+    <!-- disable some reports from parent pom, by setting empty reports or override configuration ... -->
+    <!-- by the way I will try to remove such reports from parent -->
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <configuration>
+              <skipSurefireReport>true</skipSurefireReport>
+            </configuration>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>${taglist-maven-plugin.version}</version>
+        <reportSets>
+          <reportSet>
+            <reports/>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
 </project>
diff --git a/src/site/site.xml b/src/site/site.xml
index d9443a64dc..f2f2bbeecb 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -4,34 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
          http://maven.apache.org/xsd/decoration-1.8.0.xsd">
 
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-fluido-skin</artifactId>
-        <version>1.8</version>
-    </skin>
-
-    <custom>
-        <fluidoSkin>
-            <gitHub>
-                <projectId>mojohaus/versions-maven-plugin</projectId>
-                <ribbonOrientation>right</ribbonOrientation>
-                <ribbonColor>gray</ribbonColor>
-            </gitHub>
-        </fluidoSkin>
-    </custom>
-
     <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
-            <item name="License" href="http://www.apache.org/licenses/"/>
-        </menu>
-
-        <footer>
-            <![CDATA[
-		  <p>Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.</p>
-        ]]>
-        </footer>
+        <breadcrumbs>
+            <item name="MojoHaus" href="https://www.mojohaus.org/"/>
+            <item name="${this.name}" href="${this.url}" />
+        </breadcrumbs>
 
+        <menu ref="modules"/>
     </body>
 </project>
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
index 28483c340d..7469b884e4 100644
--- a/versions-maven-plugin/pom.xml
+++ b/versions-maven-plugin/pom.xml
@@ -11,10 +11,13 @@
   <artifactId>versions-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
 
+  <name>Versions Maven Plugin</name>
+  <description>The Versions Maven Plugin is used when you want to manage the versions of artifacts in a project's POM.</description>
+
   <dependencies>
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>model</artifactId>
+      <artifactId>model-ruleset</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -204,13 +207,8 @@
   <reporting>
     <plugins>
       <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>${mojo.java.target}</source>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-invoker-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
         <reportSets>
           <reportSet>
             <reports>
diff --git a/versions-maven-plugin/src/site/markdown/version-rules.md.vm b/versions-maven-plugin/src/site/markdown/version-rules.md.vm
index 89c617702e..f564ef959f 100644
--- a/versions-maven-plugin/src/site/markdown/version-rules.md.vm
+++ b/versions-maven-plugin/src/site/markdown/version-rules.md.vm
@@ -58,7 +58,7 @@ it otherwise.
 Rules.xml
 ---------
 
-To specify the version schemes to use, you may define a [rule-set xml file](./model/rule.html), use the `ruleSet`
+To specify the version schemes to use, you may define a [rule-set xml file](../model-ruleset/rule.html), use the `ruleSet`
 element in the `versions-maven-plugin` plugin configuration, or specify ignored versions via
 the `maven.version.ignore` property.
 
@@ -69,7 +69,7 @@ The `rules.xml` file should conform to the xsd specified in the example below.
 ```xml
 <ruleset comparisonMethod="maven"
          xmlns="https://www.mojohaus.org/VERSIONS/RULE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.1.0.xsd">
+         xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/model-ruleset/xsd/rule-2.1.0.xsd">
   <rules>
     <rule groupId="*.maven" comparisonMethod="mercury"/>
     <rule groupId="com.mycompany" comparisonMethod="numeric"/>
diff --git a/versions-maven-plugin/src/site/markdown/xsd/index.md.vm b/versions-maven-plugin/src/site/markdown/xsd/index.md.vm
deleted file mode 100644
index 8b3c483ca2..0000000000
--- a/versions-maven-plugin/src/site/markdown/xsd/index.md.vm
+++ /dev/null
@@ -1,20 +0,0 @@
-title: XML schemas
-author: Slawomir Jaranowski
-date: 2022-10-17
-
-<!-- GitHub pages doesn't generate index page ... we need prepare one -->
-
-Versions - XML schemas
-======================
-
-dependency-updates-report.xsd
------------------------------
- - [dependency-updates-report-${modelloNamespaceVersion}.xsd](../../model-report/xsd/dependency-updates-report-${modelloNamespaceVersion}.xsd)
-
-plugin-updates-report.xsd
--------------------------
- - [plugin-updates-report-${modelloNamespaceVersion}.xsd](../../model-report/xsd/plugin-updates-report-${modelloNamespaceVersion}.xsd)
-
-rule.xsd
---------
- - [rule-${modelloNamespaceVersion}.xsd](../../model/xsd/rule-${modelloNamespaceVersion}.xsd)
diff --git a/versions-maven-plugin/src/site/site.xml b/versions-maven-plugin/src/site/site.xml
index 8dbee51232..bdd343679d 100644
--- a/versions-maven-plugin/src/site/site.xml
+++ b/versions-maven-plugin/src/site/site.xml
@@ -1,10 +1,6 @@
 <project xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
   <body>
-    <breadcrumbs>
-      <item name="MojoHaus" href="https://www.mojohaus.org/"/>
-      <item name="${this.name}" href="${this.url}" />
-    </breadcrumbs>
 
     <menu name="Overview">
       <item name="Introduction" href="./index.html"/>
@@ -32,9 +28,11 @@
     </menu>
 
     <menu name="Reference">
-      <item name="Version number comparison rule-sets" href="model/rule.html"/>
-      <item name="XML schemas" href="xsd/index.html"/>
+      <item name="Version number comparison rule-sets" href="../model-ruleset/rule.html"/>
+      <item name="XML schemas" href="../model-ruleset/xsd/index.html"/>
     </menu>
 
+    <menu ref="parent"/>
+
   </body>
 </project>