You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2020/01/01 22:52:11 UTC
[maven-assembly-plugin] 04/05: MASSEMBLY-775 outputDirectory is
completely irrelevant for absolute paths
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 9b5ee0bad651fbca2d6bc5a11345e56de8a62776
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Dec 24 22:05:32 2019 +0100
MASSEMBLY-775 outputDirectory is completely irrelevant for absolute paths
The old code did log some warn based on an absolute path in the outputDirectory.
But that's actually irrelevant as this is always the directory inside the zip/tar, etc.
That means it is _always_ interpreted as relative!
The only possible problem is the 'directory' attribute which
denotes the source path!
---
.../assembly/archive/phase/FileItemAssemblyPhase.java | 2 --
.../plugins/assembly/archive/task/AddFileSetsTask.java | 3 ++-
.../assembly/archive/phase/FileItemAssemblyPhaseTest.java | 13 -------------
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
index 6246b57..af10ee6 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java
@@ -87,8 +87,6 @@ public class FileItemAssemblyPhase
final String outputDirectory1 = fileItem.getOutputDirectory();
- AssemblyFormatUtils.warnForPlatformSpecifics( getLogger(), outputDirectory1 );
-
final String outputDirectory =
AssemblyFormatUtils.getOutputDirectory( outputDirectory1, configSource.getFinalName(), configSource,
AssemblyFormatUtils.moduleProjectInterpolator(
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
index a10e7d0..e9a082e 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java
@@ -110,9 +110,10 @@ public class AddFileSetsTask
if ( destDirectory == null )
{
destDirectory = fileSet.getDirectory();
+
+ AssemblyFormatUtils.warnForPlatformSpecifics( logger, destDirectory );
}
- AssemblyFormatUtils.warnForPlatformSpecifics( logger, destDirectory );
destDirectory =
AssemblyFormatUtils.getOutputDirectory( destDirectory, configSource.getFinalName(), configSource,
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 07d2a71..bc24cb8 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
@@ -196,10 +196,6 @@ public class FileItemAssemblyPhaseTest
macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
+ "root-relative reference (starting with slash): /" );
}
- else
- {
- macLogger.logger.warn( (String) anyObject() );
- }
final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
@@ -272,15 +268,6 @@ public class FileItemAssemblyPhaseTest
macCS.expectInterpolators();
final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- 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): /" );
- }
- else
- {
- macLogger.logger.warn( (String) anyObject() );
- }
final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );