You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/10 11:26:09 UTC
[24/50] archiva git commit: Merge branch 'feature/jetty_9.4'
Merge branch 'feature/jetty_9.4'
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/84a18468
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/84a18468
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/84a18468
Branch: refs/heads/citest
Commit: 84a1846854922ad3b7254f94840bf845fcbaaa56
Parents: 661634c 6f28627
Author: olivier lamy <ol...@apache.org>
Authored: Thu May 18 13:53:17 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Thu May 18 13:53:17 2017 +1000
----------------------------------------------------------------------
.travis.yml | 2 -
archiva-jetty/src/main/assembly/bin.xml | 4 -
archiva-jetty/src/main/conf/jetty.xml | 337 +++++--------------
archiva-jetty/src/main/contexts/archiva.xml | 31 --
.../src/test/resources/log4j2-test.xml | 41 +++
.../archiva/proxy/HttpProxyTransferTest.java | 8 +-
.../indexing/DownloadRemoteIndexTaskTest.java | 18 +-
.../src/test/resources/log4j2-test.xml | 4 +-
.../archiva-rest/archiva-rest-services/pom.xml | 22 +-
.../rest/services/DefaultPluginsServices.java | 44 +--
.../src/test/resources/log4j2-test.xml | 9 +-
.../archiva-web/archiva-security/pom.xml | 2 +-
.../archiva-web/archiva-web-common/pom.xml | 12 +-
.../remotedownload/DownloadArtifactsTest.java | 16 +-
.../RemoteRepositoryConnectivityCheckTest.java | 13 +-
.../src/test/resources/log4j2-test.xml | 14 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../archiva-web/archiva-webdav/pom.xml | 5 +
...bstractRepositoryServletProxiedTestCase.java | 8 +-
.../webdav/ArchivaDavSessionProviderTest.java | 63 ++--
.../src/test/resources/log4j2-test.xml | 3 +-
pom.xml | 9 +-
22 files changed, 262 insertions(+), 405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84a18468/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84a18468/archiva-modules/archiva-web/archiva-security/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84a18468/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84a18468/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84a18468/pom.xml
----------------------------------------------------------------------