You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2006/09/02 02:45:56 UTC
svn commit: r439508 [2/2] - in
/maven/plugins/trunk/maven-assembly-plugin/src: it/file-sets/
it/file-sets/excluding-svn-dirs/ it/file-sets/excluding-svn-dirs/src/
it/file-sets/excluding-svn-dirs/src/main/
it/file-sets/excluding-svn-dirs/src/main/assemb...
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddArtifactTask.java Fri Sep 1 17:45:44 2006
@@ -35,8 +35,6 @@
private String outputFileNameMapping;
- private boolean includeBaseDirectory;
-
public AddArtifactTask( Artifact artifact )
{
this.artifact = artifact;
@@ -47,8 +45,7 @@
{
String destDirectory = outputDirectory;
- destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, project, configSource.getFinalName(),
- includeBaseDirectory );
+ destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, project, configSource.getFinalName() );
String fileNameMapping = AssemblyFormatUtils.evaluateFileNameMapping( outputFileNameMapping, artifact );
@@ -153,11 +150,6 @@
public void setFileNameMapping( String outputFileNameMapping )
{
this.outputFileNameMapping = outputFileNameMapping;
- }
-
- public void setIncludeBaseDirectory( boolean includeBaseDirectory )
- {
- this.includeBaseDirectory = includeBaseDirectory;
}
public void setOutputDirectory( String outputDirectory, String defaultOutputDirectory )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTask.java Fri Sep 1 17:45:44 2006
@@ -44,8 +44,6 @@
private final List dependencySets;
- private boolean includeBaseDirectory = true;
-
private final Logger logger;
private final MavenProject project;
@@ -87,12 +85,12 @@
{
DependencySet dependencySet = ( DependencySet ) i.next();
- addDependencySet( dependencySet, archiver, configSource, includeBaseDirectory );
+ addDependencySet( dependencySet, archiver, configSource );
}
}
protected void addDependencySet( DependencySet dependencySet, Archiver archiver,
- AssemblerConfigurationSource configSource, boolean includeBaseDirectory )
+ AssemblerConfigurationSource configSource )
throws AssemblyFormattingException, ArchiveCreationException
{
logger.info( "Processing DependencySet" );
@@ -127,7 +125,6 @@
task.setProject( depProject );
task.setOutputDirectory( dependencySet.getOutputDirectory(), defaultOutputDirectory );
task.setFileNameMapping( dependencySet.getOutputFileNameMapping(), defaultOutputFileNameMapping );
- task.setIncludeBaseDirectory( includeBaseDirectory );
task.setDirectoryMode( dependencySet.getDirectoryMode() );
task.setFileMode( dependencySet.getFileMode() );
task.setUnpack( dependencySet.isUnpack() );
@@ -179,8 +176,7 @@
String outputDirectory = dependencySet.getOutputDirectory();
outputDirectory =
- AssemblyFormatUtils.getOutputDirectory( outputDirectory, depProject, depProject.getBuild().getFinalName(),
- includeBaseDirectory );
+ AssemblyFormatUtils.getOutputDirectory( outputDirectory, depProject, depProject.getBuild().getFinalName() );
String destName =
AssemblyFormatUtils.evaluateFileNameMapping( dependencySet.getOutputFileNameMapping(), depArtifact );
@@ -204,16 +200,6 @@
{
throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e );
}
- }
-
- public boolean isIncludeBaseDirectory()
- {
- return includeBaseDirectory;
- }
-
- public void setIncludeBaseDirectory( boolean includeBaseDirectory )
- {
- this.includeBaseDirectory = includeBaseDirectory;
}
public List getDependencySets()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/task/AddFileSetsTask.java Fri Sep 1 17:45:44 2006
@@ -22,8 +22,6 @@
private final List fileSets;
- private boolean includeBaseDirectory = false;
-
private Logger logger;
private MavenProject project;
@@ -96,8 +94,7 @@
+ ( fileSet.getLineEnding() == null ? "" : " lineEndings: " + fileSet.getLineEnding() ) );
}
- destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, project, configSource.getFinalName(),
- includeBaseDirectory );
+ destDirectory = AssemblyFormatUtils.getOutputDirectory( destDirectory, project, configSource.getFinalName() );
logger.debug( "The archive base directory is '" + archiveBaseDir + "'" );
@@ -170,11 +167,6 @@
public void setLogger( Logger logger )
{
this.logger = logger;
- }
-
- public void setIncludeBaseDirectory( boolean includeBaseDirectory )
- {
- this.includeBaseDirectory = includeBaseDirectory;
}
public void setProject( MavenProject project )
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/interpolation/AssemblyInterpolator.java Fri Sep 1 17:45:44 2006
@@ -64,6 +64,7 @@
// ofnmBlacklistings.add( "finalName" );
blacklist.put( "outputFileNameMapping", ofnmBlacklistings );
+ blacklist.put( "outputDirectoryMapping", ofnmBlacklistings );
List odBlacklist = new ArrayList();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtils.java Fri Sep 1 17:45:44 2006
@@ -46,8 +46,7 @@
return distributionName;
}
- public static String getOutputDirectory( String output, MavenProject project, String finalName,
- boolean includeBaseDirectory )
+ public static String getOutputDirectory( String output, MavenProject project, String finalName )
{
String value = output;
if ( value == null )
@@ -55,18 +54,6 @@
value = "";
}
- if ( includeBaseDirectory )
- {
- if ( value.startsWith( "/" ) )
- {
- value = finalName + value;
- }
- else
- {
- value = finalName + "/" + value;
- }
- }
-
RegexBasedInterpolator interpolator = new RegexBasedInterpolator();
Properties specialExpressionOverrides = new Properties();
Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/mdo/descriptor.mdo Fri Sep 1 17:45:44 2006
@@ -117,6 +117,15 @@
</description>
</field>
<field>
+ <name>baseDirectory</name>
+ <version>1.0.0</version>
+ <type>String</type>
+ <description>
+ Sets the base directory of the resulting assembly archive. If this is not
+ set and includeBaseDirectory == true, ${project.build.finalName} will be used instead.
+ </description>
+ </field>
+ <field>
<name>includeSiteDirectory</name>
<type>boolean</type>
<defaultValue>false</defaultValue>
@@ -597,7 +606,7 @@
</description>
</field>
<field>
- <name>outputFileNameMapping</name>
+ <name>outputDirectoryMapping</name>
<version>1.0.0</version>
<type>String</type>
<defaultValue>${artifactId}</defaultValue>
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiverTest.java Fri Sep 1 17:45:44 2006
@@ -85,6 +85,9 @@
configSource.getTarLongFileMode();
csControl.setReturnValue( null );
+ configSource.getFinalName();
+ csControl.setReturnValue( "finalName" );
+
Assembly assembly = new Assembly();
mm.replayAll();
@@ -114,7 +117,7 @@
DefaultAssemblyArchiver subject =
createSubject( macArchiverManager.archiverManager, Collections.EMPTY_LIST, null );
- subject.createArchiver( "tar", TarLongFileMode.FAIL, filter );
+ subject.createArchiver( "tar", false, "finalName", TarLongFileMode.FAIL, filter );
assertNull( ttArchiver.compressionMethod );
assertEquals( TarLongFileMode.FAIL, ttArchiver.longFileMode.getValue() );
@@ -140,7 +143,7 @@
DefaultAssemblyArchiver subject =
createSubject( macArchiverManager.archiverManager, Collections.EMPTY_LIST, null );
- subject.createArchiver( "war", null, filter );
+ subject.createArchiver( "war", false, null, null, filter );
assertFalse( twArchiver.ignoreWebxml );
}
@@ -163,7 +166,7 @@
DefaultAssemblyArchiver subject =
createSubject( macArchiverManager.archiverManager, Collections.EMPTY_LIST, null );
- subject.createArchiver( "zip", null, filter );
+ subject.createArchiver( "zip", false, null, null, filter );
}
public void testConfigureArchiverFinalizers_ShouldDoNothingWhenNotSupportedByArchiver()
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java Fri Sep 1 17:45:44 2006
@@ -89,7 +89,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "final-name/file.txt", Integer.parseInt( "777", 8 ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.parseInt( "777", 8 ) );
assembly.addFile( fi );
@@ -134,7 +134,7 @@
fi.setLineEnding( "keep" );
fi.setFileMode( "777" );
- macArchiver.expectAddFile( file, "final-name/file.txt", Integer.parseInt( "777", 8 ) );
+ macArchiver.expectAddFile( file, "file.txt", Integer.parseInt( "777", 8 ) );
assembly.addFile( fi );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java Fri Sep 1 17:45:44 2006
@@ -230,7 +230,7 @@
public void testAddModuleBinaries_ShouldReturnImmediatelyWhenBinariesIsNull()
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
{
- createPhase( null, null ).addModuleBinaries( null, null, null, null, false );
+ createPhase( null, null ).addModuleBinaries( null, null, null, null );
}
public void testAddModuleBinaries_ShouldFilterPomModule()
@@ -258,8 +258,7 @@
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleBinaries( binaries, projects,
macTask.archiver,
- macTask.configSource,
- false );
+ macTask.configSource );
mm.verifyAll();
}
@@ -295,8 +294,7 @@
Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource,
- false );
+ createPhase( logger, null ).addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource );
mm.verifyAll();
}
@@ -364,7 +362,7 @@
ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
- phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, false );
+ phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource );
mm.verifyAll();
}
@@ -427,7 +425,7 @@
ModuleSetAssemblyPhase phase = createPhase( overrideLogger, macTask );
- phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource, false );
+ phase.addModuleBinaries( binaries, projects, macTask.archiver, macTask.configSource );
mm.verifyAll();
}
@@ -494,7 +492,7 @@
try
{
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, null,
- null, null, null, false );
+ null, null, null );
fail( "Expected ArchiveCreationException since artifact file is null." );
}
@@ -535,7 +533,7 @@
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addArtifact( macTask.artifact, project,
macTask.archiver,
macTask.configSource,
- binaries, false );
+ binaries );
mm.verifyAll();
}
@@ -548,7 +546,7 @@
mm.replayAll();
createPhase( new ConsoleLogger( Logger.LEVEL_DEBUG, "test" ), null ).addModuleSourceFileSets( null, null, null,
- null, false );
+ null );
mm.verifyAll();
}
@@ -593,8 +591,7 @@
Logger logger = new ConsoleLogger( Logger.LEVEL_DEBUG, "test" );
- createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource,
- false );
+ createPhase( logger, null ).addModuleSourceFileSets( sources, projects, macTask.archiver, macTask.configSource );
mm.verifyAll();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/RepositoryAssemblyPhaseTest.java Fri Sep 1 17:45:44 2006
@@ -91,7 +91,7 @@
File outDir = new File( tempRoot, "out" );
macArchiver.expectModeChange( -1, -1, mode, mode, true );
- macArchiver.expectAddDirectory( outDir, "final-name/out/", null, new String[0] );
+ macArchiver.expectAddDirectory( outDir, "out/", null, new String[0] );
macRepo.expectAssemble( outDir, repo, macCS.configSource );
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/task/AddDependencySetsTaskTest.java Fri Sep 1 17:45:44 2006
@@ -45,7 +45,7 @@
AddDependencySetsTask task =
new AddDependencySetsTask( Collections.singletonList( ds ), project, macTask.projectBuilder, macTask.dependencyResolver, logger );
- task.addDependencySet( ds, null, macTask.configSource, false );
+ task.addDependencySet( ds, null, macTask.configSource );
mockManager.verifyAll();
}
@@ -111,7 +111,7 @@
mockManager.replayAll();
- task.addDependencySet( ds, macTask.archiver, macTask.configSource, false );
+ task.addDependencySet( ds, macTask.archiver, macTask.configSource );
mockManager.verifyAll();
}
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java?rev=439508&r1=439507&r2=439508&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/utils/AssemblyFormatUtilsTest.java Fri Sep 1 17:45:44 2006
@@ -24,16 +24,6 @@
verifyDistroName( "assembly", null, "finalName", false, "finalName" );
}
- public void testGetDistroName_ShouldUseJustFinalNameWhenAppendAssemblyIdAndAssemblyIdIsNull()
- {
- verifyDistroName( null, "classifier", "finalName", true, "finalName" );
- }
-
- public void testGetDistroName_ShouldUseFinalNamePlusAssemblyIdNotClassifier()
- {
- verifyDistroName( "assembly", "classifier", "finalName", true, "finalName-assembly" );
- }
-
public void testGetDistroName_ShouldUseFinalNamePlusClassifierWhenAppendAssemblyIdIsNull()
{
verifyDistroName( "assembly", "classifier", "finalName", false, "finalName-classifier" );
@@ -41,52 +31,47 @@
public void testGetOutputDir_ShouldNotAlterOutDirWhenIncludeBaseFalseAndNoExpressions()
{
- verifyOutputDir( "dir/", "finalName", false, null, null, null, "dir/" );
+ verifyOutputDir( "dir/", "finalName", null, null, null, "dir/" );
}
public void testGetOutputDir_ShouldNotAlterOutDirWhenIncludeBaseFalseAndNoExpressions_CheckWithBackslash()
{
- verifyOutputDir( "dir\\", "finalName", false, null, null, null, "dir\\" );
+ verifyOutputDir( "dir\\", "finalName", null, null, null, "dir\\" );
}
public void testGetOutputDir_ShouldAppendSlashToOutDirWhenMissingAndIncludeBaseFalseAndNoExpressions()
{
- verifyOutputDir( "dir", "finalName", false, null, null, null, "dir/" );
- }
-
- public void testGetOutputDir_ShouldPrependFinalNameWhenIncludeBaseTrue()
- {
- verifyOutputDir( "dir/", "finalName", true, null, null, null, "finalName/dir/" );
+ verifyOutputDir( "dir", "finalName", null, null, null, "dir/" );
}
public void testGetOutputDir_ShouldResolveGroupIdInOutDir()
{
- verifyOutputDir( "${groupId}", "finalName", false, "group", null, null, "group/" );
+ verifyOutputDir( "${groupId}", "finalName", "group", null, null, "group/" );
}
public void testGetOutputDir_ShouldResolveArtifactIdInOutDir()
{
- verifyOutputDir( "${artifactId}", "finalName", false, null, "artifact", null, "artifact/" );
+ verifyOutputDir( "${artifactId}", "finalName", null, "artifact", null, "artifact/" );
}
public void testGetOutputDir_ShouldResolveVersionInOutDir()
{
- verifyOutputDir( "${version}", "finalName", false, null, null, "version", "version/" );
+ verifyOutputDir( "${version}", "finalName", null, null, "version", "version/" );
}
public void testGetOutputDir_ShouldResolveFinalNameInOutDir()
{
- verifyOutputDir( "${finalName}", "finalName", false, null, null, null, "finalName/" );
+ verifyOutputDir( "${finalName}", "finalName", null, null, null, "finalName/" );
}
public void testGetOutputDir_ShouldResolveBuildFinalNameInOutDir()
{
- verifyOutputDir( "${build.finalName}", "finalName", false, null, null, null, "finalName/" );
+ verifyOutputDir( "${build.finalName}", "finalName", null, null, null, "finalName/" );
}
public void testGetOutputDir_ShouldReturnEmptyPathWhenAllInputIsEmptyAndIncludeBaseFalse()
{
- verifyOutputDir( null, null, false, null, null, null, "" );
+ verifyOutputDir( null, null, null, null, null, "" );
}
public void testEvalFileNameMapping_ShouldPassExpressionThroughUnchanged() throws AssemblyFormattingException
@@ -142,7 +127,7 @@
mockManager.clear();
}
- private void verifyOutputDir( String outDir, String finalName, boolean includeBasedir, String groupId, String artifactId, String version, String checkValue )
+ private void verifyOutputDir( String outDir, String finalName, String groupId, String artifactId, String version, String checkValue )
{
MavenProject project = null;
@@ -156,7 +141,7 @@
project = new MavenProject( model );
}
- String result = AssemblyFormatUtils.getOutputDirectory( outDir, project, finalName, includeBasedir );
+ String result = AssemblyFormatUtils.getOutputDirectory( outDir, project, finalName );
assertEquals( checkValue, result );
}