You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/14 13:48:14 UTC
svn commit: r1714312 - in /maven/shared/trunk/maven-mapping/src:
main/java/org/apache/maven/shared/mapping/
test/java/org/apache/maven/shared/mapping/
Author: khmarbaise
Date: Sat Nov 14 12:48:14 2015
New Revision: 1714312
URL: http://svn.apache.org/viewvc?rev=1714312&view=rev
Log:
Reformatted code.
Modified:
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
Modified: maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java?rev=1714312&r1=1714311&r2=1714312&view=diff
==============================================================================
--- maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java (original)
+++ maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/DashClassifierValueSource.java Sat Nov 14 12:48:14 2015
@@ -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$
*/
Modified: maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java?rev=1714312&r1=1714311&r2=1714312&view=diff
==============================================================================
--- maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java (original)
+++ maven/shared/trunk/maven-mapping/src/main/java/org/apache/maven/shared/mapping/MappingUtils.java Sat Nov 14 12:48:14 2015
@@ -29,8 +29,7 @@ import org.codehaus.plexus.interpolation
* 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
* <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
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 )
Modified: maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java?rev=1714312&r1=1714311&r2=1714312&view=diff
==============================================================================
--- maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java (original)
+++ maven/shared/trunk/maven-mapping/src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java Sat Nov 14 12:48:14 2015
@@ -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 ) );
}