Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#758: Implementing the first stage of module split #782

Merged
merged 8 commits into from
Nov 2, 2022
Merged

#758: Implementing the first stage of module split #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2bd0114
#758: First stage of the module split
andrzejj0 Oct 29, 2022
552c8fb
Work on site output
slawekjaranowski Oct 30, 2022
0694379
Merge remote-tracking branch 'origin/master' into issue-758-modules-j…
slawekjaranowski Oct 30, 2022
394bd1c
Merge branch 'master' of github.com:mojohaus/versions-maven-plugin in…
andrzejj0 Oct 31, 2022
433bcab
Resolves #359: XML Property Updates Report
andrzejj0 Oct 31, 2022
c587c98
Resolves #359: XML Property Updates Report
andrzejj0 Oct 31, 2022
17d83a0
Resolves #359: XML Property Updates Report
andrzejj0 Oct 31, 2022
b679bf9
Use install during first build
slawekjaranowski Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
name: Verify
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
with:
ff-goal: '-P run-its install'
ff-maven: "3.8.6" # Maven version for fail-fast-build
maven-matrix: '[ "3.2.5", "3.8.6" ]' # Maven versions matrix for verify builds

Expand Down
82 changes: 82 additions & 0 deletions model-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<artifactId>versions</artifactId>
<groupId>org.codehaus.mojo.versions</groupId>
<version>2.14.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>model-report</artifactId>

<name>Versions reports model</name>
<description>Modello model for reports</description>

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-rule</id>
<phase>generate-sources</phase>
<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>
</execution>
<execution>
<id>site-doc</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
</goals>
</execution>
<execution>
<id>site-xsd</id>
<phase>pre-site</phase>
<goals>
<goal>xsd</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<models>
<model>src/main/mdo/dependency-updates-report.mdo</model>
<model>src/main/mdo/plugin-updates-report.mdo</model>
</models>
<version>${modelloNamespaceReportVersion}</version>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

</plugins>

</build>

</project>
0 src/main/mdo/dependency-updates-report.mdo → ...rc/main/mdo/dependency-updates-report.mdo
View file
Open in desktop
File renamed without changes.
0 src/main/mdo/plugin-updates-report.mdo → ...rt/src/main/mdo/plugin-updates-report.mdo
View file
Open in desktop
File renamed without changes.
77 changes: 77 additions & 0 deletions model-ruleset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<artifactId>versions</artifactId>
<groupId>org.codehaus.mojo.versions</groupId>
<version>2.14.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>model-ruleset</artifactId>

<name>Versions ruleSet model</name>
<description>Modello model for ruleSet</description>

<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.4.2</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<executions>
<execution>
<id>generate-rule</id>
<phase>generate-sources</phase>
<goals>
<!-- Generate the xpp3 reader code -->
<goal>xpp3-reader</goal>
<!-- Generate the Java sources for the model itself -->
<goal>java</goal>
</goals>
</execution>
<execution>
<id>site-doc</id>
<phase>pre-site</phase>
<goals>
<goal>xdoc</goal>
</goals>
</execution>
<execution>
<id>site-xsd</id>
<phase>pre-site</phase>
<goals>
<goal>xsd</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-site/resources/xsd</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<models>
<model>src/main/mdo/rule.mdo</model>
</models>
<version>${modelloNamespaceRuleVersion}</version>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion src/main/mdo/rule.mdo → model-ruleset/src/main/mdo/rule.mdo
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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>
Loading