[maven] branch MNG-6681 updated (fc8a95a -> e3b6c3e)

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a change to branch MNG-6681
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard fc8a95a  MNG-6681 dependency type = extension+classifier
     new e3b6c3e  MNG-6681 dependency type = extension+classifier

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fc8a95a)
            \
             N -- N -- N   refs/heads/MNG-6681 (e3b6c3e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 maven-model/src/main/mdo/maven.mdo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[maven] 01/01: MNG-6681 dependency type = extension+classifier

[hb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch MNG-6681
in repository https://gitbox.apache.org/repos/asf/maven.git

commit e3b6c3efc4638f1d3ca29522ef33118fa1453268
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jun 16 10:35:34 2019 +0200

    MNG-6681 dependency type = extension+classifier
    
    removed misleading "While it usually represents the extension on the
    filename of the dependency, that is not always the case. A type can be
    mapped to a different extension and a classifier. The type often
    corresponds to the packaging used, though this is also not always the
    case."
---
 maven-model/src/main/mdo/maven.mdo | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index c13da2f..b199ee1 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -1022,17 +1022,10 @@
           <version>4.0.0+</version>
           <description>
             <![CDATA[
-            The type of dependency. While it
-            usually represents the extension on the filename of the dependency,
-            that is not always the case. A type can be mapped to a different
-            extension and a classifier.
-            The type often corresponds to the packaging used, though this is also
-            not always the case.
+            The type of dependency, that will be mapped to a file extension, an optional classifier, and a few other attributes.
             Some examples are <code>jar</code>, <code>war</code>, <code>ejb-client</code>
             and <code>test-jar</code>: see <a href="../maven-core/artifact-handlers.html">default
-            artifact handlers</a> for a list.
-            New types can be defined by plugins that set
-            <code>extensions</code> to <code>true</code>, so this is not a complete list.
+            artifact handlers</a> for a list. New types can be defined by extensions, so this is not a complete list.
             ]]>
           </description>
           <type>String</type>