You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/04/06 12:29:23 UTC

svn commit: r1671506 - /maven/site/trunk/content/apt/plugins/index.apt

Author: rfscholte
Date: Mon Apr  6 10:29:22 2015
New Revision: 1671506

URL: http://svn.apache.org/r1671506
Log:
CMS commit to maven by rfscholte

Modified:
    maven/site/trunk/content/apt/plugins/index.apt

Modified: maven/site/trunk/content/apt/plugins/index.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/plugins/index.apt?rev=1671506&r1=1671505&r2=1671506&view=diff
==============================================================================
--- maven/site/trunk/content/apt/plugins/index.apt (original)
+++ maven/site/trunk/content/apt/plugins/index.apt Mon Apr  6 10:29:22 2015
@@ -145,11 +145,7 @@ Available Plugins
 *--------------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
 | {{{/plugins/maven-help-plugin/} <<<help>>>}}                 | B          | 2.2          | 2013-02-23 | Get information about the working environment for the project. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-help-plugin}SVN}} | {{{https://issues.apache.org/jira/browse/MPH}JIRA}}
 *--------------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
-<<<<<<< .mine
-| {{{/plugins/maven-invoker-plugin/} <<<invoker>>>}}           | B+R        | 1.9          | 2014-06-28 | Run a set of Maven projects and verify the output. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}} | {{{https://issues.apache.org/jira/browse/MINVOKER}JIRA}}
-=======
 | {{{/plugins/maven-invoker-plugin/} <<<invoker>>>}}           | B+R        | 1.10         | 2015-04-03 | Run a set of Maven projects and verify the output. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-invoker-plugin}SVN}} | {{{http://jira.codehaus.org/browse/MINVOKER}JIRA}}
->>>>>>> .r1671463
 *--------------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+
 | {{{/plugins/maven-jarsigner-plugin/} <<<jarsigner>>>}}       | B          | 1.4          | 2015-01-21 | Signs or verifies project artifacts. | {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-jarsigner-plugin}SVN}} | {{{https://issues.apache.org/jira/browse/MJARSIGNER}JIRA}}
 *--------------------------------------------------------------+------------+--------------+------------+------------------+------------------------+--------------------+