[jruby] 02/03: Add workaround for FELIX-5430 bug

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit ad43daf170c5ba146637de8bc243b537dc498442
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Jul 22 12:20:07 2017 +0100

    Add workaround for FELIX-5430 bug
---
 debian/changelog                     |  9 +++++++++
 debian/patches/0014-FELIX-5430.patch | 21 +++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 806685b..6d5430b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jruby (9.1.8.0-1) UNRELEASED; urgency=medium
+
+  * Upload to unstable. (Closes: #867652).
+  * Prevent FTBFS errors caused by maven-bundle-plugin incompatibility with
+    jar files shipping module definition files. The following patch was
+    introduced as temporary workaround: d/p/FELIX-5430.patch.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 22 Jul 2017 11:18:39 +0100
+
 jruby (9.1.8.0-1~exp3) experimental; urgency=medium
 
   * Allow tests failures again. This is unfortunate but the package
diff --git a/debian/patches/0014-FELIX-5430.patch b/debian/patches/0014-FELIX-5430.patch
new file mode 100644
index 0000000..3e28781
--- /dev/null
+++ b/debian/patches/0014-FELIX-5430.patch
@@ -0,0 +1,21 @@
+Description: Allow maven-bundle-plugin to continue if errors are detected
+ This is necessary due to an upstream bug in that plugin that fail
+ when a bundle is requested and one or more jar files contain jigsaw
+ module files definitions. This is not a fix, just a workaround.
+Author: Miguel Landaeta <nomadium at debian.org>
+Bug-Debian: https://bugs.debian.org/867652
+Origin: other
+Bug: https://issues.apache.org/jira/browse/FELIX-5430
+Forwarded: no
+Last-Update: 2017-07-22
+
+--- jruby-9.1.8.0.orig/pom.xml
++++ jruby-9.1.8.0/pom.xml
+@@ -195,6 +195,7 @@ DO NOT MODIFIY - GENERATED CODE
+               <Bundle-Name>${bundle.name} ${project.version}</Bundle-Name>
+               <Bundle-Description>${bundle.name} ${project.version} OSGi bundle</Bundle-Description>
+               <Bundle-SymbolicName>${bundle.symbolic_name}</Bundle-SymbolicName>
++              <_failok>true</_failok>
+             </instructions>
+           </configuration>
+         </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 95f64bd..60f5195 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0011-Disable-failed-tests-in-sbuild.patch
 0012-Disable-jruby-flaky-tests.patch
 0013-Disable-regression-flaky-tests.patch
+0014-FELIX-5430.patch

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