warnings from dependency tree consumer

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
index b5aa3eb9d6faa5b5ddaad2fd344a5fcaac146c74..75772566ea055c6ade6d0fd85b267d7dd84224fa 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
@@ -159,12 +159,12 @@ public class DependencyTreeGeneratorConsumer
     {
     }
 
-    public List getExcludes()
+    public List<String> getExcludes()
     {
         return null;
     }
 
-    public List getIncludes()
+    public List<String> getIncludes()
     {
         return includes;
     }
@@ -263,9 +263,9 @@ public class DependencyTreeGeneratorConsumer
                 processedProjectCacheField.setAccessible( true );
             }
 
-            rawProjectCacheField.set( projectBuilder, new HashMap() );
+            rawProjectCacheField.set( projectBuilder, new HashMap<Object, Object>() );
 
-            processedProjectCacheField.set( projectBuilder, new HashMap() );
+            processedProjectCacheField.set( projectBuilder, new HashMap<Object, Object>() );
         }
         catch ( Exception e )
         {

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
index 07a9d7ab86b3bd52bc7b4eb9e5815f6e55f6eb16..a79ec1df73de0a45fdcde967d3c834cdb5119a40 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
@@ -29,7 +29,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.consumers.ConsumerException;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.profiles.DefaultProfileManager;
 import org.codehaus.plexus.spring.PlexusContainerAdapter;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.custommonkey.xmlunit.XMLAssert;
@@ -110,8 +109,6 @@ public class DependencyTreeGeneratorConsumerTest
         PlexusContainerAdapter container = new PlexusContainerAdapter();
         container.setApplicationContext( getApplicationContext() );
         
-        DefaultProfileManager m = new DefaultProfileManager( container );
-        
         consumer.beginScan( repository, null );
 
         String path = "org/apache/maven/surefire/surefire-testng/2.0/surefire-testng-2.0.pom";

diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
index acf0a517cb09a4c04c68a4c524fe8dffba472802..3b6f53835f1e189166904187b4c7f4acc5b889f1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
+++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
@@ -35,7 +35,6 @@ import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.comparators.ReverseComparator;
 import org.apache.commons.collections.functors.NotPredicate;
 import org.apache.commons.collections.list.TypedList;
-import org.apache.maven.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.dependency.graph.DependencyGraph;
 import org.apache.maven.archiva.dependency.graph.DependencyGraphEdge;
 import org.apache.maven.archiva.dependency.graph.DependencyGraphKeys;