[wagon2] 04/05: Merge tag 'upstream/2.5'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository wagon2.

commit 5322221c096fed97cbfcc92b3e20d44d4132578c
Merge: e27d552 6fb3b85
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 28 10:49:15 2013 +0100

    Merge tag 'upstream/2.5'
    
    Upstream version 2.5

 .gitignore                                         |    4 +
 deploySite.sh                                      |    2 +-
 pom.xml                                            |   45 +-
 src/site/resources/images/wagon-deps.png           |  Bin 33075 -> 31652 bytes
 src/site/xdoc/index.xml                            |    3 +-
 src/site/xdoc/wagon-deps.odg                       |  Bin 16281 -> 16223 bytes
 wagon-provider-api/pom.xml                         |    2 +-
 .../java/org/apache/maven/wagon/AbstractWagon.java |   55 +-
 wagon-provider-api/src/site/apt/index.apt          |    2 +-
 .../org/apache/maven/wagon/AbstractWagonTest.java  |    1 -
 .../java/org/apache/maven/wagon/WagonMock.java     |    4 +-
 .../wagon/events/TransferEventSupportTest.java     |    2 -
 wagon-provider-test/pom.xml                        |    2 +-
 .../apache/maven/wagon/StreamingWagonTestCase.java |    1 -
 .../apache/maven/wagon/http/HttpWagonTestCase.java |    2 +-
 wagon-providers/pom.xml                            |    9 +-
 wagon-providers/wagon-file/pom.xml                 |   10 +-
 .../maven/wagon/providers/file/FileWagon.java      |    2 +-
 wagon-providers/wagon-file/src/site/apt/index.apt  |    2 +-
 wagon-providers/wagon-ftp/pom.xml                  |    8 +-
 .../apache/maven/wagon/providers/ftp/FtpWagon.java |    4 +-
 wagon-providers/wagon-ftp/src/site/apt/index.apt   |    2 +-
 .../maven/wagon/providers/ftp/FtpWagonTest.java    |    5 +-
 wagon-providers/wagon-http-lightweight/pom.xml     |   16 +-
 .../wagon/providers/http/LightweightHttpWagon.java |    2 +-
 .../wagon-http-lightweight/src/site/apt/index.apt  |    2 +-
 .../providers/http/LightweightHttpWagonTest.java   |    5 -
 .../apache/maven/wagon/providers/http/TckTest.java |    2 -
 wagon-providers/wagon-http-shared/pom.xml          |   46 +-
 .../wagon/shared/http/HtmlFileListParser.java      |  178 +++--
 wagon-providers/wagon-http-shared4/pom.xml         |   63 --
 .../wagon/shared/http4/HtmlFileListParser.java     |  164 -----
 .../wagon-http-shared4/src/site/site.xml           |   33 -
 .../wagon/shared/http4/HtmlFileListParserTest.java |  728 --------------------
 .../test/resources/filelistings/commons-lang.html  |   31 -
 .../test/resources/filelistings/ibiblio-wagon.html |   99 ---
 .../test/resources/filelistings/jetty-wagon.html   |   90 ---
 .../src/test/resources/filelistings/mevenide.html  |   42 --
 .../test/resources/filelistings/mirror-wagon.html  |  112 ---
 .../src/test/resources/filelistings/nekohtml.html  |   23 -
 .../src/test/resources/filelistings/net_sf.html    |   71 --
 .../resources/filelistings/org.apache.maven.html   |   42 --
 .../test/resources/filelistings/org.codehaus.html  |   82 ---
 wagon-providers/wagon-http/pom.xml                 |   14 +-
 .../providers/http}/AbstractHttpClientWagon.java   |    6 +-
 .../ConfigurableSSLSocketFactoryDecorator.java     |    2 +-
 .../wagon/providers/http}/HttpConfiguration.java   |    2 +-
 .../providers/http}/HttpMethodConfiguration.java   |    2 +-
 .../maven/wagon/providers/http/HttpWagon.java      |    3 +-
 .../providers/http}/RelaxedX509TrustManager.java   |    2 +-
 wagon-providers/wagon-http/src/site/apt/index.apt  |    2 +-
 .../wagon/providers/http/HttpClientWagonTest.java} |    4 +-
 .../providers/http/HttpWagonPreemptiveTest.java    |    2 -
 .../maven/wagon/providers/http/HttpWagonTest.java  |    4 -
 .../wagon/providers/http/HttpWagonTimeoutTest.java |    2 -
 .../providers/http/HttpsWagonPreemptiveTest.java   |    2 -
 .../wagon/providers/http/HugeFileDownloadTest.java |  156 +++++
 .../apache/maven/wagon/providers/http/TckTest.java |    2 +-
 .../wagon-http/src/test/resources/log4j.xml        |    8 +-
 wagon-providers/wagon-scm/pom.xml                  |    4 +-
 wagon-providers/wagon-scm/src/site/apt/index.apt   |    2 +-
 wagon-providers/wagon-ssh-common-test/pom.xml      |    2 +-
 wagon-providers/wagon-ssh-common/pom.xml           |    2 +-
 wagon-providers/wagon-ssh-external/pom.xml         |    6 +-
 .../providers/ssh/external/ScpExternalWagon.java   |    1 -
 .../wagon-ssh-external/src/site/apt/index.apt      |    4 +-
 wagon-providers/wagon-ssh/pom.xml                  |    8 +-
 .../maven/wagon/providers/ssh/jsch/SftpWagon.java  |    3 +-
 wagon-providers/wagon-ssh/src/site/apt/index.apt   |    2 +-
 .../providers/ssh/jsch/EmbeddedScpWagonTest.java   |    2 -
 wagon-providers/wagon-webdav-jackrabbit/pom.xml    |    9 +-
 .../providers/webdav}/AbstractHttpClientWagon.java |    2 +-
 .../wagon/providers/webdav}/HttpConfiguration.java |    2 +-
 .../providers/webdav}/HttpMethodConfiguration.java |    2 +-
 .../maven/wagon/providers/webdav/WebDavWagon.java  |    3 +-
 .../wagon-webdav-jackrabbit/src/site/apt/index.apt |    2 +-
 .../providers/webdav/HttpClientWagonTest.java}     |    7 +-
 wagon-tcks/pom.xml                                 |    2 +-
 wagon-tcks/wagon-tck-http/pom.xml                  |    2 +-
 79 files changed, 419 insertions(+), 1859 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git