diff --git a/model-report/pom.xml b/model-report/pom.xml index a8220b737..6b7c91878 100644 --- a/model-report/pom.xml +++ b/model-report/pom.xml @@ -11,6 +11,9 @@ model-report + Versions reports model + Modello model for reports + org.codehaus.plexus @@ -60,14 +63,7 @@ src/main/mdo/dependency-updates-report.mdo src/main/mdo/plugin-updates-report.mdo - ${modelloNamespaceVersion} - - - - - maven-javadoc-plugin - - true + ${modelloNamespaceReportVersion} @@ -79,28 +75,8 @@ - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - check-java18 - test - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - - \ No newline at end of file + 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 98406b4e1..dcb473b22 100644 --- a/model/pom.xml +++ b/model-ruleset/pom.xml @@ -9,7 +9,10 @@ 4.0.0 - model + model-ruleset + + Versions ruleSet model + Modello model for ruleSet @@ -31,8 +34,6 @@ xpp3-reader - - xpp3-writer java @@ -59,14 +60,7 @@ src/main/mdo/rule.mdo - ${modelloNamespaceVersion} - - - - - maven-javadoc-plugin - - true + ${modelloNamespaceRuleVersion} @@ -77,29 +71,7 @@ true - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - check-java18 - test - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - - - \ No newline at end of file + 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 d86917ae4..c4c9c2709 100644 --- a/model/src/main/mdo/rule.mdo +++ b/model-ruleset/src/main/mdo/rule.mdo @@ -22,7 +22,7 @@ under the License. + xml.schemaLocation="https://www.mojohaus.org/versions/model-ruleset/xsd/rule-${version}.xsd"> rule Rule 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 000000000..3df2653a5 --- /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 + + + +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 000000000..1c0969b14 --- /dev/null +++ b/model-ruleset/src/site/site.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 2fe60a985..3b9a9f2c8 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,10 @@ 2.14.0-SNAPSHOT pom - Versions Maven Plugin - https://www.mojohaus.org/versions-maven-plugin/ + Versions + Managing Maven versions in projects. + https://www.mojohaus.org/versions/ - - Versions Plugin for Maven. The Versions Plugin updates the versions of components in the POM. - 2008 @@ -97,23 +95,29 @@ - - ${mavenVersion} - - - - scm:git:https://github.com/mojohaus/versions-maven-plugin.git - scm:git:ssh://git@github.com/mojohaus/versions-maven-plugin.git - https://github.com/mojohaus/versions-maven-plugin/tree/master - 2.13.0 - - versions-maven-plugin - model + model-ruleset model-report + + scm:git:https://github.com/mojohaus/versions.git + scm:git:ssh://git@github.com/mojohaus/versions.git + https://github.com/mojohaus/versions/tree/master + HEAD + + + + GitHub + https://github.com/mojohaus/versions/issues + + + + GitHub + https://github.com/mojohaus/versions/actions + + 1.8 ${mojo.java.target} @@ -124,7 +128,9 @@ 1.11.1 ${project.version} 3.7 - 2.0.0 + 2.1.0 + 2.0.0 + ${project.build.directory}/staging 2022-10-23T15:41:47Z @@ -219,4 +225,72 @@ + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + true + + + + + + org.apache.maven.plugins + maven-jxr-plugin + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + + + true + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + + + + true + + + + + + org.codehaus.mojo + taglist-maven-plugin + ${taglist-maven-plugin.version} + + + + + + + + + diff --git a/src/site/site.xml b/src/site/site.xml index d9443a64d..f2f2bbeec 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"> - - org.apache.maven.skins - maven-fluido-skin - 1.8 - - - - - - mojohaus/versions-maven-plugin - right - gray - - - - - - - - - - -
- Apache ${project.name}, ${project.name}, Apache, the Apache feather logo, and the Apache ${project.name} project logos are trademarks of The Apache Software Foundation.

- ]]> -
+ + + + + diff --git a/versions-maven-plugin/pom.xml b/versions-maven-plugin/pom.xml index 28483c340..7469b884e 100644 --- a/versions-maven-plugin/pom.xml +++ b/versions-maven-plugin/pom.xml @@ -11,10 +11,13 @@ versions-maven-plugin maven-plugin + Versions Maven Plugin + The Versions Maven Plugin is used when you want to manage the versions of artifacts in a project's POM. + org.codehaus.mojo.versions - model + model-ruleset ${project.version} @@ -204,13 +207,8 @@ - maven-javadoc-plugin - - ${mojo.java.target} - - - - maven-invoker-plugin + org.apache.maven.plugins + maven-plugin-plugin 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 89c617702..f564ef959 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 + xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/model-ruleset/xsd/rule-2.1.0.xsd"> 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 8b3c483ca..000000000 --- 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 - - - -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 8dbee5123..bdd343679 100644 --- a/versions-maven-plugin/src/site/site.xml +++ b/versions-maven-plugin/src/site/site.xml @@ -1,10 +1,6 @@ - - - - @@ -32,9 +28,11 @@ - - + + + +