[maven] branch MNG-7129-master updated (09f90fd -> 0061bfe)

[hb...@apache.org]

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

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


 discard 09f90fd  [MNG-7321] fix javadoc
     new 0061bfe  [MNG-7321] fix javadoc

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   (09f90fd)
            \
             N -- N -- N   refs/heads/MNG-7129-master (0061bfe)

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-caching/src/main/mdo/cache-config.mdo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[maven] 01/01: [MNG-7321] fix javadoc

[hb...@apache.org]

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

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

commit 0061bfe55242cd142158fe74d53dcf4fa9c42817
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Thu Nov 11 18:01:05 2021 +0100

    [MNG-7321] fix javadoc
---
 maven-caching/src/main/mdo/cache-build.mdo                        | 2 +-
 maven-caching/src/main/mdo/cache-config.mdo                       | 8 ++++----
 .../src/main/java/org/apache/maven/wrapper/WrapperExecutor.java   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/maven-caching/src/main/mdo/cache-build.mdo b/maven-caching/src/main/mdo/cache-build.mdo
index b1d7203..01c28a6 100644
--- a/maven-caching/src/main/mdo/cache-build.mdo
+++ b/maven-caching/src/main/mdo/cache-build.mdo
@@ -46,7 +46,7 @@ under the License.
           <type>String</type>
         </field>
         <!--xs:element name="final" type="xs:boolean" minOccurs="0"/-->
-        <field>
+        <field xml.tagName="final">
           <name>_final</name>
           <version>1.0.0+</version>
           <type>Boolean</type>
diff --git a/maven-caching/src/main/mdo/cache-config.mdo b/maven-caching/src/main/mdo/cache-config.mdo
index 6f3c339..2276bd7 100644
--- a/maven-caching/src/main/mdo/cache-config.mdo
+++ b/maven-caching/src/main/mdo/cache-config.mdo
@@ -879,11 +879,11 @@ under the License.
                     <name>logAll</name>
                     <type>boolean</type>
                     <defaultValue>true</defaultValue>
-                    <description>Controls if all plugin properties to be logged (true is default). All the properties logged
+                    <description><![CDATA[Controls if all plugin properties to be logged (true is default). All the properties logged
                         with respect to log/nolog children:
                         * true: logged all if no blacklists (&lt;nolog/&gt;) and whitelists (&lt;log/&gt;) specified on plugin
                         level
-                        * false: logged only tracked and included by whitelists (&lt;log/&gt;) on plugin level
+                        * false: logged only tracked and included by whitelists (&lt;log/&gt;) on plugin level]]>
                     </description>
                 </field>
             </fields>
@@ -1020,14 +1020,14 @@ under the License.
                     <name>logAllProperties</name>
                     <type>boolean</type>
                     <defaultValue>true</defaultValue>
-                    <description>
+                    <description><![CDATA[
                         Controls if all plugin properties to be logged (true is default). All the properties
                         logged with respect to children:
                         * logAll on plugin level overrides global value
                         * true: logged all if no blacklists (&lt;nolog/&gt;) and whitelists (&lt;log/&gt;) specified on
                         plugin level
                         * false: logged only tracked and included by whitelists (&lt;log/&gt;) on plugin level
-                        &lt;log/&gt;
+                        &lt;log/&gt;]]>
                     </description>
                 </field>
             </fields>
diff --git a/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
index 42d5677..69a27b1 100644
--- a/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
+++ b/maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
@@ -28,8 +28,8 @@ import java.nio.file.Path;
 import java.util.Properties;
 
 /**
- * Wrapper executor, running {@link Installer} to get a Maven distribution ready, followed by {@BootstrapMainStarter}
- * to launch the Maven bootstrap.
+ * Wrapper executor, running {@link Installer} to get a Maven distribution ready, followed by
+ * {@link BootstrapMainStarter} to launch the Maven bootstrap.
  * 
  * @author Hans Dockter
  */