avoid multiple slf4j binding in test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1367184 13f79535-47bb-0310-9956-ffa450edef68

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 888ec4258bf21663209bebe2b64a8564ce2f6468..66660f8db33b701df34280344e1c4467e237f87d 100644 (file)
--- 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 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>    
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 89e37193aede4aecb3e48cb206b1dc8745f0e266..2d3a1a2b515435532127f104e7850eeed23689a8 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -96,6 +96,12 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency> 
     
     <dependency>

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 3c78e0a34842c0b12bb26036ae2db2a631f2d3c0..9d054b565a099cdadeae1baee9caed6f2ae4d256 100644 (file)
--- 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 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>  
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 2285a1b2d05f7a903d2a5ab3a8013be0a1019488..6ed1f7cf39eaa8e0ba119947b0ff8d71b4f7c2f2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -144,6 +144,12 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency> 
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 99fc1a63c1dddae5913ab9d01979017b0b31bc49..b8ff669074041bf33a26c07ce082bbf1c10287e1 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -655,6 +655,12 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>  
   </dependencies>
 

diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 835a549192c1edbe7595c20a7943cafb0b76298b..e1b188e43fa5eb4927b79d7c8fa2eab0c79bdb29 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -91,6 +91,12 @@
       <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>

diff --git a/pom.xml b/pom.xml
index ff89daabba1fd1fa029306131386df44f93f2381..f98ce46a2158964f00b6f2f3f752972214646767 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <maven.version>2.0.8</maven.version>
     <maven-dependency-tree.version>1.2</maven-dependency-tree.version>
     <maven-model-converter.version>2.1</maven-model-converter.version>
-    <maven.indexer.version>4.1.3-SNAPSHOT</maven.indexer.version>
+    <maven.indexer.version>4.1.3</maven.indexer.version>
     <wagon.version>2.2</wagon.version>
     <redback.version>2.0-SNAPSHOT</redback.version>
     <redback.cache.version>2.0-SNAPSHOT</redback.cache.version>
@@ -1730,6 +1730,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.12.1</version>
           <configuration>
             <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
             <runOrder>alphabetical</runOrder>
@@ -1870,6 +1871,10 @@
         <enabled>true</enabled>
       </snapshots>
     </pluginRepository>
+    <pluginRepository>
+      <id>staged-releases</id>
+      <url>https://repository.apache.org/content/repositories/maven-096/</url>
+    </pluginRepository>
   </pluginRepositories>
 
 </project>