[jruby-maven-plugins] 05/07: Fixed the execution of install_gems during the build

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Sep 5 21:47:56 UTC 2017


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

ebourg-guest pushed a commit to branch master
in repository jruby-maven-plugins.

commit 681eff37f6b4325afb2bfdd8a45da33bf08eca7f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 5 23:25:44 2017 +0200

    Fixed the execution of install_gems during the build
---
 debian/changelog                      |  1 +
 debian/patches/fix-install-gems.patch | 10 ++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c01bf3f..54c99d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jruby-maven-plugins (1.1.5+ds1-2) UNRELEASED; urgency=medium
   * Fixed a flawed assertion that fail to compile with the source level 1.7
     (Closes: #867648)
   * Removed plexus-archiver.patch and depend on libplexus-archiver-java (>= 3.5)
+  * Fixed the execution of install_gems during the build
   * Standards-Version updated to 4.1.0
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Aug 2017 13:16:31 +0200
diff --git a/debian/patches/fix-install-gems.patch b/debian/patches/fix-install-gems.patch
new file mode 100644
index 0000000..b295a2d
--- /dev/null
+++ b/debian/patches/fix-install-gems.patch
@@ -0,0 +1,10 @@
+--- a/ruby-tools/pom.xml
++++ b/ruby-tools/pom.xml
+@@ -133,6 +133,7 @@
+               <arguments>
+ 		<argument>-jar</argument>
+ 		<argument>${project.build.directory}/jruby-complete-${jruby.version}.jar</argument>
++		<argument>-I/usr/share/jruby/lib/ruby/stdlib/</argument>
+ 		<argument>${basedir}/src/main/scripts/install_gems.rb</argument>
+ 	      </arguments>
+ 	    </configuration>
diff --git a/debian/patches/series b/debian/patches/series
index b096578..95e35fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable-rubygems-repo.diff
 snakeyaml.patch
+fix-install-gems.patch
 fix-assertion.patch

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



More information about the pkg-java-commits mailing list