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 2013/05/12 15:39:04 UTC
svn commit: r1481555 - in
/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency:
fromConfiguration/ fromDependencies/ tree/ utils/
Author: hboutemy
Date: Sun May 12 13:39:04 2013
New Revision: 1481555
URL: http://svn.apache.org/r1481555
Log:
code formatting
Modified:
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/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/tree/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
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=1481555&r1=1481554&r2=1481555&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 Sun May 12 13:39:04 2013
@@ -172,8 +172,9 @@ public abstract class AbstractFromConfig
if ( StringUtils.isEmpty( artifactItem.getDestFileName() ) )
{
- artifactItem.setDestFileName(
- DependencyUtil.getFormattedFileName( artifactItem.getArtifact(), removeVersion, prependGroupId, useBaseVersion, removeClassifier) );
+ artifactItem.setDestFileName( DependencyUtil.getFormattedFileName( artifactItem.getArtifact(),
+ removeVersion, prependGroupId,
+ useBaseVersion, removeClassifier ) );
}
try
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=1481555&r1=1481554&r2=1481555&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 Sun May 12 13:39:04 2013
@@ -476,7 +476,7 @@ public class BuildClasspathMojo
{
this.outputProperty = theOutputProperty;
}
-
+
/**
* @return the fileSeparator
*/
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=1481555&r1=1481554&r2=1481555&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 Sun May 12 13:39:04 2013
@@ -126,7 +126,8 @@ public class CopyDependenciesMojo
{
for ( Artifact artifact : artifacts )
{
- copyArtifact( artifact, isStripVersion(), this.prependGroupId, this.useBaseVersion, this.stripClassifier );
+ copyArtifact( artifact, isStripVersion(), this.prependGroupId, this.useBaseVersion,
+ this.stripClassifier );
}
}
else
@@ -137,7 +138,7 @@ public class CopyDependenciesMojo
repositoryFactory.createDeploymentArtifactRepository( "local",
outputDirectory.toURL().toExternalForm(),
repositoryLayouts.get( "default" ),
- false /* uniqueVersion */);
+ false /* uniqueVersion */ );
for ( Artifact artifact : artifacts )
{
installArtifact( artifact, targetRepository );
@@ -159,7 +160,7 @@ public class CopyDependenciesMojo
{
copyPoms( getOutputDirectory(), artifacts, this.stripVersion );
copyPoms( getOutputDirectory(), skippedArtifacts,
- this.stripVersion, this.stripClassifier ); // Artifacts that already exist may not already have poms.
+ this.stripVersion, this.stripClassifier ); // Artifacts that already exist may not yet have poms
}
}
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=1481555&r1=1481554&r2=1481555&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 Sun May 12 13:39:04 2013
@@ -586,7 +586,8 @@ public class TreeMojo
ArtifactVersion recommendedVersion = allowedRange.getRecommendedVersion();
if ( recommendedVersion == null )
{
- @SuppressWarnings ("unchecked") List<Restriction> restrictions = allowedRange.getRestrictions();
+ @SuppressWarnings( "unchecked" )
+ List<Restriction> restrictions = allowedRange.getRestrictions();
for ( Restriction restriction : restrictions )
{
if ( restriction.containsVersion( theVersion ) )
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?rev=1481555&r1=1481554&r2=1481555&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java Sun May 12 13:39:04 2013
@@ -90,10 +90,10 @@ public final class DependencyUtil
* @return Formatted file name in the format
* [groupId].artifactId-[version]-[classifier].[type]
*/
- public static String getFormattedFileName( Artifact artifact, boolean removeVersion, boolean prependGroupId,
- boolean useBaseVersion )
+ public static String getFormattedFileName( Artifact artifact, boolean removeVersion, boolean prependGroupId,
+ boolean useBaseVersion )
{
- return getFormattedFileName(artifact, removeVersion, prependGroupId, useBaseVersion, false);
+ return getFormattedFileName( artifact, removeVersion, prependGroupId, useBaseVersion, false );
}
/**
@@ -144,7 +144,7 @@ public final class DependencyUtil
String classifierString = "";
- if (!removeClassifier && StringUtils.isNotEmpty( artifact.getClassifier() ) )
+ if ( !removeClassifier && StringUtils.isNotEmpty( artifact.getClassifier() ) )
{
classifierString = "-" + artifact.getClassifier();
}