Skip to content

Commit 71c662f

Browse files
cstamascstamas
authored
[MNG-8473] Site fixes (#2010)
Maven4 site cleanup: make all new modules generating models also document them, expose them all and redirect all links to new documentation. Lifecycle is the only thing missing, as it is generated on the fly, there is no more source to "point at"... --- https://issues.apache.org/jira/browse/MNG-8473
1 parent 7546361 commit 71c662f

File tree

14 files changed

+166
-197
lines changed

14 files changed

+166
-197
lines changed

‎api/maven-api-cli/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@
6565
<id>modello</id>
6666
<goals>
6767
<goal>velocity</goal>
68+
<goal>xdoc</goal>
6869
<goal>xsd</goal>
6970
</goals>
71+
<phase>generate-sources</phase>
7072
</execution>
7173
</executions>
7274
</plugin>

‎api/maven-api-metadata/pom.xml

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,28 @@ under the License.
4242
<plugin>
4343
<groupId>org.codehaus.modello</groupId>
4444
<artifactId>modello-maven-plugin</artifactId>
45+
<configuration>
46+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
47+
<version>1.2.0</version>
48+
<models>
49+
<model>src/main/mdo/metadata.mdo</model>
50+
</models>
51+
<templates>
52+
<template>model.vm</template>
53+
</templates>
54+
<params>
55+
<param>packageModelV4=org.apache.maven.api.metadata</param>
56+
</params>
57+
</configuration>
4558
<executions>
4659
<execution>
47-
<id>plugin</id>
60+
<id>modello</id>
4861
<goals>
4962
<goal>velocity</goal>
50-
</goals>
51-
<phase>generate-sources</phase>
52-
<configuration>
53-
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
54-
<version>1.2.0</version>
55-
<models>
56-
<model>src/main/mdo/metadata.mdo</model>
57-
</models>
58-
<templates>
59-
<template>model.vm</template>
60-
</templates>
61-
<params>
62-
<param>packageModelV4=org.apache.maven.api.metadata</param>
63-
</params>
64-
</configuration>
65-
</execution>
66-
<execution>
67-
<id>plugin-doc</id>
68-
<goals>
6963
<goal>xdoc</goal>
7064
<goal>xsd</goal>
7165
</goals>
72-
<phase>generate-resources</phase>
73-
<configuration>
74-
<version>1.2.0</version>
75-
<models>
76-
<model>src/main/mdo/metadata.mdo</model>
77-
</models>
78-
</configuration>
66+
<phase>generate-sources</phase>
7967
</execution>
8068
</executions>
8169
</plugin>

‎api/maven-api-model/pom.xml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,29 @@ under the License.
4747
<plugin>
4848
<groupId>org.codehaus.modello</groupId>
4949
<artifactId>modello-maven-plugin</artifactId>
50+
<configuration>
51+
<version>4.1.0</version>
52+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
53+
<models>
54+
<model>src/main/mdo/maven.mdo</model>
55+
</models>
56+
<templates>
57+
<template>model.vm</template>
58+
</templates>
59+
<params>
60+
<param>packageModelV4=org.apache.maven.api.model</param>
61+
<param>isMavenModel=true</param>
62+
</params>
63+
</configuration>
5064
<executions>
5165
<execution>
52-
<id>velocity</id>
66+
<id>modello</id>
5367
<goals>
5468
<goal>velocity</goal>
69+
<goal>xdoc</goal>
70+
<goal>xsd</goal>
5571
</goals>
56-
<configuration>
57-
<version>4.1.0</version>
58-
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
59-
<models>
60-
<model>src/main/mdo/maven.mdo</model>
61-
</models>
62-
<templates>
63-
<template>model.vm</template>
64-
</templates>
65-
<params>
66-
<param>packageModelV4=org.apache.maven.api.model</param>
67-
<param>isMavenModel=true</param>
68-
</params>
69-
</configuration>
72+
<phase>generate-sources</phase>
7073
</execution>
7174
</executions>
7275
</plugin>

‎api/maven-api-plugin/pom.xml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ under the License.
5353
<artifactId>modello-maven-plugin</artifactId>
5454
<executions>
5555
<execution>
56-
<id>plugin</id>
56+
<id>modello-plugin</id>
5757
<goals>
5858
<goal>velocity</goal>
59+
<goal>xdoc</goal>
60+
<goal>xsd</goal>
5961
</goals>
6062
<phase>generate-sources</phase>
6163
<configuration>
@@ -73,24 +75,12 @@ under the License.
7375
</configuration>
7476
</execution>
7577
<execution>
76-
<id>plugin-doc</id>
78+
<id>modello-lifecycle</id>
7779
<goals>
80+
<goal>velocity</goal>
7881
<goal>xdoc</goal>
7982
<goal>xsd</goal>
8083
</goals>
81-
<phase>generate-resources</phase>
82-
<configuration>
83-
<version>2.0.0</version>
84-
<models>
85-
<model>src/main/mdo/plugin.mdo</model>
86-
</models>
87-
</configuration>
88-
</execution>
89-
<execution>
90-
<id>lifecycle</id>
91-
<goals>
92-
<goal>velocity</goal>
93-
</goals>
9484
<phase>generate-sources</phase>
9585
<configuration>
9686
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
@@ -106,20 +96,6 @@ under the License.
10696
</params>
10797
</configuration>
10898
</execution>
109-
<execution>
110-
<id>lifecycle-doc</id>
111-
<goals>
112-
<goal>xdoc</goal>
113-
<goal>xsd</goal>
114-
</goals>
115-
<phase>generate-sources</phase>
116-
<configuration>
117-
<version>1.0.0</version>
118-
<models>
119-
<model>src/main/mdo/lifecycle.mdo</model>
120-
</models>
121-
</configuration>
122-
</execution>
12399
</executions>
124100
</plugin>
125101
<plugin>

‎api/maven-api-settings/pom.xml

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,41 +53,30 @@ under the License.
5353
<plugin>
5454
<groupId>org.codehaus.modello</groupId>
5555
<artifactId>modello-maven-plugin</artifactId>
56+
<configuration>
57+
<version>2.0.0</version>
58+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
59+
<models>
60+
<model>src/main/mdo/settings.mdo</model>
61+
</models>
62+
<templates>
63+
<template>model.vm</template>
64+
</templates>
65+
<params>
66+
<param>packageModelV4=org.apache.maven.api.settings</param>
67+
<param>locationTracking=true</param>
68+
<param>generateLocationClasses=true</param>
69+
</params>
70+
</configuration>
5671
<executions>
5772
<execution>
58-
<id>velocity</id>
73+
<id>modello</id>
5974
<goals>
6075
<goal>velocity</goal>
61-
</goals>
62-
<configuration>
63-
<version>2.0.0</version>
64-
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
65-
<models>
66-
<model>src/main/mdo/settings.mdo</model>
67-
</models>
68-
<templates>
69-
<template>model.vm</template>
70-
</templates>
71-
<params>
72-
<param>packageModelV4=org.apache.maven.api.settings</param>
73-
<param>locationTracking=true</param>
74-
<param>generateLocationClasses=true</param>
75-
</params>
76-
</configuration>
77-
</execution>
78-
<execution>
79-
<id>modello-site-docs</id>
80-
<goals>
8176
<goal>xdoc</goal>
8277
<goal>xsd</goal>
8378
</goals>
8479
<phase>generate-resources</phase>
85-
<configuration>
86-
<version>2.0.0</version>
87-
<models>
88-
<model>src/main/mdo/settings.mdo</model>
89-
</models>
90-
</configuration>
9180
</execution>
9281
</executions>
9382
</plugin>

‎api/maven-api-toolchain/pom.xml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,30 @@ under the License.
4646
<plugin>
4747
<groupId>org.codehaus.modello</groupId>
4848
<artifactId>modello-maven-plugin</artifactId>
49+
<configuration>
50+
<version>1.2.0</version>
51+
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
52+
<models>
53+
<model>src/main/mdo/toolchains.mdo</model>
54+
</models>
55+
<templates>
56+
<template>model.vm</template>
57+
</templates>
58+
<params>
59+
<param>packageModelV4=org.apache.maven.api.toolchain</param>
60+
<param>locationTracking=true</param>
61+
<param>generateLocationClasses=true</param>
62+
</params>
63+
</configuration>
4964
<executions>
5065
<execution>
51-
<id>velocity</id>
66+
<id>modello</id>
5267
<goals>
5368
<goal>velocity</goal>
69+
<goal>xdoc</goal>
70+
<goal>xsd</goal>
5471
</goals>
55-
<configuration>
56-
<version>1.2.0</version>
57-
<velocityBasedir>${project.basedir}/../../src/mdo</velocityBasedir>
58-
<models>
59-
<model>src/main/mdo/toolchains.mdo</model>
60-
</models>
61-
<templates>
62-
<template>model.vm</template>
63-
</templates>
64-
<params>
65-
<param>packageModelV4=org.apache.maven.api.toolchain</param>
66-
<param>locationTracking=true</param>
67-
<param>generateLocationClasses=true</param>
68-
</params>
69-
</configuration>
72+
<phase>generate-resources</phase>
7073
</execution>
7174
</executions>
7275
</plugin>

‎api/pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,6 @@
4949
<project.directory>api</project.directory>
5050
</properties>
5151

52-
<build>
53-
<pluginManagement>
54-
<plugins>
55-
<plugin>
56-
<groupId>org.codehaus.modello</groupId>
57-
<artifactId>modello-maven-plugin</artifactId>
58-
<executions>
59-
<execution>
60-
<id>modello-site-docs</id>
61-
<goals>
62-
<goal>xdoc</goal>
63-
<goal>xsd</goal>
64-
</goals>
65-
<phase>none</phase>
66-
</execution>
67-
</executions>
68-
</plugin>
69-
</plugins>
70-
</pluginManagement>
71-
</build>
72-
7352
<profiles>
7453
<profile>
7554
<id>reporting</id>

‎compat/maven-model/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,6 @@ under the License.
9595
</params>
9696
</configuration>
9797
<executions>
98-
<execution>
99-
<id>modello-site-docs</id>
100-
<goals>
101-
<goal>xdoc</goal>
102-
</goals>
103-
<phase>pre-site</phase>
104-
</execution>
105-
<execution>
106-
<id>modello-schema</id>
107-
<goals>
108-
<goal>xsd</goal>
109-
</goals>
110-
<phase>generate-resources</phase>
111-
</execution>
11298
<execution>
11399
<id>model-v3</id>
114100
<goals>

‎impl/maven-core/pom.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -215,31 +215,6 @@ under the License.
215215
<groupId>org.eclipse.sisu</groupId>
216216
<artifactId>sisu-maven-plugin</artifactId>
217217
</plugin>
218-
<plugin>
219-
<groupId>org.codehaus.modello</groupId>
220-
<artifactId>modello-maven-plugin</artifactId>
221-
<configuration>
222-
<version>1.1.0</version>
223-
<!-- This is a required attribute and is intentionally left empty -->
224-
<models />
225-
</configuration>
226-
<executions>
227-
<execution>
228-
<!-- This step is required to generate xdoc, and does not generate java code -->
229-
<id>modello-site-doc</id>
230-
<goals>
231-
<goal>xdoc</goal>
232-
</goals>
233-
<phase>pre-site</phase>
234-
<configuration>
235-
<version>1.0.0</version>
236-
<models>
237-
<model>src/main/mdo/extension.mdo</model>
238-
</models>
239-
</configuration>
240-
</execution>
241-
</executions>
242-
</plugin>
243218
<plugin>
244219
<groupId>org.codehaus.mojo</groupId>
245220
<artifactId>buildnumber-maven-plugin</artifactId>

0 commit comments

Comments
 (0)