Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions maven-model/src/main/mdo/maven.mdo
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<p>An XSD is available at:</p>
<ul>
<li><a href="https://maven.apache.org/xsd/maven-v3_0_0.xsd">https://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
<li><a href="https://maven.apache.org/xsd/maven-4.0.0.xsd">https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
<li><a href="https://maven.apache.org/xsd/maven-4.0.0.xsd">https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 3.0.</li>
</ul>
]]>
</description>
Expand Down Expand Up @@ -679,10 +679,10 @@
<field>
<name>defaultGoal</name>
<version>3.0.0+</version>
<description>The default goal (or phase in Maven 2) to execute when none is specified for
the project. Note that in case of a multi-module build, only the default goal of the top-level
project is relevant, i.e. the default goals of child modules are ignored. Since Maven 3,
multiple goals/phases can be separated by whitespace.</description>
<description>The default goal to execute when none is specified for
the project. In a multi-module build, only the default goal of the top-level
project is relevant. That is, the default goals of child modules are ignored.
Multiple goals/phases can be separated by whitespace.</description>
<type>String</type>
</field>
<field>
Expand Down Expand Up @@ -1087,10 +1087,8 @@
<version>3.0.0+</version>
<description>
<![CDATA[
The version requirement of the dependency, e.g. <code>3.2.1</code>. The actual version will be resolved based on the usage context.
Version requirement can also be specified as a range of versions, e.g. <code>[3.2.0,)</code>. This is discouraged as it may break <i>predictability</i> of resolved version.
See <a href="https://s.apache.org/dependency-version">dependency version requirement documentation</a>
and <a href="https://s.apache.org/transitive-dependencies-resolution">transitive dependencies resolution</a> for more details.
The version of the dependency such as <code>3.2.1</code>. This can also be
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This goes beyond removing references to Maven 2 and changes the wording and the semantics here. I'm really not sure that blurring the differences between a dependency constraint (or coordinates) and the `resolved dependency' is a good idea. We did not finish the discussion, but this goes opposite to the existing naming:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted most of this, with edits for corrections. I'm not sure it says as much as you're reading into it though.

specified as a range of versions.
]]>
</description>
<type>String</type>
Expand Down Expand Up @@ -1401,10 +1399,10 @@
<![CDATA[
Gives the status of this artifact in the remote repository.
This must not be set in your local project, as it is updated by
tools placing it in the reposiory. Valid values are: <code>none</code> (default),
<code>converted</code> (repository manager converted this from an Maven 1 POM),
tools placing it in the repository. Valid values are: <code>none</code> (default),
<code>converted</code> (repository manager converted this from a Maven 1 POM),
<code>partner</code>
(directly synced from a partner Maven 2 repository), <code>deployed</code> (was deployed from a Maven 2
(directly synced from a partner Maven repository), <code>deployed</code> (was deployed from a Maven
instance), <code>verified</code> (has been hand verified as correct and final).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what this field is actually about. What are the tools that actually use this ? It's definitely not used in Maven core itself. How can we say what valid values are ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No idea. Maybe file an issue to figure this out. Possible this was removed from the code years ago and no one update the docs at the time.

]]>
</description>
Expand Down Expand Up @@ -3142,11 +3140,7 @@
<defaultValue>2.0</defaultValue>
<description><![CDATA[
For a plugin project (packaging is <code>maven-plugin</code>), the minimum version of
Maven required to use the resulting plugin.<br>
In Maven 2, this was also specifying the minimum version of Maven required to build a
project, but this usage is <b>deprecated</b> in Maven 3 and not checked any more: use
the <a href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html">Maven Enforcer Plugin's
<code>requireMavenVersion</code> rule</a> instead.
Maven required to use the resulting plugin.
]]>
</description>
<required>false</required>
Expand Down