maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1639728 - /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
Date Fri, 14 Nov 2014 18:42:39 GMT
Author: krosenvold
Date: Fri Nov 14 18:42:39 2014
New Revision: 1639728

URL: http://svn.apache.org/r1639728
Log:
[MASSEMBLY-732] Turns out MASEMBLY-733 fix was proper root cause

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java?rev=1639728&r1=1639727&r2=1639728&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhase.java
Fri Nov 14 18:42:39 2014
@@ -94,15 +94,7 @@ public class FileItemAssemblyPhase
                 destName = sourceName;
             }
 
-            final String outputDirectory1;
-            if ( !StringUtils.isEmpty( assembly.getBaseDirectory() ) )
-            {
-                outputDirectory1 = assembly.getBaseDirectory() + File.separator + fileItem.getOutputDirectory();
-            }
-            else
-            {
-                outputDirectory1 = fileItem.getOutputDirectory();
-            }
+            final String outputDirectory1 = fileItem.getOutputDirectory();
 
             final String outputDirectory =
                 AssemblyFormatUtils.getOutputDirectory( outputDirectory1, configSource.getFinalName(),
configSource,



Mime
View raw message