13 lines
806 B
Diff
13 lines
806 B
Diff
--- tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java~ 2015-06-09 14:56:22.068303547 +0200
|
|
+++ tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java 2015-06-09 14:58:37.379329080 +0200
|
|
@@ -117,8 +117,7 @@
|
|
// mavenArchiver ignores license feature files that are also present in 'this' feature
|
|
// i.e. if there is a conflict, files from 'this' feature win
|
|
|
|
- DefaultArchivedFileSet result = new DefaultArchivedFileSet();
|
|
- result.setArchive(licenseFeature);
|
|
+ DefaultArchivedFileSet result = new DefaultArchivedFileSet(licenseFeature);
|
|
result.setIncludes(includes.toArray(new String[includes.size()]));
|
|
result.setExcludes(excludes.toArray(new String[excludes.size()]));
|
|
|