This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-mapping.git
commit da04268085f8ae033dd8e8bb6b4048b2a1c055be Author: Karl Heinz Marbaise <[email protected]> AuthorDate: Sat Nov 14 12:48:14 2015 +0000 Reformatted code. git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1714312 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/shared/mapping/DashClassifierValueSource.java | 5 ++--- .../java/org/apache/maven/shared/mapping/MappingUtils.java | 11 +++++------ .../org/apache/maven/shared/mapping/MappingUtilsTest.java | 6 ++++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java index fd7e9fb..2524060 100644 --- a/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java +++ b/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java @@ -24,9 +24,8 @@ import java.util.Properties; import org.codehaus.plexus.interpolation.PropertiesBasedValueSource; /** - * This is a ValueSource, that can be used in an Interpolator. It supports - * special expressions, like <code>dashClassifier</code> and - * <code>dashClassifier?</code>. + * This is a ValueSource, that can be used in an Interpolator. It supports special expressions, like + * <code>dashClassifier</code> and <code>dashClassifier?</code>. * * @version $Id$ */ diff --git a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java index 6668527..ffeee81 100644 --- a/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java +++ b/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java @@ -29,8 +29,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator; * Utilities used to evaluate an expression. * </p> * <p> - * The expression might use any field of the {@link Artifact} interface. Some - * examples might be: + * The expression might use any field of the {@link Artifact} interface. Some examples might be: * </p> * <ul> * <li>@{artifactId}@-@{version}@@{dashClassifier?}@.@{extension}@</li> @@ -38,9 +37,8 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator; * <li>@{artifactId}@.@{extension}@</li> * </ul> * <p> - * Although parts of this code comes from the Assembly Plugin, it cannot be - * shared with the Assembly Plugin. The reason for this is that the Assembly - * Plugin always uses a prefix for the expressions, whereas this code does not. + * Although parts of this code comes from the Assembly Plugin, it cannot be shared with the Assembly Plugin. The reason + * for this is that the Assembly Plugin always uses a prefix for the expressions, whereas this code does not. * <p/> * * @author Stephane Nicoll @@ -50,6 +48,7 @@ import org.codehaus.plexus.interpolation.RegexBasedInterpolator; public class MappingUtils { public static final String DEFAULT_FILE_NAME_MAPPING = "@{artifactId}@-@{baseVersion}@.@{extension}@"; + public static final String DEFAULT_FILE_NAME_MAPPING_CLASSIFIER = "@{artifactId}@-@{baseVersion}@-@{classifier}@.@{extension}@"; @@ -57,7 +56,7 @@ public class MappingUtils * Evaluates the specified expression for the given artifact. * * @param expression the expression to evaluate - * @param artifact the artifact to use as value object for tokens + * @param artifact the artifact to use as value object for tokens * @return expression the evaluated expression */ public static String evaluateFileNameMapping( String expression, Artifact artifact ) diff --git a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java index e6d5e5c..b96ec54 100644 --- a/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java +++ b/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java @@ -54,7 +54,8 @@ public class MappingUtilsTest jar.setGroupId( "org.apache.sample" ); jar.setArtifactId( "maven-test-lib" ); jar.setVersion( "1.0" ); - assertEquals( "maven-test-lib.jar", MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) ); + assertEquals( "maven-test-lib.jar", + MappingUtils.evaluateFileNameMapping( "@{artifactId}@.@{extension}@", jar ) ); } @@ -66,7 +67,8 @@ public class MappingUtilsTest jar.setArtifactId( "maven-test-lib" ); jar.setVersion( "1.0" ); assertEquals( "org.apache.sample-maven-test-lib-1.0.jar", - MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@", jar ) ); + MappingUtils.evaluateFileNameMapping( "@{groupId}@-@{artifactId}@-@{version}@.@{extension}@", + jar ) ); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
