You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/05/05 14:02:11 UTC

[maven-site] 01/01: merge

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

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

commit 4a1e5650edcd5c12de988f067a18896f69a0deab
Merge: 6c4a21e f1780e1
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Tue May 5 10:01:54 2020 -0400

    merge

 README.md                                          | 21 ++++++
 .../release/maven-project-release-procedure.apt    |  5 +-
 .../development/guide-documentation-style.apt      | 22 +++---
 .../guides/development/guide-maven-development.apt | 10 +--
 .../apt/guides/mini/guide-creating-archetypes.apt  | 10 +--
 content/apt/guides/mini/guide-encryption.apt       | 42 +++++------
 .../apt/guides/mini/guide-maven-classloading.apt   |  2 +-
 .../apt/guides/mini/guide-reproducible-builds.apt  | 60 ++++++++++------
 content/apt/plugin-developers/common-bugs.apt      | 29 --------
 content/apt/plugin-developers/plugin-testing.apt   | 12 ++--
 content/apt/plugins/index.apt                      |  6 +-
 content/apt/pom.apt                                | 44 ++++++------
 content/apt/shared/index.apt                       |  2 +-
 content/apt/skins/index.apt                        |  4 +-
 content/markdown/what-is-maven.md                  | 82 +++++++++-------------
 content/pdf.xml                                    |  2 +-
 content/resources/badges/asf_jira-ARCHETYPE.json   |  6 ++
 content/resources/badges/asf_jira-DOXIA.json       |  6 ++
 .../resources/badges/asf_jira-DOXIASITETOOLS.json  |  6 ++
 content/resources/badges/asf_jira-DOXIATOOLS.json  |  6 ++
 content/resources/badges/asf_jira-JXR.json         |  6 ++
 content/resources/badges/asf_jira-MACR.json        |  6 ++
 content/resources/badges/asf_jira-MANTRUN.json     |  6 ++
 content/resources/badges/asf_jira-MARCHETYPES.json |  6 ++
 content/resources/badges/asf_jira-MASFRES.json     |  6 ++
 content/resources/badges/asf_jira-MASSEMBLY.json   |  6 ++
 content/resources/badges/asf_jira-MCHANGELOG.json  |  6 ++
 content/resources/badges/asf_jira-MCHANGES.json    |  6 ++
 content/resources/badges/asf_jira-MCHECKSTYLE.json |  6 ++
 content/resources/badges/asf_jira-MCLEAN.json      |  6 ++
 content/resources/badges/asf_jira-MCOMPILER.json   |  6 ++
 content/resources/badges/asf_jira-MDEP.json        |  6 ++
 content/resources/badges/asf_jira-MDEPLOY.json     |  6 ++
 content/resources/badges/asf_jira-MDOAP.json       |  6 ++
 content/resources/badges/asf_jira-MDOCCK.json      |  6 ++
 content/resources/badges/asf_jira-MEAR.json        |  6 ++
 content/resources/badges/asf_jira-MEJB.json        |  6 ++
 content/resources/badges/asf_jira-MENFORCER.json   |  6 ++
 content/resources/badges/asf_jira-MGPG.json        |  6 ++
 content/resources/badges/asf_jira-MINDEXER.json    |  6 ++
 content/resources/badges/asf_jira-MINSTALL.json    |  6 ++
 content/resources/badges/asf_jira-MINVOKER.json    |  6 ++
 content/resources/badges/asf_jira-MJAR.json        |  6 ++
 content/resources/badges/asf_jira-MJARSIGNER.json  |  6 ++
 content/resources/badges/asf_jira-MJAVADOC.json    |  6 ++
 content/resources/badges/asf_jira-MJDEPRSCAN.json  |  6 ++
 content/resources/badges/asf_jira-MJDEPS.json      |  6 ++
 content/resources/badges/asf_jira-MJLINK.json      |  6 ++
 content/resources/badges/asf_jira-MJMOD.json       |  6 ++
 content/resources/badges/asf_jira-MLINKCHECK.json  |  6 ++
 content/resources/badges/asf_jira-MNG.json         |  6 ++
 content/resources/badges/asf_jira-MNGSITE.json     |  6 ++
 content/resources/badges/asf_jira-MPATCH.json      |  6 ++
 content/resources/badges/asf_jira-MPDF.json        |  6 ++
 content/resources/badges/asf_jira-MPH.json         |  6 ++
 content/resources/badges/asf_jira-MPIR.json        |  6 ++
 content/resources/badges/asf_jira-MPLUGIN.json     |  6 ++
 .../resources/badges/asf_jira-MPLUGINTESTING.json  |  6 ++
 content/resources/badges/asf_jira-MPMD.json        |  6 ++
 content/resources/badges/asf_jira-MPOM.json        |  6 ++
 content/resources/badges/asf_jira-MRAR.json        |  6 ++
 content/resources/badges/asf_jira-MRELEASE.json    |  6 ++
 content/resources/badges/asf_jira-MRESOLVER.json   |  6 ++
 content/resources/badges/asf_jira-MRESOURCES.json  |  6 ++
 content/resources/badges/asf_jira-MRRESOURCES.json |  6 ++
 content/resources/badges/asf_jira-MSCMPUB.json     |  6 ++
 content/resources/badges/asf_jira-MSCRIPTING.json  |  6 ++
 content/resources/badges/asf_jira-MSHADE.json      |  6 ++
 content/resources/badges/asf_jira-MSHARED.json     |  6 ++
 content/resources/badges/asf_jira-MSITE.json       |  6 ++
 content/resources/badges/asf_jira-MSKINS.json      |  6 ++
 content/resources/badges/asf_jira-MSOURCES.json    |  6 ++
 content/resources/badges/asf_jira-MSTAGE.json      |  6 ++
 content/resources/badges/asf_jira-MTOOLCHAINS.json |  6 ++
 content/resources/badges/asf_jira-MVERIFIER.json   |  6 ++
 content/resources/badges/asf_jira-MWAR.json        |  6 ++
 content/resources/badges/asf_jira-MWRAPPER.json    |  6 ++
 content/resources/badges/asf_jira-SCM.json         |  6 ++
 content/resources/badges/asf_jira-SUREFIRE.json    |  6 ++
 content/resources/badges/asf_jira-WAGON.json       |  6 ++
 content/resources/badges/ml-users.json             |  6 ++
 content/xdoc/articles.xml                          | 27 +------
 content/xdoc/download.xml.vm                       | 20 +++---
 pom.xml                                            |  2 +-
 84 files changed, 575 insertions(+), 217 deletions(-)

diff --cc content/xdoc/articles.xml
index 622ec2e,4960087..cbd7113
--- a/content/xdoc/articles.xml
+++ b/content/xdoc/articles.xml
@@@ -52,27 -52,37 +52,26 @@@ under the License
          <li><strong>Covers: </strong>Maven 3</li>
          <li><strong>Published: </strong> Packt Publishing (August 2011)</li>
          <li><strong>Authors: </strong> Srirangan</li>
 -        <li><strong>Buy the Book:</strong> <a href="http://www.packtpub.com/apache-maven-3-0-cookbook/book">Packt</a>, <a href="http://www.amazon.com/Apache-Maven-3-Cookbook-Srirangan/dp/1849512442/ref=sr_1_1?ie=UTF8&amp;qid=1315861966&amp;sr=8-1">Amazon</a></li>
 +        <li><strong>Buy the Book:</strong> <a href="https://www.packtpub.com/apache-maven-3-0-cookbook/book">Packt</a>, <a href="https://www.amazon.com/Apache-Maven-3-Cookbook-Srirangan/dp/1849512442/ref=sr_1_1?ie=UTF8&amp;qid=1315861966&amp;sr=8-1">Amazon</a></li>
        </ul>
 -    </div> 
 +    </div>    
  
  <div style="float: left; margin-right: 5em;">
 -<a href="http://books.sonatype.com/"><img src="images/books/definitive_guide.jpg" title="Maven: The Definitive Guide" /></a>
 +      <img src="images/books/better_builds.png" title="Better Builds with Maven" />
  </div>
 -
        <div style="min-height: 220px">
 -        <p><a href="http://books.sonatype.com/"><strong>Maven: The Definitive Guide</strong></a> (Readable HTML and Free PDF Downloads)</p>
 +        <p><a href="http://www.scribd.com/doc/238927/Better-Builds-With-Maven"><strong>Better Builds with Maven</strong></a> (Free PDF Download)</p>
          <ul>
 -          <li><strong>Covers: </strong>Maven 2.0.9+</li>
 -          <li><strong>Published: </strong> O'Reilly (Edition 1: October 1, 2008)</li>
 +          <li><strong>Covers: </strong>Maven 2.0.4</li>
 +          <li><strong>Published: </strong><a href="http://www.maestrodev.com">MaestroDev</a> (March 2006)</li>
            <li><strong>Authors: </strong>
-             John Casey,
-             <a href="http://blogs.codehaus.org/people/vmassol/">Vincent Massol</a>,
 -            <a href="http://www.sonatype.com">Sonatype</a> (
 -            Jason van Zyl,  
 -<a href="http://www.sonatype.com/people/author/brian">Brian Fox</a>,
 -<a href="http://www.sonatype.com/people/author/john">John Casey</a>,
 -<a href="http://bsnyderblog.blogspot.com/">Bruce Snyder</a>,
 -Tim O'Brien,
 -Eric Redmond)
++            John Casey, Vincent Massol,
 +            <a href="http://brettporter.wordpress.com/">Brett Porter</a>,
 +            <a href="http://www.carlossanchez.eu/">Carlos Sanchez</a>
            </li>
 -          <li><strong>Buy the Book:</strong> <a href="http://www.amazon.com/Maven-Definitive-Guide-Sonatype-Company/dp/0596517335/ref=pd_bbs_sr_1?ie=UTF8&amp;s=books&amp;qid=1226091388&amp;sr=8-1">Amazon</a></li>
 +          <li><strong>Read Online:</strong> <a href="http://www.scribd.com/doc/238927/Better-Builds-With-Maven">http://www.scribd.com/doc/238927/Better-Builds-With-Maven</a></li>
          </ul>
 -        <p>Updated and expanded content of the book is available as free HTML pages and PDF downloads as two separate books:</p>
 -          <ul>
 -            <li><strong><a href="http://www.sonatype.com/resources/books/maven-by-example">Maven by Example</a></strong></li>
 -            <li><strong><a href="http://www.sonatype.com/resources/books/maven-the-complete-reference">Maven: The Complete Reference</a></strong></li>
 -          </ul>
        </div>
 -
  <div style="float: left; margin-right: 5em;">
        <img src="images/books/getting_started.png" title="Getting started with Apache Maven" />
  </div>
@@@ -156,7 -166,7 +155,7 @@@
              <td>6 November 2006</td>
            </tr>
            <tr>
--            <td><a href="http://java.developpez.com/faq/maven/">FAQ for Maven 2 and Continuum (in French)</a></td>
++            <td><a href="http://java.developpez.com/faq/maven/">FAQ for Maven and Continuum (in French)</a></td>
              <td>Developpez.com</td>
              <td>Eric Reboisson</td>
              <td>11 October 2006</td>
@@@ -179,14 -189,14 +178,6 @@@
              <td>Tor Norbye, Carl Quinn, Dick Wall, Joe Nuxoll, Brett Porter</td>
              <td>18 July 2006</td>
            </tr>
--          <!--
--          <tr>
--            <td><a href="http://repo.maujr.org/artigos/maven2-guj/maven-2-guj.pdf">Automatizando seus projetos com o Maven 2</a></td>
--            <td></td>
--            <td>MaurĂ­cio Linhares</td>
--            <td>7 July 2006</td>
--          </tr>
--          -->
            <tr>
              <td><a href="http://today.java.net/pub/a/today/2006/05/30/continuous-integration-with-continuum.html">Continuous Integration with Continuum</a></td>
              <td>Java.net</td>