From 8bd81e6d6f21612cbf8c2ba0317cf5e155171575 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Tue, 17 Mar 2009 15:36:42 +0000 Subject: [PATCH] warnings from dependency tree consumer git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@755284 13f79535-47bb-0310-9956-ffa450edef68 --- .../dependencytree/DependencyTreeGeneratorConsumer.java | 8 ++++---- .../DependencyTreeGeneratorConsumerTest.java | 3 --- .../dependency/graph/tasks/RefineConflictsVisitor.java | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) 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 b5aa3eb9d..75772566e 100644 --- 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 getExcludes() { return null; } - public List getIncludes() + public List getIncludes() { return includes; } @@ -263,9 +263,9 @@ public class DependencyTreeGeneratorConsumer processedProjectCacheField.setAccessible( true ); } - rawProjectCacheField.set( projectBuilder, new HashMap() ); + rawProjectCacheField.set( projectBuilder, new HashMap() ); - processedProjectCacheField.set( projectBuilder, new HashMap() ); + processedProjectCacheField.set( projectBuilder, new HashMap() ); } 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 07a9d7ab8..a79ec1df7 100644 --- 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 acf0a517c..3b6f53835 100644 --- 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; -- 2.39.5