This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository wagon2.
commit d2818ca002c08acaf7dc07c1c8d7b38f9c4ad162 Merge: 879b324 a1ec038 Author: Emmanuel Bourg <[email protected]> Date: Wed Jan 29 17:34:20 2014 +0100 Merge tag 'upstream/2.6' Upstream version 2.6 pom.xml | 29 +- wagon-provider-api/pom.xml | 4 +- .../apache/maven/wagon/events/SessionEvent.java | 2 +- .../maven/wagon/events/SessionEventSupport.java | 30 +- .../apache/maven/wagon/events/TransferEvent.java | 2 +- .../maven/wagon/observers/ChecksumObserver.java | 4 +- .../apache/maven/wagon/repository/Repository.java | 4 +- .../org/apache/maven/wagon/AbstractWagonTest.java | 145 ++-- .../maven/wagon/PermissionModeUtilsTest.java | 6 +- .../org/apache/maven/wagon/StreamWagonTest.java | 45 +- .../wagon/events/SessionEventSupportTest.java | 141 ++-- .../maven/wagon/events/SessionEventTest.java | 4 +- .../maven/wagon/events/SessionListenerMock.java | 184 ----- .../wagon/events/TransferEventSupportTest.java | 102 ++- .../maven/wagon/events/TransferEventTest.java | 4 +- .../maven/wagon/events/TransferListenerMock.java | 176 ----- wagon-provider-test/pom.xml | 4 +- .../java/org/apache/maven/wagon/FileTestUtils.java | 8 +- .../apache/maven/wagon/StreamingWagonTestCase.java | 12 +- .../java/org/apache/maven/wagon/WagonTestCase.java | 150 ++-- .../apache/maven/wagon/http/HttpWagonTestCase.java | 2 +- wagon-providers/pom.xml | 6 +- wagon-providers/wagon-file/pom.xml | 2 +- .../maven/wagon/providers/file/FileWagon.java | 6 +- wagon-providers/wagon-ftp/pom.xml | 2 +- .../apache/maven/wagon/providers/ftp/FtpWagon.java | 38 +- wagon-providers/wagon-http-lightweight/pom.xml | 2 +- .../wagon/providers/http/LightweightHttpWagon.java | 6 +- wagon-providers/wagon-http-shared/pom.xml | 2 +- .../wagon/shared/http/HtmlFileListParser.java | 7 +- .../wagon/shared/http/HtmlFileListParserTest.java | 47 +- wagon-providers/wagon-http/pom.xml | 2 +- .../providers/http/AbstractHttpClientWagon.java | 812 ++++++++++----------- .../ConfigurableSSLSocketFactoryDecorator.java | 88 --- .../wagon/providers/http/ConfigurationUtils.java | 227 ++++++ .../wagon/providers/http/HttpConfiguration.java | 6 +- .../providers/http/HttpMethodConfiguration.java | 205 +----- .../maven/wagon/providers/http/HttpWagon.java | 88 +-- .../wagon/providers/http/RelaxedTrustStrategy.java | 76 ++ .../providers/http/RelaxedX509TrustManager.java | 131 ---- .../http/AbstractHttpClientWagonTest.java | 51 ++ .../wagon/providers/http/HttpClientWagonTest.java | 38 +- .../maven/wagon/providers/http/HttpWagonTest.java | 14 +- .../wagon/providers/http/HugeFileDownloadTest.java | 5 - wagon-providers/wagon-scm/pom.xml | 2 +- .../apache/maven/wagon/providers/scm/ScmWagon.java | 10 +- .../providers/scm/AbstractScmSvnWagonTest.java | 2 +- wagon-providers/wagon-ssh-common-test/pom.xml | 2 +- .../maven/wagon/providers/ssh/ScpCommand.java | 4 +- wagon-providers/wagon-ssh-common/pom.xml | 2 +- .../interactive/ConsoleInteractiveUserInfo.java | 2 +- .../ssh/knownhost/StreamKnownHostsProvider.java | 2 +- wagon-providers/wagon-ssh-external/pom.xml | 2 +- .../providers/ssh/external/ScpExternalWagon.java | 7 +- wagon-providers/wagon-ssh/pom.xml | 14 +- .../providers/ssh/jsch/AbstractJschWagon.java | 33 +- .../maven/wagon/providers/ssh/jsch/ScpWagon.java | 6 +- .../maven/wagon/providers/ssh/jsch/SftpWagon.java | 4 +- .../providers/ssh/jsch/EmbeddedScpWagonTest.java | 6 - wagon-providers/wagon-webdav-jackrabbit/pom.xml | 2 +- .../providers/webdav/AbstractHttpClientWagon.java | 10 +- .../providers/webdav/HttpMethodConfiguration.java | 25 +- .../wagon/providers/webdav/PathNavigator.java | 8 +- .../maven/wagon/providers/webdav/WebDavWagon.java | 21 +- .../providers/webdav/HttpClientWagonTest.java | 3 - wagon-tcks/pom.xml | 2 +- wagon-tcks/wagon-tck-http/pom.xml | 2 +- .../apache/maven/wagon/tck/http/GetWagonTests.java | 4 +- .../wagon/tck/http/fixture/LatencyServlet.java | 2 +- 69 files changed, 1246 insertions(+), 1850 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/wagon2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
