You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/06/11 23:56:25 UTC
svn commit: r1349044 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency:
./ fromConfiguration/ resolvers/
Author: hboutemy
Date: Mon Jun 11 21:56:24 2012
New Revision: 1349044
URL: http://svn.apache.org/viewvc?rev=1349044&view=rev
Log:
suppress warnings
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractAnalyzeMojo.java Mon Jun 11 21:56:24 2012
@@ -210,8 +210,11 @@ public abstract class AbstractAnalyzeMoj
throw new MojoExecutionException( "Cannot analyze dependencies", exception );
}
+ @SuppressWarnings( "unchecked" )
Set<Artifact> usedDeclared = analysis.getUsedDeclaredArtifacts();
+ @SuppressWarnings( "unchecked" )
Set<Artifact> usedUndeclared = analysis.getUsedUndeclaredArtifacts();
+ @SuppressWarnings( "unchecked" )
Set<Artifact> unusedDeclared = analysis.getUnusedDeclaredArtifacts();
if ( ignoreNonCompile )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Mon Jun 11 21:56:24 2012
@@ -270,6 +270,7 @@ public abstract class AbstractDependency
DependencyUtil.cleanToBeTokenizedString( this.excludeArtifactIds ) ) );
// start with all artifacts.
+ @SuppressWarnings( "unchecked" )
Set<Artifact> artifacts = project.getArtifacts();
// perform filtering
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java Mon Jun 11 21:56:24 2012
@@ -137,6 +137,7 @@ public class AnalyzeDepMgt
}
// get dependencies for the project (including transitive)
+ @SuppressWarnings( "unchecked" )
Set<Artifact> allDependencyArtifacts = new HashSet<Artifact>( project.getArtifacts() );
// don't warn if a dependency that is directly listed overrides
@@ -144,6 +145,7 @@ public class AnalyzeDepMgt
if ( this.ignoreDirect )
{
getLog().info( "\tIgnoring Direct Dependencies." );
+ @SuppressWarnings( "unchecked" )
Set<Artifact> directDependencies = project.getDependencyArtifacts();
allDependencyArtifacts.removeAll( directDependencies );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java Mon Jun 11 21:56:24 2012
@@ -128,6 +128,7 @@ public class AnalyzeReportMojo
//remove everything that's not in the compile scope
if ( ignoreNonCompile )
{
+ @SuppressWarnings( "unchecked" )
Set<Artifact> filteredUnusedDeclared = new HashSet<Artifact>( analysis.getUnusedDeclaredArtifacts() );
Iterator<Artifact> iter = filteredUnusedDeclared.iterator();
while ( iter.hasNext() )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java Mon Jun 11 21:56:24 2012
@@ -64,6 +64,7 @@ public class AnalyzeReportView
}
else
{
+ @SuppressWarnings( "unchecked" )
Iterator<Artifact> iter = analysis.getUsedDeclaredArtifacts().iterator();
generateDependenciesTable( sink, iter );
}
@@ -83,6 +84,7 @@ public class AnalyzeReportView
}
else
{
+ @SuppressWarnings( "unchecked" )
Iterator<Artifact> iter = analysis.getUsedUndeclaredArtifacts().iterator();
generateDependenciesTable( sink, iter );
}
@@ -102,6 +104,7 @@ public class AnalyzeReportView
}
else
{
+ @SuppressWarnings( "unchecked" )
Iterator<Artifact> iter = analysis.getUnusedDeclaredArtifacts().iterator();
generateDependenciesTable( sink, iter );
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/GetMojo.java Mon Jun 11 21:56:24 2012
@@ -79,7 +79,7 @@ public class GetMojo
*
* @component role="org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout"
*/
- private Map repositoryLayouts;
+ private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
/**
* @component
@@ -168,7 +168,7 @@ public class GetMojo
* @required
* @readonly
*/
- private List pomRemoteRepositories;
+ private List<ArtifactRepository> pomRemoteRepositories;
/**
* Download transitively, retrieving the specified artifact and all of its dependencies.
@@ -315,7 +315,7 @@ public class GetMojo
private ArtifactRepositoryLayout getLayout( String id )
throws MojoFailureException
{
- ArtifactRepositoryLayout layout = (ArtifactRepositoryLayout) repositoryLayouts.get( id );
+ ArtifactRepositoryLayout layout = repositoryLayouts.get( id );
if ( layout == null )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PropertiesMojo.java Mon Jun 11 21:56:24 2012
@@ -58,6 +58,7 @@ public class PropertiesMojo
public void execute()
throws MojoExecutionException
{
+ @SuppressWarnings( "unchecked" )
Set<Artifact> artifacts = getProject().getArtifacts();
for ( Artifact artifact : artifacts )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java Mon Jun 11 21:56:24 2012
@@ -225,6 +225,7 @@ public class PurgeLocalRepositoryMojo
{
Map<String, Artifact> artifactMap = Collections.emptyMap();
+ @SuppressWarnings( "unchecked" )
List<Dependency> dependencies = project.getDependencies();
List<ArtifactRepository> remoteRepositories = Collections.emptyList();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java Mon Jun 11 21:56:24 2012
@@ -491,6 +491,7 @@ public class TreeMojo
ArtifactVersion recommendedVersion = allowedRange.getRecommendedVersion();
if ( recommendedVersion == null )
{
+ @SuppressWarnings( "unchecked" )
List<Restriction> restrictions = allowedRange.getRestrictions();
for ( Restriction restriction : restrictions )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Mon Jun 11 21:56:24 2012
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
@@ -39,7 +38,6 @@ import org.apache.maven.plugin.dependenc
import org.apache.maven.plugin.dependency.utils.filters.ArtifactItemFilter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -360,7 +358,9 @@ public abstract class AbstractFromConfig
private void fillMissingArtifactVersion( ArtifactItem artifact )
throws MojoExecutionException
{
+ @SuppressWarnings( "unchecked" )
List<Dependency> deps = project.getDependencies();
+ @SuppressWarnings( "unchecked" )
List<Dependency> depMngt = project.getDependencyManagement() == null
? Collections.<Dependency>emptyList()
: project.getDependencyManagement().getDependencies();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java Mon Jun 11 21:56:24 2012
@@ -53,6 +53,7 @@ public class GoOfflineMojo
public void execute()
throws MojoExecutionException
{
+ @SuppressWarnings( "unchecked" )
Set<Artifact> artifacts = project.getArtifacts();
if ( !silent )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=1349044&r1=1349043&r2=1349044&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Mon Jun 11 21:56:24 2012
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.plugin.MojoExecutionException;
@@ -53,7 +54,7 @@ public class ResolvePluginsMojo
* @required
* @readonly
*/
- private List remotePluginRepositories;
+ private List<ArtifactRepository> remotePluginRepositories;
/**
* If we should exclude transitive dependencies
@@ -170,7 +171,9 @@ public class ResolvePluginsMojo
protected Set<Artifact> resolvePluginArtifacts()
throws ArtifactResolutionException, ArtifactNotFoundException
{
+ @SuppressWarnings( "unchecked" )
Set<Artifact> plugins = project.getPluginArtifacts();
+ @SuppressWarnings( "unchecked" )
Set<Artifact> reports = project.getReportArtifacts();
Set<Artifact> artifacts = new HashSet<Artifact>();