Skip to content

Commit

Permalink
Work on site output
Browse files Browse the repository at this point in the history
  • Loading branch information
@slawekjaranowski
slawekjaranowski committed Nov 2, 2022
1 parent 80bf105 commit c9c1396
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 145 deletions.
34 changes: 5 additions & 29 deletions model-report/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -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>
</project>
40 changes: 6 additions & 34 deletions model/pom.xml → model-ruleset/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>

Expand All @@ -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>
</project>
2 changes: 1 addition & 1 deletion model/src/main/mdo/rule.mdo → model-ruleset/src/main/mdo/rule.mdo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 12 additions & 0 deletions model-ruleset/src/site/markdown/xsd/index.md
View file
Original file line number Diff line number Diff line change
@@ -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)

13 changes: 13 additions & 0 deletions model-ruleset/src/site/site.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
110 changes: 92 additions & 18 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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://[email protected]/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://[email protected]/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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
32 changes: 5 additions & 27 deletions src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
14 changes: 6 additions & 8 deletions versions-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions versions-maven-plugin/src/site/markdown/version-rules.md.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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"/>
Expand Down
Loading

0 comments on commit c9c1396

Please sign in to comment.