From b7eecb18c17173afb375f12c1d2fc5bae73cfd91 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 30 Jul 2012 17:27:33 +0000 Subject: [PATCH] avoid multiple slf4j binding in test git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1367184 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-repository-admin-default/pom.xml | 6 ++++++ .../archiva-scheduler/archiva-scheduler-indexing/pom.xml | 6 ++++++ .../archiva-web/archiva-rest/archiva-rest-services/pom.xml | 6 ++++++ archiva-modules/archiva-web/archiva-web-common/pom.xml | 6 ++++++ archiva-modules/archiva-web/archiva-webapp-js/pom.xml | 6 ++++++ archiva-modules/plugins/stage-repository-merge/pom.xml | 6 ++++++ pom.xml | 7 ++++++- 7 files changed, 42 insertions(+), 1 deletion(-) 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 888ec4258..66660f8db 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 @@ -97,6 +97,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + org.springframework diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 89e37193a..2d3a1a2b5 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -96,6 +96,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + 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 3c78e0a34..9d054b565 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 @@ -230,6 +230,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + org.springframework diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 2285a1b2d..6ed1f7cf3 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -144,6 +144,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + org.apache.maven.wagon diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 99fc1a63c..b8ff66907 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -655,6 +655,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 835a54919..e1b188e43 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -91,6 +91,12 @@ archiva-test-utils ${project.version} test + + + org.slf4j + slf4j-simple + + diff --git a/pom.xml b/pom.xml index ff89daabb..f98ce46a2 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.0.8 1.2 2.1 - 4.1.3-SNAPSHOT + 4.1.3 2.2 2.0-SNAPSHOT 2.0-SNAPSHOT @@ -1730,6 +1730,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.12.1 ${surefire.redirectTestOutputToFile} alphabetical @@ -1870,6 +1871,10 @@ true + + staged-releases + https://repository.apache.org/content/repositories/maven-096/ + -- 2.39.5