You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/06/18 17:20:51 UTC
svn commit: r1749075 - in /maven/plugins/trunk/maven-assembly-plugin/src:
main/java/org/apache/maven/plugins/assembly/
main/java/org/apache/maven/plugins/assembly/io/
main/java/org/apache/maven/plugins/assembly/mojos/
test/java/org/apache/maven/plugins...
Author: rfscholte
Date: Sat Jun 18 17:20:51 2016
New Revision: 1749075
URL: http://svn.apache.org/viewvc?rev=1749075&view=rev
Log:
[MASSEMBLY-818] Remove deprecated parameters for the single goal
Remove descriptorId; instead use descriptorRefs
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/io/DefaultAssemblyReader.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/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.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=1749075&r1=1749074&r2=1749075&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 17:20:51 2016
@@ -42,11 +42,6 @@ public interface AssemblerConfigurationS
String getDescriptor();
/**
- * @return The descriptor id.
- */
- String getDescriptorId();
-
- /**
* @return The descriptors.
*/
String[] getDescriptors();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java?rev=1749075&r1=1749074&r2=1749075&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java Sat Jun 18 17:20:51 2016
@@ -104,7 +104,6 @@ public class DefaultAssemblyReader
final List<Assembly> assemblies = new ArrayList<Assembly>();
final String descriptor = configSource.getDescriptor();
- final String descriptorId = configSource.getDescriptorId();
final String[] descriptors = configSource.getDescriptors();
final String[] descriptorRefs = configSource.getDescriptorReferences();
final File descriptorSourceDirectory = configSource.getDescriptorSourceDirectory();
@@ -115,12 +114,6 @@ public class DefaultAssemblyReader
addAssemblyFromDescriptor( descriptor, locator, configSource, assemblies );
}
- if ( descriptorId != null )
- {
- locator.setStrategies( refStrategies );
- addAssemblyForDescriptorReference( descriptorId, configSource, assemblies );
- }
-
if ( ( descriptors != null ) && ( descriptors.length > 0 ) )
{
locator.setStrategies( strategies );
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=1749075&r1=1749074&r2=1749075&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 17:20:51 2016
@@ -194,15 +194,6 @@ public abstract class AbstractAssemblyMo
private File archiveBaseDirectory;
/**
- * Predefined Assembly Descriptor Id's. You can select bin, jar-with-dependencies, or src.
- *
- * @deprecated Please use descriptorRefs instead
- */
- @Deprecated
- @Parameter( property = "descriptorId" )
- private String descriptorId;
-
- /**
* Assembly XML Descriptor file. This must be the path to your customized descriptor file.
*
* @deprecated Please use descriptors instead
@@ -659,19 +650,6 @@ public abstract class AbstractAssemblyMo
return descriptor;
}
- /**
- * {@inheritDoc}
- *
- * @deprecated This has been replaced by {@link #getDescriptorReferences()}
- */
- @Override
- @Deprecated
- public String getDescriptorId()
- {
- return descriptorId;
- }
-
-
@Override
public String[] getDescriptorReferences()
{
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java?rev=1749075&r1=1749074&r2=1749075&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java Sat Jun 18 17:20:51 2016
@@ -877,7 +877,7 @@ public class DefaultAssemblyReaderTest
final String assemblyFile = files.get( 0 );
- final List<Assembly> assemblies = performReadAssemblies( basedir, assemblyFile, null, null, null, null );
+ final List<Assembly> assemblies = performReadAssemblies( basedir, assemblyFile, null, null, null );
assertNotNull( assemblies );
assertEquals( 1, assemblies.size() );
@@ -897,7 +897,7 @@ public class DefaultAssemblyReaderTest
try
{
- performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, null, false );
+ performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, false );
fail( "Should fail when descriptor file is missing and ignoreDescriptors == false" );
}
@@ -917,7 +917,7 @@ public class DefaultAssemblyReaderTest
try
{
- performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, null, true );
+ performReadAssemblies( basedir, assemblyFile.getAbsolutePath(), null, null, null, true );
}
catch ( final AssemblyReadException e )
{
@@ -926,21 +926,6 @@ public class DefaultAssemblyReaderTest
}
}
- public void testReadAssemblies_ShouldGetAssemblyDescriptorFromSingleRef()
- throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
- {
- final File basedir = fileManager.createTempDir();
-
- final List<Assembly> assemblies = performReadAssemblies( basedir, null, "bin", null, null, null );
-
- assertNotNull( assemblies );
- assertEquals( 1, assemblies.size() );
-
- final Assembly result = assemblies.get( 0 );
-
- assertEquals( "bin", result.getId() );
- }
-
public void testReadAssemblies_ShouldGetAssemblyDescriptorFromFileArray()
throws IOException, AssemblyReadException, InvalidAssemblerConfigurationException
{
@@ -959,7 +944,7 @@ public class DefaultAssemblyReaderTest
final List<String> files = writeAssembliesToFile( assemblies, basedir );
final List<Assembly> results =
- performReadAssemblies( basedir, null, null, files.toArray( new String[files.size()] ), null, null );
+ performReadAssemblies( basedir, null, files.toArray( new String[files.size()] ), null, null );
assertNotNull( results );
assertEquals( 2, results.size() );
@@ -979,7 +964,7 @@ public class DefaultAssemblyReaderTest
final File basedir = fileManager.createTempDir();
final List<Assembly> assemblies =
- performReadAssemblies( basedir, null, null, null, new String[]{ "bin", "src" }, null );
+ performReadAssemblies( basedir, null, null, new String[]{ "bin", "src" }, null );
assertNotNull( assemblies );
assertEquals( 2, assemblies.size() );
@@ -1010,7 +995,7 @@ public class DefaultAssemblyReaderTest
writeAssembliesToFile( assemblies, basedir );
- final List<Assembly> results = performReadAssemblies( basedir, null, null, null, null, basedir );
+ final List<Assembly> results = performReadAssemblies( basedir, null, null, null, basedir );
assertNotNull( results );
assertEquals( 2, results.size() );
@@ -1043,7 +1028,7 @@ public class DefaultAssemblyReaderTest
fileManager.createFile( basedir, "readme.txt", "This is just a readme file, not a descriptor." );
- final List<Assembly> results = performReadAssemblies( basedir, null, null, null, null, basedir );
+ final List<Assembly> results = performReadAssemblies( basedir, null, null, null, basedir );
assertNotNull( results );
assertEquals( 2, results.size() );
@@ -1086,24 +1071,20 @@ public class DefaultAssemblyReaderTest
}
private List<Assembly> performReadAssemblies( final File basedir, final String descriptor,
- final String descriptorRef, final String[] descriptors,
- final String[] descriptorRefs, final File descriptorDir )
+ final String[] descriptors, final String[] descriptorRefs,
+ final File descriptorDir )
throws AssemblyReadException, InvalidAssemblerConfigurationException
{
- return performReadAssemblies( basedir, descriptor, descriptorRef, descriptors, descriptorRefs, descriptorDir,
- false );
+ return performReadAssemblies( basedir, descriptor, descriptors, descriptorRefs, descriptorDir, false );
}
private List<Assembly> performReadAssemblies( final File basedir, final String descriptor,
- final String descriptorRef, final String[] descriptors,
- final String[] descriptorRefs, final File descriptorDir,
- final boolean ignoreMissing )
+ final String[] descriptors, final String[] descriptorRefs,
+ final File descriptorDir, final boolean ignoreMissing )
throws AssemblyReadException, InvalidAssemblerConfigurationException
{
expect( configSource.getDescriptor() ).andReturn( descriptor );
- expect( configSource.getDescriptorId() ).andReturn( descriptorRef );
-
expect( configSource.getDescriptorReferences() ).andReturn( descriptorRefs );
expect( configSource.getDescriptors() ).andReturn( descriptors );