Move all container to test

Author: cstamas

pom.xml

@@ -51,24 +51,12 @@
   </contributors>
 
   <dependencies>
-    <!-- Plexus container dependencies -->
+    <!-- JSR330 -->
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
       <version>1</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.sisu</groupId>
-      <artifactId>org.eclipse.sisu.plexus</artifactId>
-      <version>${sisuVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>5.1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <!-- Plexus dependencies -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -138,6 +126,19 @@
       <artifactId>slf4j-simple</artifactId>
       <version>${slf4jVersion}</version>
     </dependency>
+    <!-- Plexus container dependencies -->
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <version>${sisuVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>5.1.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/org/codehaus/plexus/archiver/jar/JarArchiver.java

@@ -48,8 +48,6 @@
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.zip.ConcurrentJarCreator;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
-import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.logging.console.ConsoleLogger;
 
 /**
  * Base class for tasks that build archives in JAR file format.
@@ -762,19 +760,17 @@ protected static String findJarName( String fileName, String[] classpath )
      *
      * @throws java.io.IOException
      */
-    protected static void grabFilesAndDirs( String file, List<String> dirs, List<String> files )
+    private void grabFilesAndDirs( String file, List<String> dirs, List<String> files )
         throws IOException
     {
         File zipFile = new File( file );
         if ( !zipFile.exists() )
         {
-            Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "console" );
-            logger.error( "JarArchive skipping non-existing file: " + zipFile.getAbsolutePath() );
+            getLogger().error( "JarArchive skipping non-existing file: " + zipFile.getAbsolutePath() );
         }
         else if ( zipFile.isDirectory() )
         {
-            Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, "console" );
-            logger.info( "JarArchiver skipping indexJar " + zipFile + " because it is not a jar" );
+            getLogger().info( "JarArchiver skipping indexJar " + zipFile + " because it is not a jar" );
         }
         else
         {

src/main/java/org/codehaus/plexus/archiver/util/FilterSupport.java

@@ -5,7 +5,7 @@
 import org.codehaus.plexus.archiver.ArchiveFileFilter;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.components.io.fileselectors.FileSelector;
-import org.codehaus.plexus.logging.Logger;
+import org.slf4j.Logger;
 
 /**
  * @deprecated Use {@link FileSelector} and {@link Archiver#addFileSet}.