Merge branch 'master' into MASSEMBLY-617_2

tcollignon · tcollignon · commit 1b61a4a6b614 · 2019-01-01T22:26:38.000+01:00
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
@@ -25,6 +25,7 @@
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 
 import java.io.File;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
 
 /**
  *

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`import org.codehaus.plexus.components.io.functions.InputStreamTransformer;`
`26`	`26`
`27`	`27`	`import java.io.File;`
	`28`	`+import org.codehaus.plexus.components.io.filemappers.FileMapper;`
`28`	`29`
`29`	`30`	`/**`
`30`	`31`	`*`