[MASSEMBLY-871] Descriptor ref "bin" causes error messages in the build log on Windows
This closes #10
diff --git a/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml b/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
index 3da12b6..2056adf 100644
--- a/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
+++ b/src/it/projects/basic-features/ExecutionRoot/src/assemble/src.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>**/*.log</exclude>
<exclude>target/**</exclude>
diff --git a/src/it/projects/basic-features/add-classpath/assembly.xml b/src/it/projects/basic-features/add-classpath/assembly.xml
index 24a3523..60752fb 100644
--- a/src/it/projects/basic-features/add-classpath/assembly.xml
+++ b/src/it/projects/basic-features/add-classpath/assembly.xml
@@ -33,7 +33,7 @@
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
diff --git a/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml b/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml
index 28c8e3b..a5b47c5 100644
--- a/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml
+++ b/src/it/projects/basic-features/file-copyIntoTopDir/src/assemble/bin.xml
@@ -30,7 +30,7 @@
<files>
<file>
<source>TODO.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</file>
</files>
</assembly>
diff --git a/src/it/projects/basic-features/formats/src/assemblies/format-test.xml b/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
index e37f556..a283046 100644
--- a/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
+++ b/src/it/projects/basic-features/formats/src/assemblies/format-test.xml
@@ -39,7 +39,7 @@
<files>
<file>
<source>TODO.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</file>
</files>
</assembly>
diff --git a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
index d4b60eb..c798ed3 100644
--- a/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
+++ b/src/it/projects/basic-features/massembly-351-projectPrefixInterp/src/main/assembly/myassembly.xml
@@ -31,21 +31,21 @@
<fileSets>
<fileSet>
<directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
+ <outputDirectory>files</outputDirectory>
<includes>
<include>${artifactId}1.file</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
+ <outputDirectory>files</outputDirectory>
<includes>
<include>${pom.artifactId}2.file</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/files</directory>
- <outputDirectory>/files</outputDirectory>
+ <outputDirectory>files</outputDirectory>
<includes>
<include>${project.artifactId}3.file</include>
</includes>
diff --git a/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml b/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml
index 2e61f95..e548151 100644
--- a/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml
+++ b/src/it/projects/bugs/massembly-375/src/main/assembly/test.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>src/main/assembly</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>test.txt</include>
</includes>
diff --git a/src/it/projects/bugs/massembly-732/assembly.xml b/src/it/projects/bugs/massembly-732/assembly.xml
index 404839d..55a0bd9 100644
--- a/src/it/projects/bugs/massembly-732/assembly.xml
+++ b/src/it/projects/bugs/massembly-732/assembly.xml
@@ -26,7 +26,7 @@
<files>
<file>
<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<destName>${project.build.finalName}.jar</destName>
</file>
</files>
diff --git a/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml b/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml
index d5bb3d6..265047c 100644
--- a/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml
+++ b/src/it/projects/bugs/massembly-733/src/main/assembly/bin.xml
@@ -27,8 +27,8 @@
<files>
<file>
- <outputDirectory>/root</outputDirectory>
<source>src/main/assembly/bin.xml</source>
+ <outputDirectory>root</outputDirectory>
</file>
</files>
diff --git a/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml b/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml
index 5f2b74e..d9e5042 100644
--- a/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml
+++ b/src/it/projects/bugs/massembly-739/src/main/assembly/assembly.xml
@@ -31,8 +31,8 @@
</dependencySets>
<fileSets>
<fileSet>
- <outputDirectory>/bin</outputDirectory>
<directory>${basedir}/src/main/scripts</directory>
+ <outputDirectory>bin</outputDirectory>
</fileSet>
</fileSets>
</assembly>
diff --git a/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml b/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
index e8ad93e..d5ccd0b 100644
--- a/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
+++ b/src/it/projects/container-descriptors/configured-handler/src/assemble/bin.xml
@@ -30,7 +30,7 @@
<fileSets>
<fileSet>
<directory>src/config</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml
index 6b86e1d..2b2d764 100644
--- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml
+++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/assembly/src/assemble/bin.xml
@@ -32,7 +32,7 @@
<fileSets>
<fileSet>
<directory>src/config</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</fileSet>
</fileSets>
diff --git a/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml b/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml
index 6974e86..0207e52 100644
--- a/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml
+++ b/src/it/projects/dependency-sets/include-project-attachments/src/main/assembly/src.xml
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>target</exclude>
</excludes>
diff --git a/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml b/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
index 4a004f3..0a3def8 100644
--- a/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
+++ b/src/it/projects/file-sets/excludes-using-regex/src/assemble/src.xml
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>**/*.log</exclude>
<exclude>%regex[(?!((?!target/)[^/]+/)*src/).*target.*]</exclude>
diff --git a/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml b/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
index fb4abd0..cbc06e0 100644
--- a/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
+++ b/src/it/projects/file-sets/filtered-module-sources/src/main/assembly/src.xml
@@ -34,7 +34,7 @@
<sources>
<fileSets>
<fileSet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<directory>src/main/assembly-resources</directory>
<filtered>true</filtered>
</fileSet>
diff --git a/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml b/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
index 2fbfdbe..9800c04 100644
--- a/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
+++ b/src/it/projects/file-sets/filtered-multimodule/child/src/main/assembly/src.xml
@@ -28,7 +28,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<directory>src/main/assembly-resources</directory>
<filtered>true</filtered>
</fileSet>
diff --git a/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml b/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
index f3e2f5f..4f8f82b 100644
--- a/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
+++ b/src/it/projects/file-sets/multimodule-unix-lineEndings/child/src/main/assembly/src.xml
@@ -28,7 +28,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<directory>src/main/assembly-resources</directory>
<filtered>true</filtered>
<lineEnding>unix</lineEnding>
diff --git a/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml b/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
index fde76f4..5de4d33 100644
--- a/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
+++ b/src/it/projects/file-sets/multimodule-win-lineEndings/child/src/main/assembly/src.xml
@@ -28,7 +28,7 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<directory>src/main/assembly-resources</directory>
<filtered>true</filtered>
<lineEnding>crlf</lineEnding>
diff --git a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml b/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
index 57f5922..907792f 100755
--- a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
+++ b/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/src/main/assemblies/prod-assemble.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<directory>src/main/filtered-config</directory>
- <outputDirectory>/config</outputDirectory>
+ <outputDirectory>config</outputDirectory>
<filtered>true</filtered>
</fileSet>
</fileSets>
diff --git a/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml b/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml
index e347357..df4553b 100644
--- a/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml
+++ b/src/it/projects/mojo-configuration/archiver-ignorePermissions/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>target/**</exclude>
</excludes>
diff --git a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
index 9eafc13..3328fa9 100644
--- a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
+++ b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src.xml
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/target/**</exclude>
diff --git a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
index 4d836ed..3597206 100644
--- a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
+++ b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/src/main/assembly/src2.xml
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/target/**</exclude>
diff --git a/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml b/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
index 3b22579..5e31950 100644
--- a/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
+++ b/src/it/projects/mojo-configuration/massembly-291/src/main/assembly/src.xml
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>build.log</exclude>
diff --git a/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml b/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
index 3b22579..5e31950 100644
--- a/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
+++ b/src/it/projects/mojo-configuration/massembly-301/src/main/assembly/src.xml
@@ -29,7 +29,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>build.log</exclude>
diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
index 9593128..f496d05 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java
@@ -480,15 +480,15 @@
{
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
- if ( isLinuxRootReference( destDirectory ) )
+ if ( isUnixRootReference( destDirectory ) )
{
- logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific root-relative-reference"
- + " (starting with slash) " + destDirectory );
+ logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific root-relative reference"
+ + " (starting with slash): " + destDirectory );
}
else if ( isWindowsPath( destDirectory ) )
{
- logger.warn( "The assembly descriptor contains a *nix-specific root-relative-reference"
- + " (starting with slash). This is non-portable and will fail on windows "
+ logger.warn( "The assembly descriptor contains a Windows-specific directory reference"
+ + " (with a drive letter). This is not portable and will fail on non-Windows: "
+ destDirectory );
}
}
@@ -497,13 +497,14 @@
if ( isWindowsPath( destDirectory ) )
{
logger.error(
- "OS=Non-Windows and the assembly descriptor contains a windows-specific directory reference"
- + " (with a drive letter) " + destDirectory );
+ "OS=Non-Windows and the assembly descriptor contains a Windows-specific directory reference"
+ + " (with a drive letter): " + destDirectory );
}
- else if ( isLinuxRootReference( destDirectory ) )
+ else if ( isUnixRootReference( destDirectory ) )
{
- logger.warn( "The assembly descriptor contains a filesystem-root relative reference,"
- + " which is not cross platform compatible " + destDirectory );
+ logger.warn( "The assembly descriptor contains a *nix-specific root-relative reference"
+ + " (starting with slash). This is not portable and might fail on Windows: "
+ + destDirectory );
}
}
}
@@ -513,7 +514,7 @@
return ( destDirectory != null && destDirectory.length() >= 2 && destDirectory.charAt( 1 ) == ':' );
}
- static boolean isLinuxRootReference( String destDirectory )
+ static boolean isUnixRootReference( String destDirectory )
{
return ( destDirectory != null && destDirectory.startsWith( "/" ) );
}
diff --git a/src/main/resources/assemblies/bin.xml b/src/main/resources/assemblies/bin.xml
index 3fe82ab..943cb32 100644
--- a/src/main/resources/assemblies/bin.xml
+++ b/src/main/resources/assemblies/bin.xml
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
<directory>\${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
@@ -40,7 +40,7 @@
</fileSet>
<fileSet>
<directory>\${project.build.directory}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
diff --git a/src/main/resources/assemblies/project.xml b/src/main/resources/assemblies/project.xml
index 16ebc63..334bec1 100644
--- a/src/main/resources/assemblies/project.xml
+++ b/src/main/resources/assemblies/project.xml
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
<directory>\${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.log</exclude>
diff --git a/src/site/apt/advanced-descriptor-topics.apt.vm b/src/site/apt/advanced-descriptor-topics.apt.vm
index d8dcbe2..cba40f9 100644
--- a/src/site/apt/advanced-descriptor-topics.apt.vm
+++ b/src/site/apt/advanced-descriptor-topics.apt.vm
@@ -230,7 +230,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<excludes>
<exclude>%regex[(?!.*src/).*target.*]</exclude>
</excludes>
diff --git a/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm b/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
index 31023b4..93ce9f2 100644
--- a/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
+++ b/src/site/apt/examples/single/filtering-some-distribution-files.apt.vm
@@ -88,16 +88,16 @@
<files>
<file>
<source>README.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>LICENSE.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
</file>
<file>
<source>NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
</files>
@@ -133,12 +133,12 @@
<files>
<file>
<source>README.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
</files>
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
index bf658bd..07d2a71 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhaseTest.java
@@ -194,7 +194,7 @@
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
- + "root-relative-reference (starting with slash) /" );
+ + "root-relative reference (starting with slash): /" );
}
else
{
@@ -275,7 +275,7 @@
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
{
macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
- + "root-relative-reference (starting with slash) /" );
+ + "root-relative reference (starting with slash): /" );
}
else
{
diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
index 9121d73..31c282d 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtilsTest.java
@@ -792,7 +792,7 @@
public void testLinuxRootReferencePath()
{
- assertTrue( AssemblyFormatUtils.isLinuxRootReference( "/etc/home" ) );
+ assertTrue( AssemblyFormatUtils.isUnixRootReference( "/etc/home" ) );
}
@@ -820,8 +820,6 @@
expect( configSource.getFinalName() ).andReturn( finalName ).atLeastOnce();
}
-
-
}
}
