Author: rfscholte
Date: Mon Jun 22 20:04:27 2015
New Revision: 1686926
URL: http://svn.apache.org/r1686926
Log:
Clean up code:
Add @Override, @Deprecated
Remove unnecessary casts
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.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/analyze/AbstractAnalyzeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.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/fromConfiguration/ArtifactItem.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/UnpackDependenciesMojo.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/ListRepositoriesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/GraphmlDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TGFDependencyNodeVisitor.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Mon Jun 22 20:04:27 2015
@@ -162,6 +162,7 @@ public abstract class AbstractDependency
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public final void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -183,6 +184,7 @@ public abstract class AbstractDependency
/**
* @return Returns the log.
*/
+ @Override
public Log getLog()
{
if ( log == null )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/DisplayAncestorsMojo.java
Mon Jun 22 20:04:27 2015
@@ -50,6 +50,7 @@ public class DisplayAncestorsMojo
@Parameter( defaultValue = "${project}", readonly = true )
private MavenProject project;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -45,7 +45,7 @@ import org.codehaus.plexus.util.StringUt
/**
* Resolves a single artifact, eventually transitively, from the specified
remote repositories.
- * Caveat: will always check thecentral repository defined in the super pom.
You could use a mirror entry in your
+ * Caveat: will always check the central repository defined in the super pom.
You could use a mirror entry in your
* <code>settings.xml</code>
*/
@Mojo( name = "get", requiresProject = false, threadSafe = true )
@@ -127,7 +127,7 @@ public class GetMojo
private String remoteRepositories;
/**
- * A string of the form
groupId:artifactId:version[:packaging][:classifier].
+ * A string of the form
groupId:artifactId:version[:packaging[:classifier]].
*/
@Parameter( property = "artifact" )
private String artifact;
@@ -152,6 +152,7 @@ public class GetMojo
@Parameter( property = "mdep.skip", defaultValue = "false" )
private boolean skip;
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -172,7 +173,7 @@ public class GetMojo
if ( tokens.length < 3 || tokens.length > 5 )
{
throw new MojoFailureException(
- "Invalid artifact, you must specify
groupId:artifactId:version[:packaging][:classifier] "
+ "Invalid artifact, you must specify
groupId:artifactId:version[:packaging[:classifier]] "
+ artifact );
}
groupId = tokens[0];
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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -64,6 +64,7 @@ public class PropertiesMojo
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
public void execute()
throws MojoExecutionException
{
@@ -73,7 +74,7 @@ public class PropertiesMojo
return;
}
- @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts =
getProject().getArtifacts();
+ 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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -229,6 +229,7 @@ public class PurgeLocalRepositoryMojo
this.directDependencyArtifacts = directDependencyArtifacts;
}
+ @Override
public boolean include( Artifact artifact )
{
if ( artifactsGAMatch( artifact, projectArtifact ) )
@@ -275,6 +276,7 @@ public class PurgeLocalRepositoryMojo
private class SystemScopeExcludeFilter
implements ArtifactFilter
{
+ @Override
public boolean include( Artifact artifact )
{
return !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() );
@@ -287,12 +289,14 @@ public class PurgeLocalRepositoryMojo
private class SnapshotsFilter
implements ArtifactFilter
{
+ @Override
public boolean include( Artifact artifact )
{
return artifact.isSnapshot();
}
}
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -502,7 +506,6 @@ public class PurgeLocalRepositoryMojo
resolver.resolveTransitively( artifacts,
project.getArtifact(), localRepository, remoteRepositories,
metadataSource, filter );
- @SuppressWarnings( "unchecked" )
Set<Artifact> resolvedArtifacts = result.getArtifacts();
return resolvedArtifacts;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AbstractAnalyzeMojo.java
Mon Jun 22 20:04:27 2015
@@ -232,6 +232,7 @@ public abstract class AbstractAnalyzeMoj
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -282,6 +283,7 @@ public abstract class AbstractAnalyzeMoj
}
}
+ @Override
public void contextualize( Context context )
throws ContextException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDepMgt.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDepMgt.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDepMgt.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDepMgt.java
Mon Jun 22 20:04:27 2015
@@ -90,6 +90,7 @@ public class AnalyzeDepMgt
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -149,7 +150,7 @@ public class AnalyzeDepMgt
}
// get dependencies for the project (including transitive)
- @SuppressWarnings( "unchecked" ) Set<Artifact>
allDependencyArtifacts =
+ Set<Artifact> allDependencyArtifacts =
new HashSet<Artifact>( project.getArtifacts() );
// don't warn if a dependency that is directly listed overrides
@@ -157,7 +158,7 @@ public class AnalyzeDepMgt
if ( this.ignoreDirect )
{
getLog().info( "\tIgnoring Direct Dependencies." );
- @SuppressWarnings( "unchecked" ) Set<Artifact>
directDependencies = project.getDependencyArtifacts();
+ Set<Artifact> directDependencies =
project.getDependencyArtifacts();
allDependencyArtifacts.removeAll( directDependencies );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeDuplicateMojo.java
Mon Jun 22 20:04:27 2015
@@ -67,6 +67,7 @@ public class AnalyzeDuplicateMojo
/**
* {@inheritDoc}
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/analyze/AnalyzeReportMojo.java
Mon Jun 22 20:04:27 2015
@@ -107,6 +107,7 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -165,6 +166,7 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputName()
*/
+ @Override
public String getOutputName()
{
return "dependency-analysis";
@@ -173,6 +175,7 @@ public class AnalyzeReportMojo
/*
* @see
org.apache.maven.reporting.AbstractMavenReport#getName(java.util.Locale)
*/
+ @Override
public String getName( Locale locale )
{
return getBundle( locale ).getString( "analyze.report.name" );
@@ -181,6 +184,7 @@ public class AnalyzeReportMojo
/*
* @see
org.apache.maven.reporting.AbstractMavenReport#getDescription(java.util.Locale)
*/
+ @Override
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "analyze.report.description" );
@@ -191,6 +195,7 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getProject()
*/
+ @Override
protected MavenProject getProject()
{
return project;
@@ -199,6 +204,7 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
*/
+ @Override
protected String getOutputDirectory()
{
getLog().info( outputDirectory.toString() );
@@ -209,6 +215,7 @@ public class AnalyzeReportMojo
/*
* @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
*/
+ @Override
protected Renderer getSiteRenderer()
{
return siteRenderer;
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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -19,6 +19,10 @@ package org.apache.maven.plugin.dependen
* under the License.
*/
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -38,11 +42,6 @@ import org.apache.maven.project.MavenPro
import
org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
/**
* Abstract parent class used by mojos that get Artifact information from the
plugin configuration as an ArrayList of
* ArtifactItems
@@ -278,7 +277,7 @@ public abstract class AbstractFromConfig
private Artifact getArtifactFomReactor( Artifact artifact )
{
// check project dependencies first off
- for ( Artifact a : (Set<Artifact>) project.getArtifacts() )
+ for ( Artifact a : project.getArtifacts() )
{
if ( equals( artifact, a ) && hasFile( a ) )
{
@@ -296,7 +295,7 @@ public abstract class AbstractFromConfig
}
// check any side artifacts
- for ( Artifact a : (List<Artifact>) p.getAttachedArtifacts() )
+ for ( Artifact a : p.getAttachedArtifacts() )
{
if ( equals( artifact, a ) && hasFile( a ) )
{
@@ -349,8 +348,8 @@ 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
+ List<Dependency> deps = project.getDependencies();
+ List<Dependency> depMngt = project.getDependencyManagement() == null
? Collections.<Dependency>emptyList()
: project.getDependencyManagement().getDependencies();
@@ -409,6 +408,7 @@ public abstract class AbstractFromConfig
*
* @return Returns the local.
*/
+ @Override
protected ArtifactRepository getLocal()
{
if ( this.overrideLocalRepository != null )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
Mon Jun 22 20:04:27 2015
@@ -248,6 +248,7 @@ public class ArtifactItem
this.classifier = filterEmptyString( classifier );
}
+ @Override
public String toString()
{
if ( this.classifier == null )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
Mon Jun 22 20:04:27 2015
@@ -97,6 +97,7 @@ public class CopyMojo
* @see #getArtifactItems
* @see #copyArtifact(ArtifactItem)
*/
+ @Override
protected void doExecute()
throws MojoExecutionException, MojoFailureException
{
@@ -134,6 +135,7 @@ public class CopyMojo
copyFile( artifactItem.getArtifact().getFile(), destFile );
}
+ @Override
protected ArtifactItemFilter getMarkedArtifactFilter( ArtifactItem item )
{
ArtifactItemFilter destinationNameOverrideFilter =
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
Mon Jun 22 20:04:27 2015
@@ -88,6 +88,7 @@ public class UnpackMojo
* @see #getArtifactItems
* @see #unpackArtifact(ArtifactItem)
*/
+ @Override
protected void doExecute()
throws MojoExecutionException, MojoFailureException
{
@@ -129,6 +130,7 @@ public class UnpackMojo
handler.setMarker();
}
+ @Override
ArtifactItemFilter getMarkedArtifactFilter( ArtifactItem item )
{
MarkerHandler handler = new UnpackFileMarkerHandler( item,
this.markersDirectory );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/BuildClasspathMojo.java
Mon Jun 22 20:04:27 2015
@@ -87,6 +87,7 @@ public class BuildClasspathMojo
* @since 2.0
* @deprecated use outputFile instead
*/
+ @Deprecated
@Parameter( property = "mdep.cpFile" )
private File cpFile;
@@ -191,6 +192,7 @@ public class BuildClasspathMojo
* @see #getDependencies
* @see #copyArtifact(Artifact, boolean)
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
@@ -420,6 +422,7 @@ public class BuildClasspathMojo
* <code>0</code> if this string is lexicographically less than
the string argument; and a value greater
* than <code>0</code> if this string is lexicographically greater
than the string argument.
*/
+ @Override
public int compare( Artifact art1, Artifact art2 )
{
if ( art1 == art2 )
@@ -441,6 +444,7 @@ public class BuildClasspathMojo
return s1.compareTo( s2 );
}
+ @Override
protected ArtifactsFilter getMarkedArtifactFilter()
{
return null;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/CopyDependenciesMojo.java
Mon Jun 22 20:04:27 2015
@@ -116,6 +116,7 @@ public class CopyDependenciesMojo
* @see #getDependencies
* @see #copyArtifact(Artifact, boolean)
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
@@ -318,6 +319,7 @@ public class CopyDependenciesMojo
return pomArtifact;
}
+ @Override
protected ArtifactsFilter getMarkedArtifactFilter()
{
return new DestFileFilter( this.overWriteReleases,
this.overWriteSnapshots, this.overWriteIfNewer,
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/UnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/UnpackDependenciesMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/UnpackDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromDependencies/UnpackDependenciesMojo.java
Mon Jun 22 20:04:27 2015
@@ -77,6 +77,7 @@ public class UnpackDependenciesMojo
* @see DependencyUtil#unpackFile(Artifact, File, File, ArchiverManager,
* Log)
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
@@ -99,6 +100,7 @@ public class UnpackDependenciesMojo
}
}
+ @Override
protected ArtifactsFilter getMarkedArtifactFilter()
{
return new MarkerFileFilter( this.overWriteReleases,
this.overWriteSnapshots, this.overWriteIfNewer,
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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -49,10 +49,11 @@ public class GoOfflineMojo
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
- @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts =
project.getArtifacts();
+ Set<Artifact> artifacts = project.getArtifacts();
if ( !silent )
{
@@ -63,6 +64,7 @@ public class GoOfflineMojo
}
}
+ @Override
protected ArtifactsFilter getMarkedArtifactFilter()
{
return null;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ListRepositoriesMojo.java
Mon Jun 22 20:04:27 2015
@@ -52,6 +52,7 @@ public class ListRepositoriesMojo
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
Mon Jun 22 20:04:27 2015
@@ -80,6 +80,7 @@ public class ResolveDependenciesMojo
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
@@ -112,6 +113,7 @@ public class ResolveDependenciesMojo
return this.results;
}
+ @Override
protected ArtifactsFilter getMarkedArtifactFilter()
{
return new ResolveFileFilter( new SourcesFileMarkerHandler(
this.markersDirectory ) );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
Mon Jun 22 20:04:27 2015
@@ -46,6 +46,7 @@ public class ResolveDependencySourcesMoj
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
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=1686926&r1=1686925&r2=1686926&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 22 20:04:27 2015
@@ -71,6 +71,7 @@ public class ResolvePluginsMojo
*
* @throws MojoExecutionException with a message if an error occurs.
*/
+ @Override
protected void doExecute()
throws MojoExecutionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/DOTDependencyNodeVisitor.java
Mon Jun 22 20:04:27 2015
@@ -51,6 +51,7 @@ public class DOTDependencyNodeVisitor
/**
* {@inheritDoc}
*/
+ @Override
public boolean visit( DependencyNode node )
{
if ( node.getParent() == null || node.getParent() == node )
@@ -73,6 +74,7 @@ public class DOTDependencyNodeVisitor
/**
* {@inheritDoc}
*/
+ @Override
public boolean endVisit( DependencyNode node )
{
if ( node.getParent() == null || node.getParent() == node )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/GraphmlDependencyNodeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/GraphmlDependencyNodeVisitor.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/GraphmlDependencyNodeVisitor.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/GraphmlDependencyNodeVisitor.java
Mon Jun 22 20:04:27 2015
@@ -68,6 +68,7 @@ public class GraphmlDependencyNodeVisito
/**
* {@inheritDoc}
*/
+ @Override
public boolean endVisit( DependencyNode node )
{
if ( node.getParent() == null || node.getParent() == node )
@@ -92,6 +93,7 @@ public class GraphmlDependencyNodeVisito
/**
* {@inheritDoc}
*/
+ @Override
public boolean visit( DependencyNode node )
{
if ( node.getParent() == null || node.getParent() == node )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TGFDependencyNodeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TGFDependencyNodeVisitor.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TGFDependencyNodeVisitor.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TGFDependencyNodeVisitor.java
Mon Jun 22 20:04:27 2015
@@ -79,6 +79,7 @@ public class TGFDependencyNodeVisitor
/**
* build a string representing the edge.
*/
+ @Override
public String toString()
{
StringBuilder result = new StringBuilder( generateId( from ) );
@@ -110,6 +111,7 @@ public class TGFDependencyNodeVisitor
/**
* {@inheritDoc}
*/
+ @Override
public boolean endVisit( DependencyNode node )
{
if ( node.getParent() == null || node.getParent() == node )
@@ -133,6 +135,7 @@ public class TGFDependencyNodeVisitor
/**
* {@inheritDoc}
*/
+ @Override
public boolean visit( DependencyNode node )
{
// write node
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/tree/TreeMojo.java
Mon Jun 22 20:04:27 2015
@@ -93,6 +93,7 @@ public class TreeMojo
*
* @deprecated use outputFile instead.
*/
+ @Deprecated
@Parameter( property = "output" )
private File output;
@@ -214,6 +215,7 @@ public class TreeMojo
/*
* @see org.apache.maven.plugin.Mojo#execute()
*/
+ @Override
public void execute()
throws MojoExecutionException, MojoFailureException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencySilentLog.java
Mon Jun 22 20:04:27 2015
@@ -35,6 +35,7 @@ public class DependencySilentLog
* @return <code>false</code>
* @see org.apache.maven.plugin.logging.Log#isDebugEnabled()
*/
+ @Override
public boolean isDebugEnabled()
{
return false;
@@ -45,6 +46,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence)
*/
+ @Override
public void debug( CharSequence content )
{
// nop
@@ -55,6 +57,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.CharSequence,
java.lang.Throwable)
*/
+ @Override
public void debug( CharSequence content, Throwable error )
{
// nop
@@ -65,6 +68,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#debug(java.lang.Throwable)
*/
+ @Override
public void debug( Throwable error )
{
// nop
@@ -74,6 +78,7 @@ public class DependencySilentLog
* @return <code>false</code>
* @see org.apache.maven.plugin.logging.Log#isInfoEnabled()
*/
+ @Override
public boolean isInfoEnabled()
{
return false;
@@ -84,6 +89,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence)
*/
+ @Override
public void info( CharSequence content )
{
// nop
@@ -94,6 +100,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#info(java.lang.CharSequence,
java.lang.Throwable)
*/
+ @Override
public void info( CharSequence content, Throwable error )
{
// nop
@@ -104,6 +111,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#info(java.lang.Throwable)
*/
+ @Override
public void info( Throwable error )
{
// nop
@@ -114,6 +122,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#isWarnEnabled()
*/
+ @Override
public boolean isWarnEnabled()
{
// nop
@@ -125,6 +134,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence)
*/
+ @Override
public void warn( CharSequence content )
{
// nop
@@ -135,6 +145,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.CharSequence,
java.lang.Throwable)
*/
+ @Override
public void warn( CharSequence content, Throwable error )
{
// nop
@@ -145,6 +156,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#warn(java.lang.Throwable)
*/
+ @Override
public void warn( Throwable error )
{
// nop
@@ -154,6 +166,7 @@ public class DependencySilentLog
* @return <code>false</code>
* @see org.apache.maven.plugin.logging.Log#isErrorEnabled()
*/
+ @Override
public boolean isErrorEnabled()
{
return false;
@@ -164,6 +177,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence)
*/
+ @Override
public void error( CharSequence content )
{
// nop
@@ -174,6 +188,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#error(java.lang.CharSequence,
java.lang.Throwable)
*/
+ @Override
public void error( CharSequence content, Throwable error )
{
// nop
@@ -184,6 +199,7 @@ public class DependencySilentLog
*
* @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable)
*/
+ @Override
public void error( Throwable error )
{
// nop
@@ -194,6 +210,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#debug(java.lang.String)
*/
+ @Override
public void debug( String message )
{
// nop
@@ -204,6 +221,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#debug(java.lang.String,
java.lang.Throwable)
*/
+ @Override
public void debug( String message, Throwable throwable )
{
// nop
@@ -214,6 +232,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#info(java.lang.String)
*/
+ @Override
public void info( String message )
{
// nop
@@ -224,6 +243,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#info(java.lang.String,
java.lang.Throwable)
*/
+ @Override
public void info( String message, Throwable throwable )
{
// nop
@@ -234,6 +254,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#warn(java.lang.String)
*/
+ @Override
public void warn( String message )
{
// nop
@@ -244,6 +265,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#warn(java.lang.String,
java.lang.Throwable)
*/
+ @Override
public void warn( String message, Throwable throwable )
{
// nop
@@ -254,6 +276,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#error(java.lang.String)
*/
+ @Override
public void error( String message )
{
// nop
@@ -264,6 +287,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#error(java.lang.String,
java.lang.Throwable)
*/
+ @Override
public void error( String message, Throwable throwable )
{
// nop
@@ -274,6 +298,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#fatalError(java.lang.String)
*/
+ @Override
public void fatalError( String message )
{
// nop
@@ -284,6 +309,7 @@ public class DependencySilentLog
*
* @see org.codehaus.plexus.logging.Logger#fatalError(java.lang.String,
java.lang.Throwable)
*/
+ @Override
public void fatalError( String message, Throwable throwable )
{
// nop
@@ -293,6 +319,7 @@ public class DependencySilentLog
* @return <code>false</code>
* @see org.codehaus.plexus.logging.Logger#isFatalErrorEnabled()
*/
+ @Override
public boolean isFatalErrorEnabled()
{
return false;
@@ -302,6 +329,7 @@ public class DependencySilentLog
* @return <code>null</code>
* @see org.codehaus.plexus.logging.Logger#getChildLogger(java.lang.String)
*/
+ @Override
public Logger getChildLogger( String name )
{
return null;
@@ -311,6 +339,7 @@ public class DependencySilentLog
* @return <code>0</code>
* @see org.codehaus.plexus.logging.Logger#getThreshold()
*/
+ @Override
public int getThreshold()
{
return 0;
@@ -319,6 +348,7 @@ public class DependencySilentLog
/**
* By default, do nothing
*/
+ @Override
public void setThreshold( int threshold )
{
// nop
@@ -328,6 +358,7 @@ public class DependencySilentLog
* @return <code>null</code>
* @see org.codehaus.plexus.logging.Logger#getName()
*/
+ @Override
public String getName()
{
return null;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
Mon Jun 22 20:04:27 2015
@@ -91,12 +91,13 @@ public class DestFileFilter
* @see
org.apache.mojo.dependency.utils.filters.ArtifactsFilter#filter(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set filter( Set artifacts )
+ @Override
+ public Set<Artifact> filter( Set<Artifact> artifacts )
throws ArtifactFilterException
{
Set<Artifact> result = new HashSet<Artifact>();
- for ( Artifact artifact : (Set<Artifact>) artifacts )
+ for ( Artifact artifact : artifacts )
{
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
@@ -261,6 +262,7 @@ public class DestFileFilter
this.useRepositoryLayout = useRepositoryLayout;
}
+ @Override
public boolean isArtifactIncluded( ArtifactItem item )
{
Artifact artifact = item.getArtifact();
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
Mon Jun 22 20:04:27 2015
@@ -61,12 +61,13 @@ public class MarkerFileFilter
* @see
org.apache.mojo.dependency.utils.filters.ArtifactsFilter#filter(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set filter( Set artifacts )
+ @Override
+ public Set<Artifact> filter( Set<Artifact> artifacts )
throws ArtifactFilterException
{
Set<Artifact> result = new HashSet<Artifact>();
- for ( Artifact artifact : (Set<Artifact>) artifacts )
+ for ( Artifact artifact : artifacts )
{
if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
@@ -76,6 +77,7 @@ public class MarkerFileFilter
return result;
}
+ @Override
public boolean isArtifactIncluded( ArtifactItem item )
throws ArtifactFilterException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
Mon Jun 22 20:04:27 2015
@@ -37,6 +37,7 @@ public class ResolveFileFilter
super( true, true, true, handler );
}
+ @Override
public boolean isArtifactIncluded( ArtifactItem item )
throws ArtifactFilterException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/DefaultFileMarkerHandler.java
Mon Jun 22 20:04:27 2015
@@ -69,6 +69,7 @@ public class DefaultFileMarkerHandler
* java.lang.SecurityManager#checkRead(java.lang.String)}</code>
* method denies read access to the file or directory
*/
+ @Override
public boolean isMarkerSet()
throws MojoExecutionException
{
@@ -76,6 +77,7 @@ public class DefaultFileMarkerHandler
return marker.exists();
}
+ @Override
public boolean isMarkerOlder( Artifact artifact1 )
throws MojoExecutionException
{
@@ -92,6 +94,7 @@ public class DefaultFileMarkerHandler
}
}
+ @Override
public void setMarker()
throws MojoExecutionException
{
@@ -147,6 +150,7 @@ public class DefaultFileMarkerHandler
* java.lang.SecurityManager#checkDelete}</code>
* method denies delete access to the file
*/
+ @Override
public boolean clearMarker()
throws MojoExecutionException
{
@@ -166,6 +170,7 @@ public class DefaultFileMarkerHandler
* @param artifact
* The artifact to set.
*/
+ @Override
public void setArtifact( Artifact artifact )
{
this.artifact = artifact;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/SourcesFileMarkerHandler.java
Mon Jun 22 20:04:27 2015
@@ -51,6 +51,7 @@ public class SourcesFileMarkerHandler
*
* @return File object for marker. The file is not guaranteed to exist.
*/
+ @Override
public File getMarkerFile()
{
return getMarkerFile( this.resolved );
@@ -90,6 +91,7 @@ public class SourcesFileMarkerHandler
* java.lang.SecurityManager#checkRead(java.lang.String)}</code>
* method denies read access to the file or directory
*/
+ @Override
public boolean isMarkerSet()
throws MojoExecutionException
{
@@ -100,6 +102,7 @@ public class SourcesFileMarkerHandler
return marker.exists() || marker2.exists();
}
+ @Override
public boolean isMarkerOlder( Artifact theArtifact )
throws MojoExecutionException
{
@@ -124,6 +127,7 @@ public class SourcesFileMarkerHandler
}
}
+ @Override
public void setMarker()
throws MojoExecutionException
{
@@ -169,6 +173,7 @@ public class SourcesFileMarkerHandler
* java.lang.SecurityManager#checkDelete}</code>
* method denies delete access to the file
*/
+ @Override
public boolean clearMarker()
throws MojoExecutionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/markers/UnpackFileMarkerHandler.java
Mon Jun 22 20:04:27 2015
@@ -44,6 +44,7 @@ public class UnpackFileMarkerHandler
setArtifactItem( artifactItem );
}
+ @Override
protected File getMarkerFile()
{
/**
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/resolvers/DefaultArtifactsResolver.java
Mon Jun 22 20:04:27 2015
@@ -61,6 +61,7 @@ public class DefaultArtifactsResolver
* @see
org.apache.mojo.dependency.utils.resolvers.ArtifactsResolver#resolve(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
+ @Override
public Set<Artifact> resolve( Set<Artifact> artifacts, Log log )
throws MojoExecutionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java?rev=1686926&r1=1686925&r2=1686926&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/translators/ClassifierTypeTranslator.java
Mon Jun 22 20:04:27 2015
@@ -54,6 +54,7 @@ public class ClassifierTypeTranslator
* @see
org.apache.mojo.dependency.utils.translators.ArtifactTranslator#translate(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
+ @Override
public Set<Artifact> translate( Set<Artifact> artifacts, Log log )
{
Set<Artifact> results;
