From cf0453dd35046b3f2524ef0b44df340805e6b062 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 3 Dec 2022 16:39:06 +0100
Subject: [PATCH] Rename models module to meet project conventions

All module's name start from versions, so rename to be the same
---
 pom.xml                                                     | 6 +++---
 versions-common/pom.xml                                     | 2 +-
 versions-maven-plugin/pom.xml                               | 4 ++--
 versions-maven-plugin/src/site/markdown/version-rules.md.vm | 6 +++---
 versions-maven-plugin/src/site/site.xml                     | 4 ++--
 {model-report => versions-model-report}/pom.xml             | 6 +++---
 .../src/main/mdo/dependency-updates-report.mdo              | 0
 .../src/main/mdo/plugin-updates-report.mdo                  | 0
 .../src/main/mdo/property-updates-report.mdo                | 2 +-
 {model-ruleset => versions-model}/pom.xml                   | 6 +++---
 {model-ruleset => versions-model}/src/main/mdo/rule.mdo     | 2 +-
 .../src/site/markdown/xsd/index.md                          | 0
 {model-ruleset => versions-model}/src/site/site.xml         | 0
 versions-test/pom.xml                                       | 4 ++--
 14 files changed, 21 insertions(+), 21 deletions(-)
 rename {model-report => versions-model-report}/pom.xml (95%)
 rename {model-report => versions-model-report}/src/main/mdo/dependency-updates-report.mdo (100%)
 rename {model-report => versions-model-report}/src/main/mdo/plugin-updates-report.mdo (100%)
 rename {model-report => versions-model-report}/src/main/mdo/property-updates-report.mdo (97%)
 rename {model-ruleset => versions-model}/pom.xml (95%)
 rename {model-ruleset => versions-model}/src/main/mdo/rule.mdo (98%)
 rename {model-ruleset => versions-model}/src/site/markdown/xsd/index.md (100%)
 rename {model-ruleset => versions-model}/src/site/site.xml (100%)

diff --git a/pom.xml b/pom.xml
index 9ea4a7ea1c..a2bf061caa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,13 +96,13 @@
   </contributors>
 
   <modules>
-    <module>model-report</module>
-    <module>model-ruleset</module>
     <module>versions-api</module>
     <module>versions-common</module>
     <module>versions-enforcer</module>
-    <module>versions-test</module>
     <module>versions-maven-plugin</module>
+    <module>versions-model-report</module>
+    <module>versions-model</module>
+    <module>versions-test</module>
   </modules>
 
   <scm>
diff --git a/versions-common/pom.xml b/versions-common/pom.xml
index 5b791a896b..f200c4decf 100644
--- a/versions-common/pom.xml
+++ b/versions-common/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.codehaus.mojo.versions</groupId>
-            <artifactId>model-ruleset</artifactId>
+            <artifactId>versions-model</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml
index e586a8ba11..aab141b4c6 100644
--- a/versions-maven-plugin/pom.xml
+++ b/versions-maven-plugin/pom.xml
@@ -17,13 +17,13 @@
   <dependencies>
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>model-ruleset</artifactId>
+      <artifactId>versions-model</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.codehaus.mojo.versions</groupId>
-      <artifactId>model-report</artifactId>
+      <artifactId>versions-model-report</artifactId>
       <version>${project.version}</version>
     </dependency>
 
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 f564ef959f..6411fd94f0 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-ruleset/rule.html), use the `ruleSet`
+To specify the version schemes to use, you may define a [rule-set xml file](../versions-model/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/model-ruleset/xsd/rule-2.1.0.xsd">
+         xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/versiosn-model/xsd/rule-2.1.0.xsd">
   <rules>
     <rule groupId="*.maven" comparisonMethod="mercury"/>
     <rule groupId="com.mycompany" comparisonMethod="numeric"/>
@@ -79,7 +79,7 @@ The `rules.xml` file should conform to the xsd specified in the example below.
 </ruleset>
 ```
 
-The rule-set files must match the [XSD schema](./xsd/index.html).
+The rule-set files must match the [XSD schema](../versions-model/xsd/index.html).
 
 You can then use the `rulesUri` parameter to specify the rule-set to be used by the
 `versions-maven-plugin`.
diff --git a/versions-maven-plugin/src/site/site.xml b/versions-maven-plugin/src/site/site.xml
index 30922de522..ddbdef6e04 100644
--- a/versions-maven-plugin/src/site/site.xml
+++ b/versions-maven-plugin/src/site/site.xml
@@ -29,8 +29,8 @@
     </menu>
 
     <menu name="Reference">
-      <item name="Version number comparison rule-sets" href="../model-ruleset/rule.html"/>
-      <item name="XML schemas" href="../model-ruleset/xsd/index.html"/>
+      <item name="Version number comparison rule-sets" href="../versions-model/rule.html"/>
+      <item name="XML schemas" href="../versions-model/xsd/index.html"/>
     </menu>
 
     <menu ref="parent"/>
diff --git a/model-report/pom.xml b/versions-model-report/pom.xml
similarity index 95%
rename from model-report/pom.xml
rename to versions-model-report/pom.xml
index ef30e642ac..6ba1fbb1bf 100644
--- a/model-report/pom.xml
+++ b/versions-model-report/pom.xml
@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>model-report</artifactId>
+    <artifactId>versions-model-report</artifactId>
 
-    <name>Versions reports model</name>
-    <description>Modello model for reports</description>
+    <name>Versions Model Report</name>
+    <description>Modello models used in reports</description>
 
     <dependencies>
         <dependency>
diff --git a/model-report/src/main/mdo/dependency-updates-report.mdo b/versions-model-report/src/main/mdo/dependency-updates-report.mdo
similarity index 100%
rename from model-report/src/main/mdo/dependency-updates-report.mdo
rename to versions-model-report/src/main/mdo/dependency-updates-report.mdo
diff --git a/model-report/src/main/mdo/plugin-updates-report.mdo b/versions-model-report/src/main/mdo/plugin-updates-report.mdo
similarity index 100%
rename from model-report/src/main/mdo/plugin-updates-report.mdo
rename to versions-model-report/src/main/mdo/plugin-updates-report.mdo
diff --git a/model-report/src/main/mdo/property-updates-report.mdo b/versions-model-report/src/main/mdo/property-updates-report.mdo
similarity index 97%
rename from model-report/src/main/mdo/property-updates-report.mdo
rename to versions-model-report/src/main/mdo/property-updates-report.mdo
index 0f9a2df326..4a67cebc27 100644
--- a/model-report/src/main/mdo/property-updates-report.mdo
+++ b/versions-model-report/src/main/mdo/property-updates-report.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/PROPERTY-UPDATES-REPORT/${version}"
-       xml.schemaLocation="https://www.mojohaus.org/versions/model-report/xsd/property-updates-report-${version}.xsd">
+       xml.schemaLocation="https://www.mojohaus.org/versions/versions-model-report/xsd/property-updates-report-${version}.xsd">
     <id>property-updates-report</id>
     <name>PropertyUpdatesReport</name>
     <description>
diff --git a/model-ruleset/pom.xml b/versions-model/pom.xml
similarity index 95%
rename from model-ruleset/pom.xml
rename to versions-model/pom.xml
index c4ef287788..b813ea9eb8 100644
--- a/model-ruleset/pom.xml
+++ b/versions-model/pom.xml
@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>model-ruleset</artifactId>
+    <artifactId>versions-model</artifactId>
 
-    <name>Versions ruleSet model</name>
-    <description>Modello model for ruleSet</description>
+    <name>Versions Model</name>
+    <description>Modello models used in plugin</description>
 
     <dependencies>
         <dependency>
diff --git a/model-ruleset/src/main/mdo/rule.mdo b/versions-model/src/main/mdo/rule.mdo
similarity index 98%
rename from model-ruleset/src/main/mdo/rule.mdo
rename to versions-model/src/main/mdo/rule.mdo
index c4c9c27095..0134a4b086 100644
--- a/model-ruleset/src/main/mdo/rule.mdo
+++ b/versions-model/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/model-ruleset/xsd/rule-${version}.xsd">
+       xml.schemaLocation="https://www.mojohaus.org/versions/versions-model/xsd/rule-${version}.xsd">
   <id>rule</id>
   <name>Rule</name>
   <description>
diff --git a/model-ruleset/src/site/markdown/xsd/index.md b/versions-model/src/site/markdown/xsd/index.md
similarity index 100%
rename from model-ruleset/src/site/markdown/xsd/index.md
rename to versions-model/src/site/markdown/xsd/index.md
diff --git a/model-ruleset/src/site/site.xml b/versions-model/src/site/site.xml
similarity index 100%
rename from model-ruleset/src/site/site.xml
rename to versions-model/src/site/site.xml
diff --git a/versions-test/pom.xml b/versions-test/pom.xml
index 1ddf047d9e..316baef3c2 100644
--- a/versions-test/pom.xml
+++ b/versions-test/pom.xml
@@ -21,17 +21,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>versions</artifactId>
         <groupId>org.codehaus.mojo.versions</groupId>
         <version>2.14.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>versions-test</artifactId>
 
     <name>Versions Test</name>
-    <description>Test utilities</description>
+    <description>Internal test utilities used in project</description>
 
     <dependencies>
         <dependency>