[MRM-1025] merge -r721944:723577 from former MRM-1025 branch, now aligned to trunk

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@825867 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 14 insertions, 9 deletions

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 4039c4575..ba13343ea 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-cli</artifactId>
@@ -35,7 +35,13 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-tree-consumer</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.3-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-metadata-consumer</artifactId>
+      <version>1.3-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
index 43cb75350..0c91aaf2b 100644
--- a/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
+++ b/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ArchivaCli.java
@@ -19,9 +19,6 @@ package org.apache.maven.archiva.cli;
  * under the License.
  */
 
-import com.sampullara.cli.Args;
-import com.sampullara.cli.Argument;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -34,6 +31,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import com.sampullara.cli.Args;
+import com.sampullara.cli.Argument;
+import org.apache.archiva.repository.scanner.RepositoryScanStatistics;
+import org.apache.archiva.repository.scanner.RepositoryScanner;
+import org.apache.archiva.repository.scanner.RepositoryScannerException;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -43,9 +45,6 @@ import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
 import org.apache.maven.archiva.converter.RepositoryConversionException;
 import org.apache.maven.archiva.converter.legacy.LegacyRepositoryConverter;
-import org.apache.maven.archiva.repository.RepositoryException;
-import org.apache.maven.archiva.repository.scanner.RepositoryScanStatistics;
-import org.apache.maven.archiva.repository.scanner.RepositoryScanner;
 import org.apache.maven.artifact.manager.WagonManager;
 import org.codehaus.plexus.spring.PlexusClassPathXmlApplicationContext;
 import org.codehaus.plexus.spring.PlexusToSpringUtils;
@@ -172,7 +171,7 @@ public class ArchivaCli
 
             System.out.println( "\n" + stats.toDump( repo ) );
         }
-        catch ( RepositoryException e )
+        catch ( RepositoryScannerException e )
         {
             e.printStackTrace( System.err );
         }