Author: rfscholte
Date: Sat Jun 18 16:29:34 2016
New Revision: 1749073
URL: http://svn.apache.org/viewvc?rev=1749073&view=rev
Log:
[MASSEMBLY-818] Remove deprecated parameters for the single goal
Remove classifier; instead the assemblyId (id in assembly xml) is used
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java?rev=1749073&r1=1749072&r2=1749073&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java
Sat Jun 18 16:29:34 2016
@@ -92,11 +92,6 @@ public interface AssemblerConfigurationS
boolean isAssemblyIdAppended();
/**
- * @return The classifier.
- */
- String getClassifier();
-
- /**
* @return Tar long file mode.
*/
String getTarLongFileMode();
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java?rev=1749073&r1=1749072&r2=1749073&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java
Sat Jun 18 16:29:34 2016
@@ -166,16 +166,6 @@ public abstract class AbstractAssemblyMo
private List<String> formats;
/**
- * This is the artifact classifier to be used for the resultant assembly
artifact. Normally, you would use the
- * assembly-id instead of specifying this here.
- *
- * @deprecated Please use the Assembly's id for classifier instead
- */
- @Deprecated
- @Parameter( property = "classifier" )
- private String classifier;
-
- /**
* A list of descriptor files to generate from.
*/
@Parameter
@@ -513,7 +503,6 @@ public abstract class AbstractAssemblyMo
this, isRecompressZippedFiles(),
getMergeManifestMode() );
final MavenProject project = getProject();
- final String classifier = getClassifier();
final String type = project.getArtifact().getType();
if ( attach && destFile.isFile() )
@@ -522,10 +511,6 @@ public abstract class AbstractAssemblyMo
{
projectHelper.attachArtifact( project, format,
assembly.getId(), destFile );
}
- else if ( classifier != null )
- {
- projectHelper.attachArtifact( project, format,
classifier, destFile );
- }
else if ( !"pom".equals( type ) && format.equals( type
) )
{
if ( !warnedAboutMainProjectArtifact )
@@ -840,18 +825,6 @@ public abstract class AbstractAssemblyMo
this.reactorProjects = reactorProjects;
}
- @Override
- public String getClassifier()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setClassifier( final String classifier )
- {
- this.classifier = classifier;
- }
-
public void setAppendAssemblyId( final boolean appendAssemblyId )
{
this.appendAssemblyId = appendAssemblyId;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java?rev=1749073&r1=1749072&r2=1749073&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
Sat Jun 18 16:29:34 2016
@@ -61,19 +61,11 @@ public final class AssemblyFormatUtils
{
final String finalName = configSource.getFinalName();
final boolean appendAssemblyId = configSource.isAssemblyIdAppended();
- final String classifier = configSource.getClassifier();
String distributionName = finalName;
if ( appendAssemblyId )
{
- if ( !StringUtils.isEmpty( assembly.getId() ) )
- {
- distributionName = finalName + "-" + assembly.getId();
- }
- }
- else if ( classifier != null )
- {
- distributionName = finalName + "-" + classifier;
+ distributionName = finalName + "-" + assembly.getId();
}
return distributionName;
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java?rev=1749073&r1=1749072&r2=1749073&view=diff
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
Sat Jun 18 16:29:34 2016
@@ -68,12 +68,12 @@ public class AssemblyFormatUtilsTest
public void
testGetDistroName_ShouldUseJustFinalNameWithNoAppendAssemblyIdOrClassifier()
{
- verifyDistroName( "assembly", null, "finalName", false, "finalName" );
+ verifyDistroName( "assembly", "finalName", false, "finalName" );
}
- public void
testGetDistroName_ShouldUseFinalNamePlusClassifierWhenAppendAssemblyIdIsNull()
+ public void testGetDistroName_ShouldUseFinalNamePlusAssemblyIdIsNull()
{
- verifyDistroName( "assembly", "classifier", "finalName", false,
"finalName-classifier" );
+ verifyDistroName( "assembly", "finalName", true, "finalName-assembly"
);
}
public void testGetOutputDir_ShouldResolveGroupIdInOutDir_UseArtifactInfo()
@@ -764,11 +764,11 @@ public class AssemblyFormatUtilsTest
mockManager.resetAll();
}
- private void verifyDistroName( final String assemblyId, final String
classifier, final String finalName,
- final boolean appendAssemblyId, final
String checkValue )
+ private void verifyDistroName( final String assemblyId, final String
finalName, final boolean appendAssemblyId,
+ final String checkValue )
{
final MockAndControlForGetDistroName mac =
- new MockAndControlForGetDistroName( finalName, appendAssemblyId,
classifier );
+ new MockAndControlForGetDistroName( finalName, appendAssemblyId );
mockManager.replayAll();
@@ -800,18 +800,14 @@ public class AssemblyFormatUtilsTest
{
final AssemblerConfigurationSource configSource;
- private final String classifier;
-
private final boolean isAssemblyIdAppended;
private final String finalName;
- public MockAndControlForGetDistroName( final String finalName, final
boolean isAssemblyIdAppended,
- final String classifier )
+ public MockAndControlForGetDistroName( final String finalName, final
boolean isAssemblyIdAppended )
{
this.finalName = finalName;
this.isAssemblyIdAppended = isAssemblyIdAppended;
- this.classifier = classifier;
configSource = mockManager.createMock(
AssemblerConfigurationSource.class );
@@ -820,8 +816,6 @@ public class AssemblyFormatUtilsTest
private void enableExpectations()
{
- expect( configSource.getClassifier() ).andReturn( classifier
).atLeastOnce();
-
expect( configSource.isAssemblyIdAppended() ).andReturn(
isAssemblyIdAppended ).atLeastOnce();
expect( configSource.getFinalName() ).andReturn( finalName
).atLeastOnce();
