[maven-plugin-tools] branch master updated: [MNGSITE-393] remove Maven 2 info (#24)

[el...@apache.org]

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

elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git


The following commit(s) were added to refs/heads/master by this push:
     new add3353  [MNGSITE-393] remove Maven 2 info (#24)
add3353 is described below

commit add3353f0833d9d168bf47650e2597ada98ee98b
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Wed Jul 1 07:41:51 2020 -0400

    [MNGSITE-393] remove Maven 2 info (#24)
    
    @michael-o
---
 .../src/site/apt/examples/using-annotations.apt.vm | 45 +---------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

diff --git a/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm b/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
index b96130c..b18271d 100644
--- a/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
+++ b/maven-plugin-plugin/src/site/apt/examples/using-annotations.apt.vm
@@ -31,9 +31,9 @@ Using Plugin Tools Java Annotations
  Since version 3.0 of the maven-plugin-plugin, you can use Java5 annotations to generate the 
  plugin descriptor file.
 
- <<NOTE>> With annotations, your Mojo super class does not any more require to be in the same project. Provided that the super class also uses annotations, it
+ <<NOTE>> With annotations, your Mojo super class does not have to be in the same project. Provided that the super class also uses annotations, it
  can now come from reactor projects or external dependencies. By default all dependencies are scanned, but this can be reduced with the <<<mojoDependencies>>>
- parameter. As javadoc doclet are still useful for <<<...@since>>>, <<<...@deprecated>>> and comments, the sources are still scanned. So if you use an external 
+ parameter. As javadoc doclets are still useful for <<<...@since>>>, <<<...@deprecated>>> and comments, the sources are still scanned. So if you use an external 
  dependency, you must still provide an artifact with sources (<<<sources>>> classifier) to provide documentation (the tooling will skip error if this artifact 
  sources is missing).
 
@@ -124,44 +124,3 @@ Using Plugin Tools Java Annotations
   ...
 </project>
 +-----+
-
- <Notice>: this configuration will not work with Maven 2, which does not support execution phase overriding.
- If you absolutely need to build with Maven 2, you should use <<<skipErrorNoDescriptorsFound>>> parameter
- to avoid failure on default execution phase and add another execution:
- 
-+-----+
-<project>
-  ...
-  <profiles>
-    <profile>
-      <id>maven-2</id>
-      <activation>
-        <file>
-          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
-          <missing>${basedir}</missing>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-plugin-plugin</artifactId>
-            <configuration>
-              <!-- see https://issues.apache.org/jira/browse/MNG-5346 -->
-              <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-            </configuration>
-            <executions>
-              <execution>
-                <id>mojo-descriptor</id>
-                <goals>
-                  <goal>descriptor</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>    
-  </profiles>
-</project>
-+-----+