Site fix for rule-2.1.0.xsd and rule-2.0.0.xsd; getOutputPath() for reports

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java

@@ -225,6 +225,16 @@ public String getDescription(Locale locale) {
         return getText(locale, "report.description");
     }
 
+    /**
+     * Deprecated because the method is being deprecated in Maven 4 and because the plugin was using it to get
+     * {@link #getOutputPath()} ()}
+     */
+    @Override
+    @Deprecated
+    public String getOutputName() {
+        return getOutputPath();
+    }
+
     @Override
     public String getName(Locale locale) {
         return getText(locale, "report.title");

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesAggregateReport.java

@@ -81,7 +81,7 @@ protected void populateDependencyManagement(Set<Dependency> dependencyManagement
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "dependency-updates-aggregate-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/DependencyUpdatesReport.java

@@ -79,7 +79,7 @@ protected void populateDependencyManagement(Set<Dependency> dependencyManagement
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "dependency-updates-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/ParentUpdatesReport.java

@@ -89,14 +89,12 @@ public boolean canGenerateReport() {
      * @param locale the locale to generate the report for.
      * @param sink   the report formatting tool
      */
-    @SuppressWarnings("deprecation")
-    @Override
     protected void doGenerateReport(Locale locale, Sink sink) throws MavenReportException {
         try {
             ArtifactVersions artifactVersions = getHelper().lookupArtifactVersions(project.getParentArtifact(), false);
             rendererFactory
                     .createReportRenderer(
-                            getOutputName(),
+                            getOutputPath(),
                             sink,
                             locale,
                             new ParentUpdatesModel(
@@ -128,7 +126,7 @@ protected void doGenerateReport(Locale locale, Sink sink) throws MavenReportExce
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "parent-updates-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PluginUpdatesAggregateReport.java

@@ -81,7 +81,7 @@ protected void populatePlugins(Set<Plugin> pluginsCollector) {
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "plugin-updates-aggregate-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PluginUpdatesReport.java

@@ -77,7 +77,7 @@ protected void populatePlugins(Set<Plugin> pluginsCollector) {
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "plugin-updates-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesAggregateReport.java

@@ -89,7 +89,7 @@ protected boolean haveBuildProperties() {
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "property-updates-aggregate-report";
     }
 }

versions-maven-plugin/src/main/java/org/codehaus/mojo/versions/PropertyUpdatesReport.java

@@ -67,7 +67,7 @@ protected void populateUpdateSet(Map<Property, PropertyVersions> propertyCollect
      * {@inheritDoc}
      */
     @Override
-    public String getOutputName() {
+    public String getOutputPath() {
         return "property-updates-report";
     }
 }

versions-model/src/site/markdown/xsd/index.md

@@ -8,6 +8,6 @@ Versions - XML schemas for ruleSet
 ==================================
 
 - [rule-3.0.0.xsd](rule-3.0.0.xsd)
-- [rule-2.1.0.xsd](https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.1.0.xsd)
-- [rule-2.0.0.xsd](https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd)
+- [rule-2.1.0.xsd](rule-2.1.0.xsd)
+- [rule-2.0.0.xsd](rule-2.0.0.xsd)
 

versions-model/src/site/resources/xsd/rule-2.0.0.xsd

@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<!-- =================== DO NOT EDIT THIS FILE ====================         -->
+<!-- Generated by Modello 2.0.0,                                            -->
+<!-- any modifications will be overwritten.                                 -->
+<!-- ==============================================================         -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" targetNamespace="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0">
+  <xs:element name="ruleset" type="RuleSet">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a set of rules for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="RuleSet">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a set of rules for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element minOccurs="0" name="ignoreVersions">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">Version patterns to ignore for all artifacts.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="ignoreVersion" minOccurs="0" maxOccurs="unbounded" type="IgnoreVersion"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="rules">
+        <xs:annotation>
+          <xs:documentation source="version">1.0.0+</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="rule" minOccurs="0" maxOccurs="unbounded" type="Rule"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+    <xs:attribute name="comparisonMethod" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">The comparison method to use when no rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="IgnoreVersion">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">A version to ignore.</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="type" type="xs:string" default="exact" use="optional">
+          <xs:annotation>
+            <xs:documentation source="version">2.0.0+</xs:documentation>
+            <xs:documentation source="description">The type of ignore mechanism to use. Allowed values are &apos;exact&apos; and &apos;regex&apos;.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="Rule">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a rule for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element minOccurs="0" name="ignoreVersions">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">Version patterns to ignore for this rule.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="ignoreVersion" minOccurs="0" maxOccurs="unbounded" type="IgnoreVersion"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+    <xs:attribute name="groupId" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">
+          The for groupId to which this rule applies. Wildcards with ? and * are valid.
+          A rule applies to all child groupIds unless overridden by a subsequent rule.
+          A rule without wildcards will override a rule with wildcards.
+          A rule with ? wildcards will override a rule with * wildcards.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="artifactId" type="xs:string" use="optional">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">
+          The artifactId to which this rule applies. Wildcards with ? and * are valid.
+          A rule without wildcards will override a rule with wildcards.
+          A rule with ? wildcards will override a rule with * wildcards.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="comparisonMethod" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">The comparison method that this rule specifies.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+</xs:schema>

versions-model/src/site/resources/xsd/rule-2.1.0.xsd

@@ -0,0 +1,116 @@
+<?xml version="1.0"?>
+<!-- =================== DO NOT EDIT THIS FILE ====================         -->
+<!-- Generated by Modello 2.0.0,                                            -->
+<!-- any modifications will be overwritten.                                 -->
+<!-- ==============================================================         -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns="https://www.mojohaus.org/VERSIONS/RULE/2.1.0" targetNamespace="https://www.mojohaus.org/VERSIONS/RULE/2.1.0">
+  <xs:element name="ruleset" type="RuleSet">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a set of rules for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="RuleSet">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a set of rules for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element minOccurs="0" name="ignoreVersions">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">Version patterns to ignore for all artifacts.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="ignoreVersion" minOccurs="0" maxOccurs="unbounded" type="IgnoreVersion"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element minOccurs="0" name="rules">
+        <xs:annotation>
+          <xs:documentation source="version">1.0.0+</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="rule" minOccurs="0" maxOccurs="unbounded" type="Rule"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+    <xs:attribute name="comparisonMethod" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">The comparison method to use when no rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="IgnoreVersion">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">A version to ignore.</xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="type" type="xs:string" default="exact" use="optional">
+          <xs:annotation>
+            <xs:documentation source="version">2.0.0+</xs:documentation>
+            <xs:documentation source="description">The type of ignore mechanism to use. Allowed values are &apos;exact&apos; and &apos;regex&apos;.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="Rule">
+    <xs:annotation>
+      <xs:documentation source="version">1.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes a rule for how versions of artifacts should be handled.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element minOccurs="0" name="ignoreVersions">
+        <xs:annotation>
+          <xs:documentation source="version">2.0.0+</xs:documentation>
+          <xs:documentation source="description">Version patterns to ignore for this rule.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="ignoreVersion" minOccurs="0" maxOccurs="unbounded" type="IgnoreVersion"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+    <xs:attribute name="groupId" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">
+            The for groupId to which this rule applies. Wildcards with ? and * are valid.
+            A rule applies to all child groupIds unless overridden by a subsequent rule.
+            A rule without wildcards will override a rule with wildcards.
+            A rule with ? wildcards will override a rule with * wildcards.
+          </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="artifactId" type="xs:string" use="optional">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">
+            The artifactId to which this rule applies. Wildcards with ? and * are valid.
+            A rule without wildcards will override a rule with wildcards.
+            A rule with ? wildcards will override a rule with * wildcards.
+          </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="comparisonMethod" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation source="version">1.0.0+</xs:documentation>
+        <xs:documentation source="description">The comparison method that this rule specifies.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+</xs:schema>