[tycho] 02/03: Add plexus-compatibility.patch

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch experimental
in repository tycho.

commit e6fcc33f4739410553f13db4da1de75b87826c31
Author: Markus Koschany <apo at debian.org>
Date:   Sat Sep 2 03:18:54 2017 +0200

    Add plexus-compatibility.patch
---
 debian/patches/plexus-compatibility.patch | 22 ++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/plexus-compatibility.patch b/debian/patches/plexus-compatibility.patch
new file mode 100644
index 0000000..b3938fe
--- /dev/null
+++ b/debian/patches/plexus-compatibility.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 2 Sep 2017 03:18:22 +0200
+Subject: plexus compatibility
+
+---
+ .../main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java    | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
+index 4e6f995..534498e 100644
+--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
++++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
+@@ -117,8 +117,7 @@ public class LicenseFeatureHelper {
+         // 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()]));
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0329dd8..5ebd2d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-packaging.patch
 fix-sonatype-bug.patch
 fix-neon.patch
 #test.patch
+plexus-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tycho.git