[jruby] 07/11: Rework all the patches

Miguel Landaeta nomadium at moszumanska.debian.org
Sat Feb 11 18:45:09 UTC 2017


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

nomadium pushed a commit to branch experimental
in repository jruby.

commit b039e768fd6d146c23b5b3c34c250a51730ac0f8
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Feb 11 16:28:16 2017 +0000

    Rework all the patches
---
 debian/changelog                                   |    3 +
 .../0001-Disable-polyglot-maven-extension.patch    |   16 +
 debian/patches/0001-Fix-shebang-lines.patch        |  121 --
 ...-Disable-unpackaged-plugins-in-lib-module.patch |   23 +
 ...Add-usr-lib-ruby-vendor-ruby-to-load-path.patch |   60 -
 debian/patches/0003-Disable-truffle-module.patch   |   59 +
 ...004-Add-missing-maven-artifacts-pom-files.patch | 1379 ++++++++++++++++++++
 ...e-debian-versions-for-plugins-in-pom-test.patch |   36 -
 .../0005-Disable-jnr-ffi-native-usage.patch        |   40 +
 .../0006-Allow-rdoc-to-run-without-gems.patch      |   72 -
 .../0006-Disable-maven-jruby-jars-artifact.patch   |   49 +
 ...Add-usr-lib-ruby-vendor-ruby-to-load-path.patch |   78 ++
 debian/patches/0007-Enable-test-suites.patch       |   37 -
 ...Configure-unit-tests-to-run-at-build-time.patch |   68 +
 ...sable-some-failing-user-tests-in-pbuilder.patch |  184 ---
 ...sable-bigdecimal-divmod-spec-failing-test.patch |   33 -
 .../0010-Disable-maven-invoker-plugin.patch        |   57 -
 .../0011-Snakeyaml-1.17-compatibility.patch        |   19 -
 debian/patches/0012-Disable-outdated-specs.patch   |   68 -
 debian/patches/series                              |   18 +-
 20 files changed, 1723 insertions(+), 697 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b860835..93958cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ jruby (9.1.6.0-1~exp1) UNRELEASED; urgency=medium
       + ruby-minitest-excludes
       + yydebug
   * Refresh d/copyright file.
+  * Rework all the patches, almost all of them were dropped since they
+    were not necessary anymore. Also, upstream switched their build system
+    to polyglot-maven, so new ones were introduced.
 
  -- Miguel Landaeta <nomadium at debian.org>  Sat, 11 Feb 2017 16:18:12 +0000
 
diff --git a/debian/patches/0001-Disable-polyglot-maven-extension.patch b/debian/patches/0001-Disable-polyglot-maven-extension.patch
new file mode 100644
index 0000000..b9a8931
--- /dev/null
+++ b/debian/patches/0001-Disable-polyglot-maven-extension.patch
@@ -0,0 +1,16 @@
+Description: Disable polyglot-maven extension
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-01-21
+
+--- jruby-9.1.6.0.orig/.mvn/extensions.xml
++++ /dev/null
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<extensions>
+-  <extension>
+-    <groupId>io.takari.polyglot</groupId>
+-    <artifactId>polyglot-ruby</artifactId>
+-    <version>0.1.15</version>
+-  </extension>
+-</extensions>
diff --git a/debian/patches/0001-Fix-shebang-lines.patch b/debian/patches/0001-Fix-shebang-lines.patch
deleted file mode 100644
index f5e75ff..0000000
--- a/debian/patches/0001-Fix-shebang-lines.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Sebastien Delafond <seb at debian.org>
-Date: Thu, 29 Jul 2010 19:46:33 +0200
-Subject: Fix shebang lines
-
-Remove extraneous shebang lines, and correct necessary jruby ones.
----
- lib/ruby/1.8/abbrev.rb                         |    1 -
- lib/ruby/1.8/irb/cmd/subirb.rb                 |    1 -
- lib/ruby/1.8/irb/ext/save-history.rb           |    1 -
- lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb  |    1 -
- lib/ruby/1.8/rdoc/parsers/parse_rb.rb          |    1 -
- lib/ruby/1.8/set.rb                            |    1 -
- lib/ruby/1.8/tsort.rb                          |    1 -
- lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb            |    1 -
- lib/ruby/1.9/abbrev.rb                         |    1 -
- lib/ruby/1.9/set.rb                            |    1 -
- lib/ruby/2.0/abbrev.rb                         |    1 -
- 11 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/lib/ruby/1.8/abbrev.rb b/lib/ruby/1.8/abbrev.rb
-index 338b89f..6e2f71a 100644
---- a/lib/ruby/1.8/abbrev.rb
-+++ b/lib/ruby/1.8/abbrev.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- =begin
- #
- # Copyright (c) 2001,2003 Akinori MUSHA <knu at iDaemons.org>
-diff --git a/lib/ruby/1.8/irb/cmd/subirb.rb b/lib/ruby/1.8/irb/cmd/subirb.rb
-index 0b8744c..2a4e303 100644
---- a/lib/ruby/1.8/irb/cmd/subirb.rb
-+++ b/lib/ruby/1.8/irb/cmd/subirb.rb
-@@ -1,4 +1,3 @@
--#!/usr/local/bin/ruby
- #
- #   multi.rb - 
- #   	$Release Version: 0.9.5$
-diff --git a/lib/ruby/1.8/irb/ext/save-history.rb b/lib/ruby/1.8/irb/ext/save-history.rb
-index 486dc76..66aced6 100644
---- a/lib/ruby/1.8/irb/ext/save-history.rb
-+++ b/lib/ruby/1.8/irb/ext/save-history.rb
-@@ -1,4 +1,3 @@
--#!/usr/local/bin/ruby
- #
- #   save-history.rb - 
- #   	$Release Version: 0.9.5$
-diff --git a/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb b/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb
-index 26563b7..798357e 100644
---- a/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb
-+++ b/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb
-@@ -1,4 +1,3 @@
--#!/usr/local/bin/ruby
- # Illustration of a script to convert an RDoc-style file to a LaTeX
- # document
- 
-diff --git a/lib/ruby/1.8/rdoc/parsers/parse_rb.rb b/lib/ruby/1.8/rdoc/parsers/parse_rb.rb
-index 750c483..83e2ab7 100644
---- a/lib/ruby/1.8/rdoc/parsers/parse_rb.rb
-+++ b/lib/ruby/1.8/rdoc/parsers/parse_rb.rb
-@@ -1,4 +1,3 @@
--#!/usr/local/bin/ruby
- 
- # Parse a Ruby source file, building a set of objects
- # representing the modules, classes, methods,
-diff --git a/lib/ruby/1.8/set.rb b/lib/ruby/1.8/set.rb
-index 6d92778..7078901 100644
---- a/lib/ruby/1.8/set.rb
-+++ b/lib/ruby/1.8/set.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # set.rb - defines the Set class
- #++
-diff --git a/lib/ruby/1.8/tsort.rb b/lib/ruby/1.8/tsort.rb
-index a014e7f..9e664ea 100644
---- a/lib/ruby/1.8/tsort.rb
-+++ b/lib/ruby/1.8/tsort.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # tsort.rb - provides a module for topological sorting and strongly connected components.
- #++
-diff --git a/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb b/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb
-index 16b05fb..747288f 100644
---- a/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb
-+++ b/lib/ruby/1.8/wsdl/soap/wsdl2ruby.rb
-@@ -159,7 +159,6 @@ private
-   end
- 
-   def shbang
--    "#!/usr/bin/env ruby"
-   end
- 
-   def create_name(name)
-diff --git a/lib/ruby/1.9/abbrev.rb b/lib/ruby/1.9/abbrev.rb
-index 338b89f..6e2f71a 100644
---- a/lib/ruby/1.9/abbrev.rb
-+++ b/lib/ruby/1.9/abbrev.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright (c) 2001,2003 Akinori MUSHA <knu at iDaemons.org>
- #
-diff --git a/lib/ruby/1.9/set.rb b/lib/ruby/1.9/set.rb
-index c57b668..3b5a3ab 100644
---- a/lib/ruby/1.9/set.rb
-+++ b/lib/ruby/1.9/set.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # set.rb - defines the Set class
- #++
-diff --git a/lib/ruby/2.0/abbrev.rb b/lib/ruby/2.0/abbrev.rb
-index 841f6d9..a6d0266 100755
---- a/lib/ruby/2.0/abbrev.rb
-+++ b/lib/ruby/2.0/abbrev.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright (c) 2001,2003 Akinori MUSHA <knu at iDaemons.org>
- #
diff --git a/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch b/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch
new file mode 100644
index 0000000..bc10133
--- /dev/null
+++ b/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch
@@ -0,0 +1,23 @@
+Description: Disable references to unpackaged maven plugins in lib module
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-02-01
+
+--- a/lib/pom.xml
++++ b/lib/pom.xml
+@@ -310,6 +310,7 @@ DO NOT MODIFIY - GENERATED CODE
+         <groupId>org.codehaus.mojo</groupId>
+         <artifactId>build-helper-maven-plugin</artifactId>
+       </plugin>
++      <!--
+       <plugin>
+         <groupId>io.takari.polyglot</groupId>
+         <artifactId>polyglot-maven-plugin</artifactId>
+@@ -368,6 +369,7 @@ DO NOT MODIFIY - GENERATED CODE
+           </dependency>
+         </dependencies>
+       </plugin>
++      -->
+     </plugins>
+   </build>
+ </project>
diff --git a/debian/patches/0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch b/debian/patches/0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
deleted file mode 100644
index ffcfd95..0000000
--- a/debian/patches/0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Wed, 27 May 2015 16:56:49 -0300
-Subject: Add /usr/lib/ruby/vendor_ruby to default LOAD_PATH
-Bug: https://bugs.debian.org/663342
-Forwarded: no
-
-diff --git a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
-index e2a4dca..7642404 100644
---- a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
-+++ b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
-@@ -63,6 +63,8 @@ public class RbConfigLibrary implements Library {
-     private static final String RUBY_FREEBSD = "freebsd";
-     private static final String RUBY_AIX = "aix";
-    
-+    private static final String MRI_VENDOR_DIR = "/usr/lib/ruby/vendor_ruby";
-+
-     private static String normalizedHome;
-     
-     /** This is a map from Java's "friendly" OS names to those used by Ruby */
-@@ -186,6 +188,10 @@ public class RbConfigLibrary implements Library {
-         return new NormalizedFile(getRubyLibDir(runtime), "vendor_ruby").getPath();
-     }
- 
-+    public static String getMRIVendorDir(Ruby runtime) {
-+        return SafePropertyAccessor.getProperty("vendor.mri.dir", MRI_VENDOR_DIR);
-+    }
-+
-     public static String getVendorLibDir(Ruby runtime) {
-         return getVendorDir(runtime);
-     }
-@@ -297,6 +303,7 @@ public class RbConfigLibrary implements Library {
-         String rubyLibDir = getRubyLibDir(runtime);
-         String archDir = getArchDir(runtime);
-         String vendorDir = getVendorDir(runtime);
-+        String vendorMRIDir = getMRIVendorDir(runtime);
-         String vendorLibDir = getVendorLibDir(runtime);
-         String vendorArchDir = getVendorArchDir(runtime);
-         String siteDir = getSiteDir(runtime);
-@@ -313,6 +320,7 @@ public class RbConfigLibrary implements Library {
-         setConfig(configHash, "vendorlibdir",   vendorLibDir);
-         setConfig(configHash, "vendorarchdir",    vendorArchDir);
-         }
-+        setConfig(configHash, "vendor_mri_dir", vendorMRIDir);
-         setConfig(configHash, "sitedir",        siteDir);
-         setConfig(configHash, "sitelibdir",     siteLibDir);
-         setConfig(configHash, "sitearchdir",    siteArchDir);
-diff --git a/core/src/main/java/org/jruby/runtime/load/LoadService.java b/core/src/main/java/org/jruby/runtime/load/LoadService.java
-index 9d5ef00..80b05a9 100644
---- a/core/src/main/java/org/jruby/runtime/load/LoadService.java
-+++ b/core/src/main/java/org/jruby/runtime/load/LoadService.java
-@@ -279,6 +279,9 @@ public class LoadService {
-                 addPath(RbConfigLibrary.getRubyLibDir(runtime));
-             }
- 
-+            // Allow jruby to load libraries installed in the system
-+            addPath(RbConfigLibrary.getMRIVendorDir(runtime));
-+
-         } catch(SecurityException ignore) {}
- 
-         // "." dir is used for relative path loads from a given file, as in require '../foo/bar'
diff --git a/debian/patches/0003-Disable-truffle-module.patch b/debian/patches/0003-Disable-truffle-module.patch
new file mode 100644
index 0000000..3417c58
--- /dev/null
+++ b/debian/patches/0003-Disable-truffle-module.patch
@@ -0,0 +1,59 @@
+Description: Disable truffle module build
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-01-21
+
+--- jruby-9.1.6.0.orig/pom.xml
++++ jruby-9.1.6.0/pom.xml
+@@ -528,6 +528,7 @@ DO NOT MODIFIY - GENERATED CODE
+     </plugins>
+   </reporting>
+   <profiles>
++    <!-- truffle is disable because it will be packaged in a different package
+     <profile>
+       <id>truffle</id>
+       <activation>
+@@ -537,6 +538,7 @@ DO NOT MODIFIY - GENERATED CODE
+         <module>truffle</module>
+       </modules>
+     </profile>
++    -->
+     <profile>
+       <id>test</id>
+       <modules>
+@@ -727,7 +729,7 @@ DO NOT MODIFIY - GENERATED CODE
+         <defaultGoal>install</defaultGoal>
+       </build>
+       <modules>
+-        <module>truffle</module>
++        <!--<module>truffle</module>-->
+         <module>test</module>
+         <module>maven</module>
+       </modules>
+@@ -738,7 +740,7 @@ DO NOT MODIFIY - GENERATED CODE
+         <defaultGoal>clean</defaultGoal>
+       </build>
+       <modules>
+-        <module>truffle</module>
++        <!--<module>truffle</module>-->
+         <module>test</module>
+         <module>maven</module>
+       </modules>
+@@ -746,7 +748,7 @@ DO NOT MODIFIY - GENERATED CODE
+     <profile>
+       <id>release</id>
+       <modules>
+-        <module>truffle</module>
++        <!--<module>truffle</module>-->
+         <module>test</module>
+         <module>maven</module>
+       </modules>
+@@ -784,7 +786,7 @@ DO NOT MODIFIY - GENERATED CODE
+         </plugins>
+       </build>
+       <modules>
+-        <module>truffle</module>
++        <!--<module>truffle</module>-->
+         <module>maven</module>
+       </modules>
+       <distributionManagement>
diff --git a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
new file mode 100644
index 0000000..b48a68f
--- /dev/null
+++ b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
@@ -0,0 +1,1379 @@
+Description: Add missing POM files for maven artifacts
+ Nowadays upstream generates these files from pom.rb files
+ with polyglot-maven extension, this will be package in the
+ future and this patch can be dropped, in the meantime we
+ need to add them manually to the source
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-02-07
+
+--- /dev/null
++++ jruby-9.1.6.0/maven/pom.xml
+@@ -0,0 +1,133 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++DO NOT MODIFIY - GENERATED CODE
++
++
++-->
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.jruby</groupId>
++    <artifactId>jruby-parent</artifactId>
++    <version>9.1.6.0</version>
++  </parent>
++  <artifactId>jruby-artifacts</artifactId>
++  <packaging>pom</packaging>
++  <name>JRuby Artifacts</name>
++  <properties>
++    <polyglot.dump.readonly>true</polyglot.dump.readonly>
++    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
++  </properties>
++  <build>
++    <pluginManagement>
++      <plugins>
++        <plugin>
++          <groupId>org.codehaus.mojo</groupId>
++          <artifactId>build-helper-maven-plugin</artifactId>
++          <executions>
++            <execution>
++              <id>attach-artifacts</id>
++              <phase>package</phase>
++              <goals>
++                <goal>attach-artifact</goal>
++              </goals>
++              <configuration>
++                <artifacts>
++                  <artifact>
++                    <file>${basedir}/src/empty.jar</file>
++                    <classifier>sources</classifier>
++                  </artifact>
++                  <artifact>
++                    <file>${basedir}/src/empty.jar</file>
++                    <classifier>javadoc</classifier>
++                  </artifact>
++                </artifacts>
++              </configuration>
++            </execution>
++          </executions>
++        </plugin>
++      </plugins>
++    </pluginManagement>
++  </build>
++  <profiles>
++    <profile>
++      <id>all</id>
++      <modules>
++        <module>jruby</module>
++        <module>jruby-complete</module>
++        <module>jruby-jars</module>
++        <module>jruby-dist</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>apps</id>
++      <modules>
++        <module>jruby</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>release</id>
++      <modules>
++        <module>jruby</module>
++        <module>jruby-complete</module>
++        <module>jruby-jars</module>
++        <module>jruby-dist</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>main</id>
++      <modules>
++        <module>jruby</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>osgi</id>
++      <modules>
++        <module>jruby</module>
++        <module>jruby-complete</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>j2ee</id>
++      <modules>
++        <module>jruby</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>snapshots</id>
++      <modules>
++        <module>jruby</module>
++        <module>jruby-complete</module>
++        <module>jruby-jars</module>
++        <module>jruby-dist</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>complete</id>
++      <modules>
++        <module>jruby-complete</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>jruby_complete_jar_extended</id>
++      <modules>
++        <module>jruby-complete</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>jruby-jars</id>
++      <modules>
++        <module>jruby-jars</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>dist</id>
++      <modules>
++        <module>jruby-dist</module>
++      </modules>
++    </profile>
++  </profiles>
++</project>
+
+--- /dev/null
++++ jruby-9.1.6.0/maven/jruby-dist/pom.xml
+@@ -0,0 +1,210 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++DO NOT MODIFIY - GENERATED CODE
++
++
++-->
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.jruby</groupId>
++    <artifactId>jruby-artifacts</artifactId>
++    <version>9.1.6.0</version>
++  </parent>
++  <artifactId>jruby-dist</artifactId>
++  <packaging>pom</packaging>
++  <name>JRuby Dist</name>
++  <properties>
++    <polyglot.dump.readonly>true</polyglot.dump.readonly>
++    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
++  </properties>
++  <build>
++    <plugins>
++      <plugin>
++        <artifactId>maven-dependency-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>unpack jruby-stdlib</id>
++            <phase>prepare-package</phase>
++            <goals>
++              <goal>unpack</goal>
++            </goals>
++            <configuration>
++              <stripVersion>true</stripVersion>
++              <artifactItems>
++                <artifactItem>
++                  <groupId>org.jruby</groupId>
++                  <artifactId>jruby-stdlib</artifactId>
++                  <version>${project.version}</version>
++                  <type>jar</type>
++                  <overWrite>false</overWrite>
++                  <outputDirectory>${project.build.directory}</outputDirectory>
++                </artifactItem>
++              </artifactItems>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
++        <artifactId>maven-assembly-plugin</artifactId>
++        <version>2.4.1</version>
++        <executions>
++          <execution>
++            <id>bin.tar.gz and bin.zip</id>
++            <phase>package</phase>
++            <goals>
++              <goal>single</goal>
++            </goals>
++            <configuration>
++              <descriptors>
++                <descriptor>src/main/assembly/bin.xml</descriptor>
++              </descriptors>
++            </configuration>
++          </execution>
++          <execution>
++            <id>bin200.tar.gz</id>
++            <phase>package</phase>
++            <goals>
++              <goal>single</goal>
++            </goals>
++            <configuration>
++              <attach>false</attach>
++              <descriptors>
++                <descriptor>src/main/assembly/bin200.xml</descriptor>
++              </descriptors>
++            </configuration>
++          </execution>
++        </executions>
++        <configuration>
++          <recompressZippedFiles>true</recompressZippedFiles>
++          <tarLongFileMode>gnu</tarLongFileMode>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-invoker-plugin</artifactId>
++      </plugin>
++      <!--
++      <plugin>
++        <groupId>io.takari.polyglot</groupId>
++        <artifactId>polyglot-maven-plugin</artifactId>
++        <version>0.1.15</version>
++        <executions>
++          <execution>
++            <id>pack200</id>
++            <phase>prepare-package</phase>
++            <goals>
++              <goal>execute</goal>
++            </goals>
++            <configuration>
++              <taskId>pack200</taskId>
++              <nativePom>pom.rb</nativePom>
++            </configuration>
++          </execution>
++          <execution>
++            <id>fix_executable_bits</id>
++            <phase>prepare-package</phase>
++            <goals>
++              <goal>execute</goal>
++            </goals>
++            <configuration>
++              <taskId>fix_executable_bits</taskId>
++              <nativePom>pom.rb</nativePom>
++            </configuration>
++          </execution>
++        </executions>
++        <dependencies>
++          <dependency>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-ruby</artifactId>
++            <version>0.1.15</version>
++          </dependency>
++        </dependencies>
++      </plugin>
++      -->
++    </plugins>
++  </build>
++  <profiles>
++    <!--
++    <profile>
++      <id>source dist</id>
++      <activation>
++        <file>
++          <exists>../../.git</exists>
++        </file>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <groupId>org.codehaus.mojo</groupId>
++            <artifactId>build-helper-maven-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>attach-artifacts</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>attach-artifact</goal>
++                </goals>
++                <configuration>
++                  <artifacts>
++                    <artifact>
++                      <file>${project.build.directory}/${project.build.finalName}-src.zip</file>
++                      <type>zip</type>
++                      <classifier>src</classifier>
++                    </artifact>
++                  </artifacts>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++          <plugin>
++            <groupId>net.ju-n.maven.plugins</groupId>
++            <artifactId>checksum-maven-plugin</artifactId>
++            <version>1.2</version>
++            <executions>
++              <execution>
++                <phase>package</phase>
++                <goals>
++                  <goal>artifacts</goal>
++                </goals>
++                <configuration>
++                  <algorithms>
++                    <algorithm>SHA256</algorithm>
++                  </algorithms>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++          <plugin>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-maven-plugin</artifactId>
++            <version>0.1.15</version>
++            <executions>
++              <execution>
++                <id>pack_sources</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>execute</goal>
++                </goals>
++                <configuration>
++                  <taskId>pack_sources</taskId>
++                  <nativePom>pom.rb</nativePom>
++                </configuration>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>io.takari.polyglot</groupId>
++                <artifactId>polyglot-ruby</artifactId>
++                <version>0.1.15</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    -->
++  </profiles>
++</project>
+
+--- /dev/null
++++ jruby-9.1.6.0/maven/jruby-complete/pom.xml
+@@ -0,0 +1,313 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++DO NOT MODIFIY - GENERATED CODE
++
++
++-->
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.jruby</groupId>
++    <artifactId>jruby-artifacts</artifactId>
++    <version>9.1.6.0</version>
++  </parent>
++  <artifactId>jruby-complete</artifactId>
++  <packaging>bundle</packaging>
++  <name>JRuby Complete</name>
++  <properties>
++    <jruby.home>${basedir}/../..</jruby.home>
++    <polyglot.dump.readonly>true</polyglot.dump.readonly>
++    <main.basedir>${project.parent.parent.basedir}</main.basedir>
++    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
++    <jruby.complete.home>${project.build.outputDirectory}/META-INF/jruby.home</jruby.complete.home>
++  </properties>
++  <dependencies>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>jruby-core</artifactId>
++      <version>${project.version}</version>
++      <scope>provided</scope>
++      <exclusions>
++        <exclusion>
++          <artifactId>jnr-ffi</artifactId>
++          <groupId>com.github.jnr</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>jitescript</artifactId>
++          <groupId>me.qmx.jitescript</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>asm</artifactId>
++          <groupId>org.ow2.asm</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>asm-commons</artifactId>
++          <groupId>org.ow2.asm</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>asm-tree</artifactId>
++          <groupId>org.ow2.asm</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>asm-analysis</artifactId>
++          <groupId>org.ow2.asm</groupId>
++        </exclusion>
++        <exclusion>
++          <artifactId>asm-util</artifactId>
++          <groupId>org.ow2.asm</groupId>
++        </exclusion>
++      </exclusions>
++    </dependency>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>jruby-stdlib</artifactId>
++      <version>${project.version}</version>
++      <scope>provided</scope>
++    </dependency>
++  </dependencies>
++  <pluginRepositories>
++    <pluginRepository>
++      <id>rubygems-releases</id>
++      <url>https://otto.takari.io/content/repositories/rubygems/maven/releases</url>
++    </pluginRepository>
++  </pluginRepositories>
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++        <configuration>
++          <archive>
++            <manifest>
++              <mainClass>org.jruby.Main</mainClass>
++            </manifest>
++          </archive>
++          <instructions>
++            <Export-Package>org.jruby.*;version=${project.version}</Export-Package>
++            <Import-Package>!org.jruby.*, *;resolution:=optional</Import-Package>
++            <DynamicImport-Package>javax.*</DynamicImport-Package>
++            <Private-Package>*,.</Private-Package>
++            <Bundle-Name>JRuby ${project.version}</Bundle-Name>
++            <Bundle-Description>JRuby ${project.version} OSGi bundle</Bundle-Description>
++            <Bundle-SymbolicName>org.jruby.jruby</Bundle-SymbolicName>
++            <Embed-Dependency>*;type=jar;scope=provided;inline=true;artifactId=!jnr-ffi</Embed-Dependency>
++            <Embed-Transitive>true</Embed-Transitive>
++          </instructions>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-invoker-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <artifactId>maven-source-plugin</artifactId>
++        <configuration>
++          <skipSource>true</skipSource>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-clean-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>clean-extra-osgi-ITs</id>
++            <phase>clean</phase>
++            <goals>
++              <goal>clean</goal>
++            </goals>
++            <configuration>
++              <filesets>
++                <fileset>
++                  <directory>${basedir}/src/it</directory>
++                  <includes>
++                    <include>osgi*/**</include>
++                  </includes>
++                </fileset>
++              </filesets>
++              <failOnError>false</failOnError>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++      <!--
++      <plugin>
++        <groupId>io.takari.polyglot</groupId>
++        <artifactId>polyglot-maven-plugin</artifactId>
++        <version>0.1.15</version>
++        <executions>
++          <execution>
++            <id>setup other osgi frameworks</id>
++            <phase>pre-integration-test</phase>
++            <goals>
++              <goal>execute</goal>
++            </goals>
++            <configuration>
++              <taskId>setup other osgi frameworks</taskId>
++              <nativePom>pom.rb</nativePom>
++            </configuration>
++          </execution>
++        </executions>
++        <dependencies>
++          <dependency>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-ruby</artifactId>
++            <version>0.1.15</version>
++          </dependency>
++        </dependencies>
++      </plugin>
++      -->
++    </plugins>
++  </build>
++  <profiles>
++    <profile>
++      <id>sonatype-oss-release</id>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-dependency-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>copy javadocs and sources from jruby-core</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>copy</goal>
++                </goals>
++                <configuration>
++                  <artifactItems>
++                    <artifactItem>
++                      <groupId>${project.groupId}</groupId>
++                      <artifactId>jruby-core</artifactId>
++                      <version>${project.version}</version>
++                      <classifier>sources</classifier>
++                      <overWrite>false</overWrite>
++                      <outputDirectory>${project.build.directory}</outputDirectory>
++                    </artifactItem>
++                    <artifactItem>
++                      <groupId>${project.groupId}</groupId>
++                      <artifactId>jruby-core</artifactId>
++                      <version>${project.version}</version>
++                      <classifier>javadoc</classifier>
++                      <overWrite>false</overWrite>
++                      <outputDirectory>${project.build.directory}</outputDirectory>
++                    </artifactItem>
++                  </artifactItems>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++          <plugin>
++            <groupId>org.codehaus.mojo</groupId>
++            <artifactId>build-helper-maven-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>attach-artifacts</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>attach-artifact</goal>
++                </goals>
++                <configuration>
++                  <artifacts>
++                    <artifact>
++                      <file>${project.build.directory}/jruby-core-${project.version}-sources.jar</file>
++                      <classifier>sources</classifier>
++                    </artifact>
++                    <artifact>
++                      <file>${project.build.directory}/jruby-core-${project.version}-javadoc.jar</file>
++                      <classifier>javadoc</classifier>
++                    </artifact>
++                  </artifacts>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>snapshots</id>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-dependency-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>copy javadocs and sources from jruby-core</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>copy</goal>
++                </goals>
++                <configuration>
++                  <artifactItems>
++                    <artifactItem>
++                      <groupId>${project.groupId}</groupId>
++                      <artifactId>jruby-core</artifactId>
++                      <version>${project.version}</version>
++                      <classifier>sources</classifier>
++                      <overWrite>false</overWrite>
++                      <outputDirectory>${project.build.directory}</outputDirectory>
++                    </artifactItem>
++                    <artifactItem>
++                      <groupId>${project.groupId}</groupId>
++                      <artifactId>jruby-core</artifactId>
++                      <version>${project.version}</version>
++                      <classifier>javadoc</classifier>
++                      <overWrite>false</overWrite>
++                      <outputDirectory>${project.build.directory}</outputDirectory>
++                    </artifactItem>
++                  </artifactItems>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++          <plugin>
++            <groupId>org.codehaus.mojo</groupId>
++            <artifactId>build-helper-maven-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>attach-artifacts</id>
++                <phase>package</phase>
++                <goals>
++                  <goal>attach-artifact</goal>
++                </goals>
++                <configuration>
++                  <artifacts>
++                    <artifact>
++                      <file>${project.build.directory}/jruby-core-${project.version}-sources.jar</file>
++                      <classifier>sources</classifier>
++                    </artifact>
++                    <artifact>
++                      <file>${project.build.directory}/jruby-core-${project.version}-javadoc.jar</file>
++                      <classifier>javadoc</classifier>
++                    </artifact>
++                  </artifacts>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>jdk8</id>
++      <activation>
++        <jdk>1.8</jdk>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-invoker-plugin</artifactId>
++            <configuration>
++              <pomExcludes>
++                <pomExclude>osgi_many_bundles_with_embedded_gems_felix-3.2/pom.xml</pomExclude>
++                <pomExclude>${its.j2ee}</pomExclude>
++                <pomExclude>${its.osgi}</pomExclude>
++              </pomExcludes>
++            </configuration>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
++</project>
+
+--- /dev/null
++++ jruby-9.1.6.0/maven/jruby/pom.xml
+@@ -0,0 +1,226 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++DO NOT MODIFIY - GENERATED CODE
++
++
++-->
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.jruby</groupId>
++    <artifactId>jruby-artifacts</artifactId>
++    <version>9.1.6.0</version>
++  </parent>
++  <artifactId>jruby</artifactId>
++  <name>JRuby Main Maven Artifact</name>
++  <dependencies>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>jruby-core</artifactId>
++      <version>${project.version}</version>
++    </dependency>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>jruby-stdlib</artifactId>
++      <version>${project.version}</version>
++    </dependency>
++  </dependencies>
++  <build>
++    <resources>
++      <resource>
++        <targetPath>${project.build.outputDirectory}/META-INF/</targetPath>
++        <directory>${project.basedir}/../..</directory>
++        <includes>
++          <include>BSDL</include>
++          <include>COPYING</include>
++          <include>LEGAL</include>
++          <include>LICENSE.RUBY</include>
++        </includes>
++      </resource>
++    </resources>
++    <plugins>
++      <plugin>
++        <artifactId>maven-source-plugin</artifactId>
++        <configuration>
++          <skipSource>true</skipSource>
++        </configuration>
++      </plugin>
++      <plugin>
++        <groupId>org.codehaus.mojo</groupId>
++        <artifactId>build-helper-maven-plugin</artifactId>
++      </plugin>
++      <plugin>
++        <artifactId>maven-invoker-plugin</artifactId>
++        <configuration>
++          <properties>
++            <localRepository>${settings.localRepository}</localRepository>
++          </properties>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-clean-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>clean-extra-osgi-ITs</id>
++            <phase>clean</phase>
++            <goals>
++              <goal>clean</goal>
++            </goals>
++            <configuration>
++              <filesets>
++                <fileset>
++                  <directory>${basedir}/src/it</directory>
++                  <includes>
++                    <include>osgi*/**</include>
++                  </includes>
++                </fileset>
++              </filesets>
++              <failOnError>false</failOnError>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++    </plugins>
++  </build>
++  <profiles>
++    <profile>
++      <id>apps</id>
++      <activation>
++        <property>
++          <name>invoker.test</name>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-maven-plugin</artifactId>
++            <version>0.1.15</version>
++            <executions>
++              <execution>
++                <id>setup web applications</id>
++                <phase>pre-integration-test</phase>
++                <goals>
++                  <goal>execute</goal>
++                </goals>
++                <configuration>
++                  <taskId>setup web applications</taskId>
++                  <nativePom>pom.rb</nativePom>
++                </configuration>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>io.takari.polyglot</groupId>
++                <artifactId>polyglot-ruby</artifactId>
++                <version>0.1.15</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++      <properties>
++        <invoker.skip>false</invoker.skip>
++        <invoker.test>hellowarld_*</invoker.test>
++      </properties>
++    </profile>
++    <profile>
++      <id>osgi</id>
++      <activation>
++        <property>
++          <name>invoker.test</name>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-maven-plugin</artifactId>
++            <version>0.1.15</version>
++            <executions>
++              <execution>
++                <id>setup osgi integration tests</id>
++                <phase>pre-integration-test</phase>
++                <goals>
++                  <goal>execute</goal>
++                </goals>
++                <configuration>
++                  <taskId>setup osgi integration tests</taskId>
++                  <nativePom>pom.rb</nativePom>
++                </configuration>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>io.takari.polyglot</groupId>
++                <artifactId>polyglot-ruby</artifactId>
++                <version>0.1.15</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>jdk8</id>
++      <activation>
++        <jdk>1.8</jdk>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-invoker-plugin</artifactId>
++            <configuration>
++              <pomExcludes>
++                <pomExclude>extended/pom.xml</pomExclude>
++                <pomExclude>osgi_all_inclusive_felix-3.2/pom.xml</pomExclude>
++                <pomExclude>${its.j2ee}</pomExclude>
++                <pomExclude>${its.osgi}</pomExclude>
++              </pomExcludes>
++            </configuration>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>wlp</id>
++      <activation>
++        <property>
++          <name>wlp.jar</name>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <groupId>io.takari.polyglot</groupId>
++            <artifactId>polyglot-maven-plugin</artifactId>
++            <version>0.1.15</version>
++            <executions>
++              <execution>
++                <id>install_wlp</id>
++                <phase>pre-integration-test</phase>
++                <goals>
++                  <goal>execute</goal>
++                </goals>
++                <configuration>
++                  <taskId>install_wlp</taskId>
++                  <nativePom>pom.rb</nativePom>
++                </configuration>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>io.takari.polyglot</groupId>
++                <artifactId>polyglot-ruby</artifactId>
++                <version>0.1.15</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
++</project>
+
+--- /dev/null
++++ jruby-9.1.6.0/test/pom.xml
+@@ -0,0 +1,469 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++DO NOT MODIFIY - GENERATED CODE
++
++
++-->
++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
++    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
++  <modelVersion>4.0.0</modelVersion>
++  <parent>
++    <groupId>org.jruby</groupId>
++    <artifactId>jruby-parent</artifactId>
++    <version>9.1.6.0</version>
++  </parent>
++  <artifactId>jruby-tests</artifactId>
++  <name>JRuby Integration Tests</name>
++  <properties>
++    <jruby.home>${basedir}/..</jruby.home>
++    <gem.home>${jruby.home}/lib/ruby/gems/shared</gem.home>
++    <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
++  </properties>
++  <dependencies>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.11</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>commons-logging</groupId>
++      <artifactId>commons-logging</artifactId>
++      <version>1.1.3</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.livetribe</groupId>
++      <artifactId>livetribe-jsr223</artifactId>
++      <version>2.0.7</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>jruby-core</artifactId>
++      <version>${project.version}</version>
++      <scope>test</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.apache.ant</groupId>
++      <artifactId>ant</artifactId>
++      <version>${ant.version}</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>bsf</groupId>
++      <artifactId>bsf</artifactId>
++      <version>2.4.0</version>
++      <scope>provided</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.jruby</groupId>
++      <artifactId>requireTest</artifactId>
++      <version>1.0</version>
++      <scope>system</scope>
++      <systemPath>${project.basedir}/jruby/requireTest-1.0.jar</systemPath>
++    </dependency>
++    <dependency>
++      <groupId>rubygems</groupId>
++      <artifactId>rspec</artifactId>
++      <version>${rspec.version}</version>
++      <type>gem</type>
++    </dependency>
++  </dependencies>
++  <repositories>
++    <repository>
++      <id>mavengems</id>
++      <url>mavengem:http://rubygems.org</url>
++    </repository>
++  </repositories>
++  <pluginRepositories>
++    <pluginRepository>
++      <id>mavengems</id>
++      <url>mavengem:http://rubygems.org</url>
++    </pluginRepository>
++    <pluginRepository>
++      <releases>
++        <enabled>false</enabled>
++      </releases>
++      <snapshots>
++        <enabled>true</enabled>
++      </snapshots>
++      <id>sonatype</id>
++      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
++    </pluginRepository>
++  </pluginRepositories>
++  <build>
++    <testSourceDirectory>.</testSourceDirectory>
++    <!--
++    <extensions>
++      <extension>
++        <groupId>org.torquebox.mojo</groupId>
++        <artifactId>mavengem-wagon</artifactId>
++        <version>0.2.0</version>
++      </extension>
++    </extensions>
++    -->
++    <defaultGoal>test</defaultGoal>
++    <pluginManagement>
++      <plugins>
++        <plugin>
++          <groupId>org.eclipse.m2e</groupId>
++          <artifactId>lifecycle-mapping</artifactId>
++          <version>1.0.0</version>
++          <configuration>
++            <lifecycleMappingMetadata>
++              <pluginExecutions>
++                <pluginExecution>
++                  <pluginExecutionFilter>
++                    <groupId>de.saumya.mojo</groupId>
++                    <artifactId>gem-maven-plugin</artifactId>
++                    <versionRange>[1.0.0-rc3,)</versionRange>
++                    <goals>
++                      <goal>initialize</goal>
++                    </goals>
++                  </pluginExecutionFilter>
++                  <action>
++                    <ignore></ignore>
++                  </action>
++                </pluginExecution>
++              </pluginExecutions>
++            </lifecycleMappingMetadata>
++          </configuration>
++        </plugin>
++      </plugins>
++    </pluginManagement>
++    <plugins>
++      <!--
++      <plugin>
++        <groupId>de.saumya.mojo</groupId>
++        <artifactId>gem-maven-plugin</artifactId>
++        <version>${jruby.plugins.version}</version>
++        <executions>
++          <execution>
++            <phase>initialize</phase>
++            <goals>
++              <goal>initialize</goal>
++            </goals>
++            <configuration>
++              <gemPath>${gem.home}</gemPath>
++              <gemHome>${gem.home}</gemHome>
++              <binDirectory>${jruby.home}/bin</binDirectory>
++              <includeRubygemsInTestResources>false</includeRubygemsInTestResources>
++              <libDirectory>${jruby.home}/lib</libDirectory>
++              <jrubyJvmArgs>-Djruby.home=${jruby.home}</jrubyJvmArgs>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++      -->
++      <plugin>
++        <artifactId>maven-compiler-plugin</artifactId>
++        <configuration>
++          <encoding>utf-8</encoding>
++          <debug>true</debug>
++          <verbose>true</verbose>
++          <fork>true</fork>
++          <showWarnings>true</showWarnings>
++          <showDeprecation>true</showDeprecation>
++          <source>${base.java.version}</source>
++          <target>${base.java.version}</target>
++          <testExcludes>
++            <testExclude>truffle/**/*.java</testExclude>
++          </testExcludes>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-dependency-plugin</artifactId>
++        <executions>
++          <execution>
++            <id>copy jars for testing</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>copy</goal>
++            </goals>
++            <configuration>
++              <artifactItems>
++                <artifactItem>
++                  <groupId>junit</groupId>
++                  <artifactId>junit</artifactId>
++                  <version>4.x</version>
++                  <type>jar</type>
++                  <overWrite>false</overWrite>
++                  <outputDirectory>target</outputDirectory>
++                  <destFileName>junit.jar</destFileName>
++                </artifactItem>
++                <artifactItem>
++                  <groupId>com.googlecode.jarjar</groupId>
++                  <artifactId>jarjar</artifactId>
++                  <version>debian</version>
++                  <type>jar</type>
++                  <overWrite>false</overWrite>
++                  <outputDirectory>target</outputDirectory>
++                  <destFileName>jarjar.jar</destFileName>
++                </artifactItem>
++                <artifactItem>
++                  <groupId>bsf</groupId>
++                  <artifactId>bsf</artifactId>
++                  <version>debian</version>
++                  <type>jar</type>
++                  <overWrite>false</overWrite>
++                  <outputDirectory>target</outputDirectory>
++                  <destFileName>bsf.jar</destFileName>
++                </artifactItem>
++              </artifactItems>
++            </configuration>
++          </execution>
++        </executions>
++      </plugin>
++      <plugin>
++        <artifactId>maven-deploy-plugin</artifactId>
++        <configuration>
++          <skip>true</skip>
++        </configuration>
++      </plugin>
++      <plugin>
++        <artifactId>maven-site-plugin</artifactId>
++        <configuration>
++          <skip>true</skip>
++          <skipDeploy>true</skipDeploy>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
++  <profiles>
++    <profile>
++      <id>bootstrap</id>
++      <dependencies>
++        <dependency>
++          <groupId>rubygems</groupId>
++          <artifactId>jruby-launcher</artifactId>
++          <version>${jruby-launcher.version}</version>
++          <type>gem</type>
++        </dependency>
++      </dependencies>
++    </profile>
++    <profile>
++      <id>rake</id>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>rake</id>
++                <phase>test</phase>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++                <configuration>
++                  <target>
++                    <exec failonerror="true" dir="${jruby.home}" executable="${jruby.home}/bin/jruby">
++                      <env value="" key="JRUBY_OPTS" />
++                      <arg value="-S" />
++                      <arg value="rake" />
++                      <arg value="${task}" />
++                    </exec>
++                  </target>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++    <profile>
++      <id>jruby_complete_jar_extended</id>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <executions>
++              <execution>
++                <id>jruby_complete_jar_jruby</id>
++                <phase>test</phase>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++                <configuration>
++                  <target>
++                    <exec failonerror="true" dir="${jruby.home}" executable="java">
++                      <arg value="-cp" />
++                      <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
++                      <arg value="-Djruby.aot.loadClasses=true" />
++                      <arg value="org.jruby.Main" />
++                      <arg value="-I." />
++                      <arg value="-Itest/mri/ruby" />
++                      <arg value="-Itest/mri" />
++                      <arg value="-Itest" />
++                      <arg value="-rtest/mri_test_env" />
++                      <arg value="lib/ruby/stdlib/rake/rake_test_loader.rb" />
++                      <arg value="test/jruby/test_globals.rb" />
++                      <arg value="test/jruby/test_addrinfo.rb" />
++                      <arg value="test/jruby/test_argf.rb" />
++                      <arg value="test/jruby/test_array.rb" />
++                      <arg value="test/jruby/test_autoload.rb" />
++                      <arg value="test/jruby/test_backquote.rb" />
++                      <arg value="test/jruby/test_backtraces.rb" />
++                      <arg value="test/jruby/test_big_decimal.rb" />
++                      <arg value="test/jruby/test_binding_eval_yield.rb" />
++                      <arg value="test/jruby/test_caller.rb" />
++                      <arg value="test/jruby/test_case.rb" />
++                      <arg value="test/jruby/test_class.rb" />
++                      <arg value="test/jruby/test_comparable.rb" />
++                      <arg value="test/jruby/test_core_arities.rb" />
++                      <arg value="test/jruby/test_custom_enumerable.rb" />
++                      <arg value="test/jruby/test_cvars_in_odd_scopes.rb" />
++                      <arg value="test/jruby/test_date_joda_time.rb" />
++                      <arg value="test/jruby/test_defined.rb" />
++                      <arg value="test/jruby/test_default_constants.rb" />
++                      <arg value="test/jruby/test_delegated_array_equals.rb" />
++                      <arg value="test/jruby/test_dir.rb" />
++                      <arg value="test/jruby/test_dir_with_jar_without_dir_entry.rb" />
++                      <arg value="test/jruby/test_digest_extend.rb" />
++                      <arg value="test/jruby/test_digest2.rb" />
++                      <arg value="test/jruby/test_env.rb" />
++                      <arg value="test/jruby/test_etc.rb" />
++                      <arg value="test/jruby/test_file.rb" />
++                      <arg value="test/jruby/test_frame_self.rb" />
++                      <arg value="test/jruby/test_hash.rb" />
++                      <arg value="test/jruby/test_higher_javasupport.rb" />
++                      <arg value="test/jruby/test_ifaddr.rb" />
++                      <arg value="test/jruby/test_integer_overflows.rb" />
++                      <arg value="test/jruby/test_ivar_table_integrity.rb" />
++                      <arg value="test/jruby/test_io.rb" />
++                      <arg value="test/jruby/test_load.rb" />
++                      <arg value="test/jruby/test_load_gem_extensions.rb" />
++                      <arg value="test/jruby/test_method.rb" />
++                      <arg value="test/jruby/test_method_cache.rb" />
++                      <arg value="test/jruby/test_method_override_and_caching.rb" />
++                      <arg value="test/jruby/test_java_accessible_object.rb" />
++                      <arg value="test/jruby/test_java_extension.rb" />
++                      <arg value="test/jruby/test_java_wrapper_deadlock.rb" />
++                      <arg value="test/jruby/test_jruby_internals.rb" />
++                      <arg value="test/jruby/test_marshal_with_instance_variables.rb" />
++                      <arg value="test/jruby/test_marshal_gemspec.rb" />
++                      <arg value="test/jruby/test_method_missing.rb" />
++                      <arg value="test/jruby/test_name_error.rb" />
++                      <arg value="test/jruby/test_no_stack_trace_stomp.rb" />
++                      <arg value="test/jruby/test_pack.rb" />
++                      <arg value="test/jruby/test_primitive_to_java.rb" />
++                      <arg value="test/jruby/test_process.rb" />
++                      <arg value="test/jruby/test_proc_visibility.rb" />
++                      <arg value="test/jruby/test_parsing.rb" />
++                      <arg value="test/jruby/test_pathname.rb" />
++                      <arg value="test/jruby/test_random.rb" />
++                      <arg value="test/jruby/test_rbconfig.rb" />
++                      <arg value="test/jruby/test_respond_to.rb" />
++                      <arg value="test/jruby/test_socket.rb" />
++                      <arg value="test/jruby/test_string_java_bytes.rb" />
++                      <arg value="test/jruby/test_string_printf.rb" />
++                      <arg value="test/jruby/test_super_call_site_caching.rb" />
++                      <arg value="test/jruby/test_system.rb" />
++                      <arg value="test/jruby/test_system_error.rb" />
++                      <arg value="test/jruby/test_timeout.rb" />
++                      <arg value="test/jruby/test_thread.rb" />
++                      <arg value="test/jruby/test_threaded_nonlocal_return.rb" />
++                      <arg value="test/jruby/test_time_add.rb" />
++                      <arg value="test/jruby/test_time_nil_ops.rb" />
++                      <arg value="test/jruby/test_time_tz.rb" />
++                      <arg value="test/jruby/test_unmarshal.rb" />
++                      <arg value="test/jruby/test_vietnamese_charset.rb" />
++                      <arg value="test/jruby/test_win32.rb" />
++                      <arg value="test/jruby/test_zlib.rb" />
++                      <arg value="test/jruby/test_loading_builtin_libraries.rb" />
++                      <arg value="test/jruby/test_null_channel.rb" />
++                      <arg value="test/jruby/test_irubyobject_java_passing.rb" />
++                      <arg value="test/jruby/test_jruby_object_input_stream.rb" />
++                      <arg value="test/jruby/test_jar_on_load_path.rb" />
++                      <arg value="test/jruby/test_jruby_core_ext.rb" />
++                      <arg value="test/jruby/test_thread_context_frame_dereferences_unreachable_variables.rb" />
++                      <arg value="test/jruby/test_context_classloader.rb" />
++                      <arg value="test/jruby/test_rexml_document.rb" />
++                      <arg value="test/jruby/test_openssl_stub.rb" />
++                      <arg value="test/jruby/test_missing_jruby_home.rb" />
++                      <arg value="test/jruby/test_jarred_gems.rb" />
++                      <arg value="test/jruby/test_kernel.rb" />
++                      <arg value="test/jruby/test_dir_with_plusses.rb" />
++                      <arg value="test/jruby/test_jar_file.rb" />
++                      <arg value="test/jruby/test_jruby_synchronized.rb" />
++                      <arg value="test/jruby/test_instantiating_interfaces.rb" />
++                      <arg value="test/jruby/test_openssl.rb" />
++                      <arg value="test/jruby/test_tempfile_cleanup.rb" />
++                      <arg value="test/jruby/test_reified_variables.rb" />
++                      <arg value="test/jruby/compiler/test_jrubyc.rb" />
++                      <arg value="test/jruby/test_load_compiled_ruby.rb" />
++                      <arg value="test/jruby/test_load_compiled_ruby_class_from_classpath.rb" />
++                      <arg value="-v" />
++                    </exec>
++                  </target>
++                </configuration>
++              </execution>
++              <execution>
++                <id>jruby_complete_jar_objectspace</id>
++                <phase>test</phase>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++                <configuration>
++                  <target>
++                    <exec failonerror="true" dir="${jruby.home}" executable="java">
++                      <arg value="-cp" />
++                      <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
++                      <arg value="-Djruby.aot.loadClasses=true" />
++                      <arg value="org.jruby.Main" />
++                      <arg value="-I." />
++                      <arg value="-Itest/mri/ruby" />
++                      <arg value="-Itest/mri" />
++                      <arg value="-Itest" />
++                      <arg value="-rtest/mri_test_env" />
++                      <arg value="lib/ruby/stdlib/rake/rake_test_loader.rb" />
++                      <arg value="test/jruby/test_objectspace.rb" />
++                      <arg value="test/jruby/test_cache_map_leak.rb" />
++                      <arg value="-v" />
++                    </exec>
++                  </target>
++                </configuration>
++              </execution>
++              <execution>
++                <id>jruby_complete_jar_slow</id>
++                <phase>test</phase>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++                <configuration>
++                  <target>
++                    <exec failonerror="true" dir="${jruby.home}" executable="java">
++                      <arg value="-cp" />
++                      <arg value="core/target/test-classes:test/target/test-classes:maven/jruby-complete/target/jruby-complete-${project.version}.jar" />
++                      <arg value="-Djruby.aot.loadClasses=true" />
++                      <arg value="org.jruby.Main" />
++                      <arg value="-I." />
++                      <arg value="-Itest/mri/ruby" />
++                      <arg value="-Itest/mri" />
++                      <arg value="-Itest" />
++                      <arg value="-rtest/mri_test_env" />
++                      <arg value="lib/ruby/stdlib/rake/rake_test_loader.rb" />
++                      <arg value="test/jruby/test_command_line_switches.rb" />
++                      <arg value="test/jruby/test_launching_by_shell_script.rb" />
++                      <arg value="-v" />
++                    </exec>
++                  </target>
++                </configuration>
++              </execution>
++            </executions>
++          </plugin>
++        </plugins>
++      </build>
++      <dependencies>
++        <dependency>
++          <groupId>org.jruby</groupId>
++          <artifactId>jruby-complete</artifactId>
++          <version>${project.version}</version>
++          <scope>provided</scope>
++        </dependency>
++      </dependencies>
++    </profile>
++  </profiles>
++</project>
diff --git a/debian/patches/0004-Use-debian-versions-for-plugins-in-pom-test.patch b/debian/patches/0004-Use-debian-versions-for-plugins-in-pom-test.patch
deleted file mode 100644
index c885b0e..0000000
--- a/debian/patches/0004-Use-debian-versions-for-plugins-in-pom-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Sat, 30 May 2015 12:57:27 -0300
-Subject: Use debian versions for test maven plugins configuration
-Forwarded: no
-
-diff --git a/test/pom.xml b/test/pom.xml
-index 64cdc98..7ee87db 100644
---- a/test/pom.xml
-+++ b/test/pom.xml
-@@ -179,7 +179,7 @@
-                 <artifactItem>
-                   <groupId>junit</groupId>
-                   <artifactId>junit</artifactId>
--                  <version>4.11</version>
-+                  <version>4.x</version>
-                   <type>jar</type>
-                   <overWrite>false</overWrite>
-                   <outputDirectory>target</outputDirectory>
-@@ -188,7 +188,7 @@
-                 <artifactItem>
-                   <groupId>com.googlecode.jarjar</groupId>
-                   <artifactId>jarjar</artifactId>
--                  <version>1.1</version>
-+                  <version>debian</version>
-                   <type>jar</type>
-                   <overWrite>false</overWrite>
-                   <outputDirectory>target</outputDirectory>
-@@ -197,7 +197,7 @@
-                 <artifactItem>
-                   <groupId>bsf</groupId>
-                   <artifactId>bsf</artifactId>
--                  <version>2.4.0</version>
-+                  <version></version>
-                   <type>jar</type>
-                   <overWrite>false</overWrite>
-                   <outputDirectory>target</outputDirectory>
diff --git a/debian/patches/0005-Disable-jnr-ffi-native-usage.patch b/debian/patches/0005-Disable-jnr-ffi-native-usage.patch
new file mode 100644
index 0000000..5f4a807
--- /dev/null
+++ b/debian/patches/0005-Disable-jnr-ffi-native-usage.patch
@@ -0,0 +1,40 @@
+Description: Disable jnr-ffi native usage
+ There is not a jnr-ffi native jar in Debian
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-02-01
+
+--- jruby-9.1.6.0.orig/core/pom.xml
++++ jruby-9.1.6.0/core/pom.xml
+@@ -638,6 +638,7 @@ DO NOT MODIFIY - GENERATED CODE
+       <plugin>
+         <artifactId>maven-dependency-plugin</artifactId>
+         <executions>
++          <!--
+           <execution>
+             <id>unzip native</id>
+             <phase>clean</phase>
+@@ -659,6 +660,7 @@ DO NOT MODIFIY - GENERATED CODE
+               </artifactItems>
+             </configuration>
+           </execution>
++          -->
+         </executions>
+       </plugin>
+     </plugins>
+@@ -1044,6 +1046,7 @@ DO NOT MODIFIY - GENERATED CODE
+           <plugin>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
++              <!--
+               <execution>
+                 <phase>process-classes</phase>
+                 <goals>
+@@ -1064,6 +1067,7 @@ DO NOT MODIFIY - GENERATED CODE
+                   </artifactItems>
+                 </configuration>
+               </execution>
++              -->
+             </executions>
+           </plugin>
+         </plugins>
diff --git a/debian/patches/0006-Allow-rdoc-to-run-without-gems.patch b/debian/patches/0006-Allow-rdoc-to-run-without-gems.patch
deleted file mode 100644
index 8cdba32..0000000
--- a/debian/patches/0006-Allow-rdoc-to-run-without-gems.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Thu, 28 May 2015 20:05:48 -0300
-Subject: Allow rdoc based tools to run if there are gem load errors
-Forwarded: no
-
-diff --git a/bin/rdoc b/bin/rdoc
-index bddda40..6b3ba2c 100755
---- a/bin/rdoc
-+++ b/bin/rdoc
-@@ -19,5 +19,39 @@ if ARGV.first
-   end
- end
- 
--gem 'rdoc', version
--load Gem.bin_path('rdoc', 'rdoc', version)
-+begin
-+  gem 'rdoc', version
-+  load Gem.bin_path('rdoc', 'rdoc', version)
-+rescue NameError => e # --disable-gems
-+  raise unless e.name == :gem
-+rescue Gem::LoadError
-+end
-+
-+require 'rdoc/rdoc'
-+
-+begin
-+  r = RDoc::RDoc.new
-+  r.document ARGV
-+rescue Errno::ENOSPC
-+  $stderr.puts 'Ran out of space creating documentation'
-+  $stderr.puts
-+  $stderr.puts 'Please free up some space and try again'
-+rescue SystemExit
-+  raise
-+rescue Exception => e
-+  if $DEBUG_RDOC then
-+    $stderr.puts e.message
-+    $stderr.puts "#{e.backtrace.join "\n\t"}"
-+    $stderr.puts
-+  elsif Interrupt === e then
-+    $stderr.puts
-+    $stderr.puts 'Interrupted'
-+  else
-+    $stderr.puts "uh-oh! RDoc had a problem:"
-+    $stderr.puts e.message
-+    $stderr.puts
-+    $stderr.puts "run with --debug for full backtrace"
-+  end
-+
-+  exit 1
-+end
-diff --git a/bin/ri b/bin/ri
-index 2c0b3d5..f74c830 100755
---- a/bin/ri
-+++ b/bin/ri
-@@ -19,5 +19,14 @@ if ARGV.first
-   end
- end
- 
--gem 'rdoc', version
--load Gem.bin_path('rdoc', 'ri', version)
-+begin
-+  gem 'rdoc', version
-+  load Gem.bin_path('rdoc', 'ri', version)
-+rescue NameError => e # --disable-gems
-+  raise unless e.name == :gem
-+rescue Gem::LoadError
-+end
-+
-+require 'rdoc/ri/driver'
-+
-+RDoc::RI::Driver.run ARGV
diff --git a/debian/patches/0006-Disable-maven-jruby-jars-artifact.patch b/debian/patches/0006-Disable-maven-jruby-jars-artifact.patch
new file mode 100644
index 0000000..d00a783
--- /dev/null
+++ b/debian/patches/0006-Disable-maven-jruby-jars-artifact.patch
@@ -0,0 +1,49 @@
+Description: Disable jruby-jars maven artifact build
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-02-02
+
+--- a/maven/pom.xml
++++ b/maven/pom.xml
+@@ -58,7 +58,7 @@
+       <modules>
+         <module>jruby</module>
+         <module>jruby-complete</module>
+-        <module>jruby-jars</module>
++        <!--<module>jruby-jars</module>-->
+         <module>jruby-dist</module>
+       </modules>
+     </profile>
+@@ -73,7 +73,7 @@
+       <modules>
+         <module>jruby</module>
+         <module>jruby-complete</module>
+-        <module>jruby-jars</module>
++        <!--<module>jruby-jars</module>-->
+         <module>jruby-dist</module>
+       </modules>
+     </profile>
+@@ -101,7 +101,7 @@
+       <modules>
+         <module>jruby</module>
+         <module>jruby-complete</module>
+-        <module>jruby-jars</module>
++        <!--<module>jruby-jars</module>-->
+         <module>jruby-dist</module>
+       </modules>
+     </profile>
+@@ -117,12 +117,14 @@
+         <module>jruby-complete</module>
+       </modules>
+     </profile>
++    <!--
+     <profile>
+       <id>jruby-jars</id>
+       <modules>
+         <module>jruby-jars</module>
+       </modules>
+     </profile>
++    -->
+     <profile>
+       <id>dist</id>
+       <modules>
diff --git a/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch b/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
new file mode 100644
index 0000000..f08e462
--- /dev/null
+++ b/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
@@ -0,0 +1,78 @@
+Description: Add /usr/lib/ruby/vendor_ruby to default LOAD_PATH
+Author: Miguel Landaeta <nomadium at debian.org>
+Bug-Debian: https://bugs.debian.org/663342
+Forwarded: no
+Last-Update: 2017-02-10
+
+--- a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
++++ b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
+@@ -65,6 +65,8 @@ public class RbConfigLibrary implements Library {
+     private static final String RUBY_FREEBSD = "freebsd";
+     private static final String RUBY_AIX = "aix";
+ 
++    private static final String MRI_VENDOR_LIBDIR = "/usr/lib/ruby/vendor_ruby";
++
+     private static String normalizedHome;
+ 
+     /** This is a map from Java's "friendly" OS names to those used by Ruby */
+@@ -186,6 +188,10 @@ public class RbConfigLibrary implements Library {
+         return newFile(getRubyLibDir(runtime), "vendor_ruby").getPath();
+     }
+ 
++    public static String getMRIVendorLibDir(Ruby runtime) {
++        return SafePropertyAccessor.getProperty("debian.mri.vendor.libdir", MRI_VENDOR_LIBDIR);
++    }
++
+     public static String getVendorLibDir(Ruby runtime) {
+         return getVendorDir(runtime);
+     }
+@@ -294,6 +300,7 @@ public class RbConfigLibrary implements Library {
+         String rubyLibDir = getRubyLibDir(runtime);
+         String archDir = getArchDir(runtime);
+         String vendorDir = getVendorDir(runtime);
++        String vendorMRILibDir = getMRIVendorLibDir(runtime);
+         String vendorLibDir = getVendorLibDir(runtime);
+         String vendorArchDir = getVendorArchDir(runtime);
+         String siteDir = getSiteDir(runtime);
+@@ -310,6 +317,7 @@ public class RbConfigLibrary implements Library {
+         setConfig(configHash, "vendorlibdir",   vendorLibDir);
+         setConfig(configHash, "vendorarchdir",    vendorArchDir);
+         }
++        setConfig(configHash, "mri_vendor_libdir", vendorMRILibDir);
+         setConfig(configHash, "sitedir",        siteDir);
+         setConfig(configHash, "sitelibdir",     siteLibDir);
+         setConfig(configHash, "sitearchdir",    siteArchDir);
+
+--- a/core/src/main/java/org/jruby/runtime/load/LoadService.java
++++ b/core/src/main/java/org/jruby/runtime/load/LoadService.java
+@@ -70,6 +70,7 @@ import org.jruby.runtime.Helpers;
+ import org.jruby.runtime.builtin.IRubyObject;
+ import org.jruby.util.FileResource;
+ import org.jruby.util.JRubyFile;
++import org.jruby.util.SafePropertyAccessor;
+ import org.jruby.util.collections.StringArraySet;
+ import org.jruby.util.log.Logger;
+ import org.jruby.util.log.LoggerFactory;
+@@ -251,6 +252,11 @@ public class LoadService {
+                 addPath(RbConfigLibrary.getRubyLibDir(runtime));
+             }
+ 
++            // Allow jruby to load libraries installed in the system
++            if (SafePropertyAccessor.getBoolean("debian.include.mri_vendor_libdir_in_load_path", false)) {
++                addPath(RbConfigLibrary.getMRIVendorLibDir(runtime));
++            }
++
+         } catch(SecurityException ignore) {}
+         addPaths(runtime.getInstanceConfig().getExtraLoadPaths());
+     }
+
+--- a/bin/jruby.bash
++++ b/bin/jruby.bash
+@@ -413,6 +413,7 @@
+       "-Djruby.home=$JRUBY_HOME" \
+       "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
+       "-Djruby.shell=$JRUBY_SHELL" \
++      "-Ddebian.include.mri_vendor_libdir_in_load_path=true" \
+       $java_class $mode "$@"
+   fi
+ fi
diff --git a/debian/patches/0007-Enable-test-suites.patch b/debian/patches/0007-Enable-test-suites.patch
deleted file mode 100644
index 683c1af..0000000
--- a/debian/patches/0007-Enable-test-suites.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 29 Dec 2016 15:44:21 +0100
-Subject: 0007-Enable-test-suites
-
----
- rakelib/rspec.rake | 5 +++--
- rakelib/test.rake  | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/rakelib/rspec.rake b/rakelib/rspec.rake
-index dfdf655d5..fddd1ca26 100644
---- a/rakelib/rspec.rake
-+++ b/rakelib/rspec.rake
-@@ -15,8 +15,9 @@
- 
- namespace :spec do
-   # Put Rake on the load path for JI specs without requiring rubygems
--  rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
--  gem 'rspec'
-+  #rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
-+  #gem 'rspec'
-+  rake_location = './lib/ruby/1.9/rake.rb'
-   require 'rspec/core/rake_task'
- 
-   compile_flags = {
-diff --git a/rakelib/test.rake b/rakelib/test.rake
-index 250133647..302e2ccae 100644
---- a/rakelib/test.rake
-+++ b/rakelib/test.rake
-@@ -114,6 +114,7 @@ namespace :test do
-     t.ruby_opts << '-I test/externals/ruby1.9'
-     t.ruby_opts << '-I test/externals/ruby1.9/ruby'
-     t.ruby_opts << '-r ./test/ruby19_env.rb'
-+    t.ruby_opts << '-r minitest'
-     t.ruby_opts << '-r minitest/excludes'
-   end
-   
diff --git a/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch b/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
new file mode 100644
index 0000000..5cc7015
--- /dev/null
+++ b/debian/patches/0008-Configure-unit-tests-to-run-at-build-time.patch
@@ -0,0 +1,68 @@
+Description: Configure unit tests setup for Debian builds
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-02-10
+
+--- jruby-9.1.6.0.orig/rakelib/rspec.rake
++++ jruby-9.1.6.0/rakelib/rspec.rake
+@@ -15,8 +15,9 @@
+ 
+ namespace :spec do
+   # Put Rake on the load path for JI specs without requiring rubygems
+-  rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
+-  gem 'rspec'
++  # rake_location = File.join(Gem.loaded_specs['rake'].full_gem_path, "lib")
++  # gem 'rspec'
++  rake_location = '/usr/lib/ruby/vendor_ruby/rake.rb'
+   require 'rspec/core/rake_task'
+ 
+   compile_flags = {
+
+--- jruby-9.1.6.0.orig/bin/rake
++++ jruby-9.1.6.0/bin/rake
+@@ -6,17 +6,23 @@
+ # this file is here to facilitate running it.
+ #
+ 
+-require 'rubygems'
++#require 'rubygems'
++#
++#version = ">= 0.a"
++#
++#if ARGV.first
++#  str = ARGV.first
++#  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
++#  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
++#    version = $1
++#    ARGV.shift
++#  end
++#end
++#
++#load Gem.activate_bin_path('rake', 'rake', version)
+ 
+-version = ">= 0.a"
++$LOAD_PATH << '/usr/lib/ruby/vendor_ruby'
+ 
+-if ARGV.first
+-  str = ARGV.first
+-  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+-  if str =~ /\A_(.*)_\z/ and Gem::Version.correct?($1) then
+-    version = $1
+-    ARGV.shift
+-  end
+-end
++require 'rake'
+ 
+-load Gem.activate_bin_path('rake', 'rake', version)
++Rake.application.run
+
+--- jruby-9.1.6.0.orig/rakelib/test.rake
++++ jruby-9.1.6.0/rakelib/test.rake
+@@ -117,6 +117,7 @@ namespace :test do
+     t.verbose = true
+     t.ruby_opts << '-Xaot.loadClasses=true' # disabled by default now
+     t.ruby_opts << '-I.'
++    t.ruby_opts << '-I/usr/lib/ruby/vendor_ruby'
+     t.ruby_opts << '-J-ea'
+     t.ruby_opts << '--headless'
+     classpath = %w[test test/target/test-classes core/target/test-classes].join(File::PATH_SEPARATOR)
diff --git a/debian/patches/0008-Disable-some-failing-user-tests-in-pbuilder.patch b/debian/patches/0008-Disable-some-failing-user-tests-in-pbuilder.patch
deleted file mode 100644
index 9affeec..0000000
--- a/debian/patches/0008-Disable-some-failing-user-tests-in-pbuilder.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Fri, 29 May 2015 21:11:16 -0300
-Subject: Disable tests with unexpected results when jruby is built inside a pbuilder chroot
-Forwarded: no
-
-diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
-index 23307c8..a1da921 100644
---- a/spec/ruby/core/dir/home_spec.rb
-+++ b/spec/ruby/core/dir/home_spec.rb
-@@ -15,9 +15,9 @@ ruby_version_is "1.9" do
-       Dir.home.should == home_directory
-     end
- 
--    it "returns the named user's home directory as a string if called with an argument" do
--      Dir.home(ENV['USER']).should == home_directory
--    end
-+    #it "returns the named user's home directory as a string if called with an argument" do
-+    #  Dir.home(ENV['USER']).should == home_directory
-+    #end
- 
-     it "raises an ArgumentError if the named user doesn't exist" do
-       lambda { Dir.home('geuw2n288dh2k') }.should raise_error(ArgumentError)
-diff --git a/spec/ruby/core/file/expand_path_spec.rb b/spec/ruby/core/file/expand_path_spec.rb
-index 4fa6855..4c8b164 100644
---- a/spec/ruby/core/file/expand_path_spec.rb
-+++ b/spec/ruby/core/file/expand_path_spec.rb
-@@ -130,10 +130,10 @@ describe "File.expand_path" do
-       lambda { File.expand_path("~a_not_existing_user") }.should raise_error(ArgumentError)
-     end
- 
--    it "expands ~ENV['USER'] to the user's home directory" do
--      File.expand_path("~#{ENV['USER']}").should == ENV['HOME']
--      File.expand_path("~#{ENV['USER']}/a").should == "#{ENV['HOME']}/a"
--    end
-+    #it "expands ~ENV['USER'] to the user's home directory" do
-+    #  File.expand_path("~#{ENV['USER']}").should == ENV['HOME']
-+    #  File.expand_path("~#{ENV['USER']}/a").should == "#{ENV['HOME']}/a"
-+    #end
- 
-     it "does not expand ~ENV['USER'] when it's not at the start" do
-       File.expand_path("/~#{ENV['USER']}/a").should == "/~#{ENV['USER']}/a"
-diff --git a/spec/ruby/library/etc/getlogin_spec.rb b/spec/ruby/library/etc/getlogin_spec.rb
-index a217ae1..914e16c 100644
---- a/spec/ruby/library/etc/getlogin_spec.rb
-+++ b/spec/ruby/library/etc/getlogin_spec.rb
-@@ -2,13 +2,13 @@ require File.expand_path('../../../spec_helper', __FILE__)
- require 'etc'
- 
- describe "Etc.getlogin" do
--  it "returns the name of the user who runs this process" do
--    if Etc.getlogin
--      Etc.getlogin.should == username
--    else
--      # Etc.getlogin may return nil if the login name is not set
--      # because of chroot or sudo or something.
--      Etc.getlogin.should be_nil
--    end
--  end
-+  #it "returns the name of the user who runs this process" do
-+  #  if Etc.getlogin
-+  #    Etc.getlogin.should == username
-+  #  else
-+  #    # Etc.getlogin may return nil if the login name is not set
-+  #    # because of chroot or sudo or something.
-+  #    Etc.getlogin.should be_nil
-+  #  end
-+  #end
- end
---- jruby-1.7.22.orig/spec/ruby/core/dir/chdir_spec.rb
-+++ jruby-1.7.22/spec/ruby/core/dir/chdir_spec.rb
-@@ -18,15 +18,15 @@ describe "Dir.chdir" do
-     Dir.chdir(@original)
-   end
-
--  it "defaults to $HOME with no arguments" do
--    if ENV['HOME']
--    Dir.chdir(ENV['HOME'])
--    home = Dir.pwd
--
--    Dir.chdir
--    Dir.pwd.should == home
--    end
--  end
-+#  it "defaults to $HOME with no arguments" do
-+#    if ENV['HOME']
-+#    Dir.chdir(ENV['HOME'])
-+#    home = Dir.pwd
-+#
-+#    Dir.chdir
-+#    Dir.pwd.should == home
-+#    end
-+#  end
-
-   it "changes to the specified directory" do
-     Dir.chdir DirSpecs.mock_dir
-@@ -70,15 +70,15 @@ describe "Dir.chdir" do
-     Dir.chdir(@original) { :block_value }.should == :block_value
-   end
-
--  it "defaults to the home directory when given a block but no argument" do
--    # Windows will return a path with forward slashes for ENV["HOME"] so we have
--    # to compare the route representations returned by Dir.chdir.
--    current_dir = ""
--    Dir.chdir { current_dir = Dir.pwd }
--
--    Dir.chdir(ENV['HOME'])
--    current_dir.should == Dir.pwd
--  end
-+#  it "defaults to the home directory when given a block but no argument" do
-+#    # Windows will return a path with forward slashes for ENV["HOME"] so we have
-+#    # to compare the route representations returned by Dir.chdir.
-+#    current_dir = ""
-+#    Dir.chdir { current_dir = Dir.pwd }
-+#
-+#    Dir.chdir(ENV['HOME'])
-+#    current_dir.should == Dir.pwd
-+#  end
-
-   it "changes to the specified directory for the duration of the block" do
-     ar = Dir.chdir(DirSpecs.mock_dir) { |dir| [dir, Dir.pwd] }
---- jruby-1.7.22.orig/spec/ruby/core/dir/exists_spec.rb
-+++ jruby-1.7.22/spec/ruby/core/dir/exists_spec.rb
-@@ -2,16 +2,16 @@ require File.expand_path('../../../spec_
- require File.expand_path('../fixtures/common', __FILE__)
- require File.expand_path('../shared/exists', __FILE__)
-
--ruby_version_is "1.9" do
--  describe "Dir.exists?" do
--    before :all do
--      DirSpecs.create_mock_dirs
--    end
--
--    after :all do
--      DirSpecs.delete_mock_dirs
--    end
--
--    it_behaves_like(:dir_exists, :exists?)
--  end
--end
-+#ruby_version_is "1.9" do
-+#  describe "Dir.exists?" do
-+#    before :all do
-+#      DirSpecs.create_mock_dirs
-+#    end
-+#
-+#    after :all do
-+#      DirSpecs.delete_mock_dirs
-+#    end
-+#
-+#    it_behaves_like(:dir_exists, :exists?)
-+#  end
-+#end
---- jruby-1.7.22.orig/spec/ruby/core/dir/exist_spec.rb
-+++ jruby-1.7.22/spec/ruby/core/dir/exist_spec.rb
-@@ -2,16 +2,16 @@ require File.expand_path('../../../spec_
- require File.expand_path('../fixtures/common', __FILE__)
- require File.expand_path('../shared/exists', __FILE__)
-
--ruby_version_is "1.9" do
--  describe "Dir.exist?" do
--    before :all do
--      DirSpecs.create_mock_dirs
--    end
--
--    after :all do
--      DirSpecs.delete_mock_dirs
--    end
--
--    it_behaves_like(:dir_exists, :exist?)
--  end
--end
-+#ruby_version_is "1.9" do
-+#  describe "Dir.exist?" do
-+#    before :all do
-+#      DirSpecs.create_mock_dirs
-+#    end
-+#
-+#    after :all do
-+#      DirSpecs.delete_mock_dirs
-+#    end
-+#
-+#    it_behaves_like(:dir_exists, :exist?)
-+#  end
-+#end
diff --git a/debian/patches/0009-Disable-bigdecimal-divmod-spec-failing-test.patch b/debian/patches/0009-Disable-bigdecimal-divmod-spec-failing-test.patch
deleted file mode 100644
index eb37671..0000000
--- a/debian/patches/0009-Disable-bigdecimal-divmod-spec-failing-test.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Disable bigdecimal divmod reversing test
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2015-06-18
-
---- jruby-1.7.20.1.orig/spec/ruby/library/bigdecimal/divmod_spec.rb
-+++ jruby-1.7.20.1/spec/ruby/library/bigdecimal/divmod_spec.rb
-@@ -138,15 +138,16 @@ describe "BigDecimal#divmod" do
-       values << BigDecimal('-2E-5555')
- 
- 
--      values_and_zeroes = values + @zeroes
--      values_and_zeroes.each do |val1|
--        values.each do |val2|
--          res = val1.divmod(val2)
--          DivmodSpecs::check_both_bigdecimal(res)
--          res[0].should == ((val1/val2).floor)
--          res[1].should == (val1 - res[0] * val2)
--        end
--      end
-+      # not quite sure what changed since 1.7.19 that is breaking this:
-+      #values_and_zeroes = values + @zeroes
-+      #values_and_zeroes.each do |val1|
-+      #  values.each do |val2|
-+      #    res = val1.divmod(val2)
-+      #    DivmodSpecs::check_both_bigdecimal(res)
-+      #    res[0].should == ((val1/val2).floor)
-+      #    res[1].should == (val1 - res[0] * val2)
-+      # end
-+      #end
-     end
-   end
- 
diff --git a/debian/patches/0010-Disable-maven-invoker-plugin.patch b/debian/patches/0010-Disable-maven-invoker-plugin.patch
deleted file mode 100644
index c1ef479..0000000
--- a/debian/patches/0010-Disable-maven-invoker-plugin.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Mon, 14 Sep 2015 22:02:55 -0300
-Subject: Disable maven-invoker-plugin usage for some jruby module builds
-Forwarded: no
-
-diff --git a/maven/jruby-complete/pom.xml b/maven/jruby-complete/pom.xml
-index 42b1913..7679027 100644
---- a/maven/jruby-complete/pom.xml
-+++ b/maven/jruby-complete/pom.xml
-@@ -86,9 +86,13 @@
-           </instructions>
-         </configuration>
-       </plugin>
-+      <!-- I'm not quite sure yet but I suspect there is an incompatibility
-+      with this plugin or its configuration used for this build and Maven 3.
-+      I had to disabled it, otherwise jruby FTFBS!
-       <plugin>
-         <artifactId>maven-invoker-plugin</artifactId>
-       </plugin>
-+      -->
-       <plugin>
-         <artifactId>maven-source-plugin</artifactId>
-         <configuration>
-@@ -217,6 +221,7 @@
-       </activation>
-       <build>
-         <plugins>
-+          <!--
-           <plugin>
-             <artifactId>maven-invoker-plugin</artifactId>
-             <configuration>
-@@ -227,6 +232,7 @@
-               </pomExcludes>
-             </configuration>
-           </plugin>
-+          -->
-         </plugins>
-       </build>
-     </profile>
-diff --git a/maven/jruby-stdlib/pom.xml b/maven/jruby-stdlib/pom.xml
-index 1943a10..ad83a92 100644
---- a/maven/jruby-stdlib/pom.xml
-+++ b/maven/jruby-stdlib/pom.xml
-@@ -75,9 +75,13 @@
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>build-helper-maven-plugin</artifactId>
-       </plugin>
-+      <!-- I'm not quite sure yet but I suspect there is an incompatibility
-+      with this plugin or its configuration used for this build and Maven 3.
-+      I had to disabled it, otherwise jruby FTFBS!
-       <plugin>
-         <artifactId>maven-invoker-plugin</artifactId>
-       </plugin>
-+      -->
-       <plugin>
-         <artifactId>maven-jar-plugin</artifactId>
-         <configuration>
diff --git a/debian/patches/0011-Snakeyaml-1.17-compatibility.patch b/debian/patches/0011-Snakeyaml-1.17-compatibility.patch
deleted file mode 100644
index 3dcfe2c..0000000
--- a/debian/patches/0011-Snakeyaml-1.17-compatibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add compatibility with recent versions of snakeyaml
-Author: Miguel Landaeta <nomadium at debian.org>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/821181
-Forwarded: no
-Last-Update: 2016-04-16
-
---- jruby-1.7.25.orig/core/src/main/java/org/jruby/ext/psych/PsychParser.java
-+++ jruby-1.7.25/core/src/main/java/org/jruby/ext/psych/PsychParser.java
-@@ -242,7 +242,8 @@ public class PsychParser extends RubyObj
-     private void handleDocumentStart(ThreadContext context, DocumentStartEvent dse, boolean tainted, IRubyObject handler) {
-         Ruby runtime = context.runtime;
-         DumperOptions.Version _version = dse.getVersion();
--        Integer[] versionInts = _version == null ? null : _version.getArray();
-+        // upstream keep using older versions of snakeyaml
-+        Integer[] versionInts = _version == null ? null : new Integer[]{_version.major(), _version.minor()};
-         IRubyObject version = versionInts == null ?
-             RubyArray.newArray(runtime) :
-             RubyArray.newArray(runtime, runtime.newFixnum(versionInts[0]), runtime.newFixnum(versionInts[1]));
diff --git a/debian/patches/0012-Disable-outdated-specs.patch b/debian/patches/0012-Disable-outdated-specs.patch
deleted file mode 100644
index 56380e7..0000000
--- a/debian/patches/0012-Disable-outdated-specs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Disable outdated/unmaintained specs
- Upstream have been backporting fixes from 9k master branch but
- the specs are unmaintained since years ago, so some them are
- started to break. I prefer to disable them than to modify them.
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2016-11-10
-
---- jruby-1.7.25.orig/spec/ruby/command_line/dash_x_spec.rb
-+++ jruby-1.7.25/spec/ruby/command_line/dash_x_spec.rb
-@@ -1,12 +1,12 @@
--describe "The -x command line option" do
--  before :each do
--    @file = fixture __FILE__, "embedded_ruby.txt"
--  end
--
--  it "runs code after the first /\#!.*ruby.*/-ish line in target file" do
--    result = `#{RUBY_EXE} -x #{@file}`
--    result.should == "success\n"
--  end
--  
--  it "needs to be reviewed for spec completeness"
--end
-+# describe "The -x command line option" do
-+#   before :each do
-+#     @file = fixture __FILE__, "embedded_ruby.txt"
-+#   end
-+#
-+#   it "runs code after the first /\#!.*ruby.*/-ish line in target file" do
-+#     result = `#{RUBY_EXE} -x #{@file}`
-+#     result.should == "success\n"
-+#   end
-+#
-+#   it "needs to be reviewed for spec completeness"
-+# end
---- jruby-1.7.25.orig/spec/ruby/library/bigdecimal/infinite_spec.rb
-+++ jruby-1.7.25/spec/ruby/library/bigdecimal/infinite_spec.rb
-@@ -19,7 +19,7 @@ describe "BigDecimal#infinite?" do
-     e3_minus.infinite?.should == nil
-     e2_plus.infinite?.should == nil
-     really_small_zero.infinite?.should == nil
--    really_big_zero.infinite?.should == nil
-+    # really_big_zero.infinite?.should == nil
-     BigDecimal("0.000000000000000000000000").infinite?.should == nil
-   end
- 
---- jruby-1.7.25.orig/spec/ruby/library/bigdecimal/nonzero_spec.rb
-+++ jruby-1.7.25/spec/ruby/library/bigdecimal/nonzero_spec.rb
-@@ -22,7 +22,7 @@ describe "BigDecimal#nonzero?" do
-     really_small_zero = BigDecimal("0E-200000000")
-     really_big_zero = BigDecimal("0E200000000000")
-     really_small_zero.nonzero?.should == nil
--    really_big_zero.nonzero?.should == nil
-+    # really_big_zero.nonzero?.should == nil
-     BigDecimal("0.000000000000000000000000").nonzero?.should == nil
-   end
- 
---- jruby-1.7.25.orig/spec/ruby/library/bigdecimal/zero_spec.rb
-+++ jruby-1.7.25/spec/ruby/library/bigdecimal/zero_spec.rb
-@@ -7,7 +7,7 @@ describe "BigDecimal#zero?" do
-     really_small_zero = BigDecimal("0E-200000000")
-     really_big_zero = BigDecimal("0E200000000000")
-     really_small_zero.zero?.should == true
--    really_big_zero.zero?.should == true
-+    # really_big_zero.zero?.should == true
-     BigDecimal("0.000000000000000000000000").zero?.should == true
-     BigDecimal("0").zero?.should == true
-     BigDecimal("0E0").zero?.should == true
diff --git a/debian/patches/series b/debian/patches/series
index 908ce3e..6e302c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
-0001-Fix-shebang-lines.patch
-0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
-0004-Use-debian-versions-for-plugins-in-pom-test.patch
-0006-Allow-rdoc-to-run-without-gems.patch
-0007-Enable-test-suites.patch
-0008-Disable-some-failing-user-tests-in-pbuilder.patch
-0009-Disable-bigdecimal-divmod-spec-failing-test.patch
-0010-Disable-maven-invoker-plugin.patch
-0011-Snakeyaml-1.17-compatibility.patch
-0012-Disable-outdated-specs.patch
+0001-Disable-polyglot-maven-extension.patch
+0002-Disable-unpackaged-plugins-in-lib-module.patch
+0003-Disable-truffle-module.patch
+0004-Add-missing-maven-artifacts-pom-files.patch
+0005-Disable-jnr-ffi-native-usage.patch
+0006-Disable-maven-jruby-jars-artifact.patch
+0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
+0008-Configure-unit-tests-to-run-at-build-time.patch

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



More information about the pkg-java-commits mailing list