svn commit: r755284 - in /archiva/trunk/archiva-modules/archiva-base: archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/ archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apa...

[br...@apache.org]

Author: brett
Date: Tue Mar 17 15:36:42 2009
New Revision: 755284

URL: http://svn.apache.org/viewvc?rev=755284&view=rev
Log:
warnings from dependency tree consumer

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
    archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java?rev=755284&r1=755283&r2=755284&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/main/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumer.java Tue Mar 17 15:36:42 2009
@@ -159,12 +159,12 @@
     {
     }
 
-    public List getExcludes()
+    public List<String> getExcludes()
     {
         return null;
     }
 
-    public List getIncludes()
+    public List<String> getIncludes()
     {
         return includes;
     }
@@ -263,9 +263,9 @@
                 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 )
         {

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java?rev=755284&r1=755283&r2=755284&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/src/test/java/org/apache/archiva/consumers/dependencytree/DependencyTreeGeneratorConsumerTest.java Tue Mar 17 15:36:42 2009
@@ -29,7 +29,6 @@
 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 @@
         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";

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java?rev=755284&r1=755283&r2=755284&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-dependency-graph/src/main/java/org/apache/maven/archiva/dependency/graph/tasks/RefineConflictsVisitor.java Tue Mar 17 15:36:42 2009
@@ -35,7 +35,6 @@
 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;