Skip to content

Commit db817d4

Browse files
cstamascstamas
committed
Rationalize config and make all model generating subproject
generate doco as well. Point all links to new doco.
1 parent fa03693 commit db817d4

File tree

8 files changed

+155
-116
lines changed

8 files changed

+155
-116
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@
6666
<goals>
6767
<goal>velocity</goal>
6868
<goal>xsd</goal>
69+
<goal>xdoc</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>

‎impl/maven-impl/src/site/apt/dependency-types.apt

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
~~ Licensed to the Apache Software Foundation (ASF) under one
2+
~~ or more contributor license agreements. See the NOTICE file
3+
~~ distributed with this work for additional information
4+
~~ regarding copyright ownership. The ASF licenses this file
5+
~~ to you under the Apache License, Version 2.0 (the
6+
~~ "License"); you may not use this file except in compliance
7+
~~ with the License. You may obtain a copy of the License at
8+
~~
9+
~~ http://www.apache.org/licenses/LICENSE-2.0
10+
~~
11+
~~ Unless required by applicable law or agreed to in writing,
12+
~~ software distributed under the License is distributed on an
13+
~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
~~ KIND, either express or implied. See the License for the
15+
~~ specific language governing permissions and limitations
16+
~~ under the License.
17+
18+
---
19+
Default Dependency Types
20+
---
21+
Hervé Boutemy
22+
---
23+
2024-12-27
24+
---
25+
26+
Default Dependency Types Reference
27+
28+
Defined in <<<DefaultTypeProvider>>>
29+
({{{./apidocs/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.html}javadoc}},
30+
{{{./xref/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.html}source}}):
31+
32+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
33+
|| type || classifier || extension || language || path types || includesDependencies ||
34+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
35+
|| Maven || || || || || ||
36+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
37+
| <<<pom>>> | | <= type> | none | | |
38+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
39+
| <<<bom>>> * | | <<<pom>>> | none | | |
40+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
41+
| <<<maven-plugin>>> | | <<<jar>>> | java | classes | |
42+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
43+
|| Java || || || || || ||
44+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
45+
| <<<jar>>> | | <= type> | java | classes, modules | |
46+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
47+
| <<<java-source>>> | <<<sources>>> | <<<jar>>> | java | | |
48+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
49+
| <<<javadoc>>> | <<<javadoc>>> | <<<jar>>> | java | classes | |
50+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
51+
| <<<test-jar>>> | <<<tests>>> | <<<jar>>> | java | classes, patch module | |
52+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
53+
| <<<modular-jar>>> * | <<<tests>>> | <<<jar>>> | java | modules | |
54+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
55+
| <<<classpath-jar>>> * | <<<tests>>> | <<<jar>>> | java | classes | |
56+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
57+
| <<<fatjar>>> * | <<<tests>>> | <<<jar>>> | java | classes | |
58+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
59+
|| Java/Jakarta EE || || || || || ||
60+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
61+
| <<<ejb>>> | | <<<jar>>> | java | classes | |
62+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
63+
| <<<ejb-client>>> | <<<client>>> | <<<jar>>> | java | classes | |
64+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
65+
| <<<war>>> | | <= type> | java | | <<<true>>> |
66+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
67+
| <<<ear>>> | | <= type> | java | | <<<true>>> |
68+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
69+
| <<<rar>>> | | <= type> | java | | <<<true>>> |
70+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
71+
| <<<par>>> * | | <= type> | java | | <<<true>>> |
72+
*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
73+
74+
* = new in Maven 4

‎src/site/site.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,13 @@ under the License.
4747
</menu>
4848

4949
<menu inherit="bottom" name="Descriptors Reference">
50-
<item name="POM" href="./maven-model/maven.html"/>
50+
<item name="POM" href="./api/maven-api-model/maven.html"/>
5151
<item name="Settings" href="./api/maven-api-settings/settings.html"/>
52-
<item name="Toolchains" href="./maven-toolchain-model/toolchains.html"/>
52+
<item name="Toolchains" href="./api/maven-api-toolchain/toolchains.html"/>
53+
<item name="Core Extensions" href="./api/maven-api-cli/core-extensions.html"/>
54+
<item name="Repository Metadata" href="./api/maven-api-metadata/repository-metadata.html"/>
55+
<item name="Plugin Descriptor" href="./api/maven-api-plugin/plugin.html"/>
56+
<item name="Lifecycle Descriptor" href="./api/maven-api-plugin/lifecycle.html"/>
5357
</menu>
5458

5559
<menu inherit="bottom" name="Reference">

0 commit comments

Comments
 (0)