From 68365364e30adf7fb5f08896c1e3da5da73b5bdb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 4 Feb 2012 22:17:53 +0000 Subject: [PATCH] add wagon-http-lightweight as dependency to prevent CNFE in tests git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240629 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-core-consumers/pom.xml | 5 +++++ .../archiva-lucene-consumers/pom.xml | 5 +++++ .../archiva-base/archiva-indexer/pom.xml | 5 +++++ .../archiva-base/archiva-proxy/pom.xml | 7 +++++++ .../archiva-repository-admin-default/pom.xml | 5 +++++ .../archiva-scheduler-indexing/pom.xml | 6 ++++++ .../archiva-scheduler-repository/pom.xml | 5 +++++ .../archiva-rest/archiva-rest-services/pom.xml | 6 ++++++ .../archiva-web/archiva-web-common/pom.xml | 5 +++++ .../archiva-web/archiva-webapp-js/pom.xml | 15 +++++++++++++++ .../archiva-web/archiva-webdav/pom.xml | 5 +++++ .../plugins/stage-repository-merge/pom.xml | 5 +++++ 12 files changed, 74 insertions(+) diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 00536d687..131fcd3d5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -106,6 +106,11 @@ redback-common-test-resources test + + org.apache.maven.wagon + wagon-http-lightweight + provided + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index f6176a152..79367598a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -83,6 +83,11 @@ archiva-repository-admin-default test + + org.apache.maven.wagon + wagon-http-lightweight + provided + org.apache.archiva metadata-store-jcr diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index e5cfb9e0e..3e9371326 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -147,6 +147,11 @@ redback-common-test-resources test + + org.apache.maven.wagon + wagon-http-lightweight + provided + diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 41d3b39a5..7855c6b03 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -119,6 +119,11 @@ + + org.apache.maven.wagon + wagon-http-lightweight + provided + org.slf4j slf4j-simple @@ -172,6 +177,8 @@ org.apache.archiva.proxy.common;version=${project.version}, org.apache.archiva.repository*;version=${project.version}, org.apache.archiva.scheduler*;version=${project.version}, + org.apache.archiva.admin.model;version=${project.version}, + org.apache.archiva.admin.model.networkproxy;version=${project.version}, org.apache.commons.collections;version="[3.2,4)", org.apache.commons.io;version="[1.4,2)", org.apache.commons.lang;version="[2.4,3)", diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index 32e723088..052175bc3 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -77,6 +77,11 @@ + + org.apache.maven.wagon + wagon-http-lightweight + provided + org.apache.httpcomponents httpclient diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 03c217e95..60b711926 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -117,6 +117,12 @@ provided + + org.apache.maven.wagon + wagon-http-lightweight + provided + + org.codehaus.redback redback-common-test-resources diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index 2f5992008..7097d08b5 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -67,6 +67,11 @@ wagon-http provided + + org.apache.maven.wagon + wagon-http-lightweight + provided + org.apache.archiva archiva-repository-layer diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 97ee00ec1..8bdd8d35e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -267,6 +267,12 @@ test + + org.apache.maven.wagon + wagon-http-lightweight + test + + diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index df214052a..cd73824a5 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -150,6 +150,11 @@ + + org.apache.maven.wagon + wagon-http-lightweight + test + diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 0997d144f..83f044cc5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -222,6 +222,21 @@ org.apache.archiva archiva-proxy + + org.apache.maven.wagon + wagon-http + runtime + + + org.apache.maven.wagon + wagon-http-lightweight + runtime + + + org.apache.maven.wagon + wagon-file + runtime + org.apache.archiva archiva-repository-layer diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index c1fed8cd6..af80d3331 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -171,6 +171,11 @@ + + org.apache.maven.wagon + wagon-http-lightweight + test + httpunit httpunit diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index ac01469ec..447510c3c 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -81,6 +81,11 @@ + + org.apache.maven.wagon + wagon-http-lightweight + test + -- 2.39.5