[jruby] 01/01: Fix FTBFS due to Maven 3.3.x changes

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository jruby.

commit 0d11771408d2d6b48b5117661d68ac6f9dd6f68b
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Tue Jul 14 20:17:21 2015 -0300

    Fix FTBFS due to Maven 3.3.x changes
---
 debian/changelog | 6 ++++++
 debian/maven3.mk | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e89cf46..34b4aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jruby (1.7.21-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS due to Maven 3.3.x changes.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Tue, 14 Jul 2015 20:20:23 -0300
+
 jruby (1.7.21-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/maven3.mk b/debian/maven3.mk
index f2bc0b2..331165a 100644
--- a/debian/maven3.mk
+++ b/debian/maven3.mk
@@ -6,6 +6,8 @@ MAVEN_HOME = /usr/share/maven
 DEB_CLASSPATH = $(MAVEN_HOME)/boot/plexus-classworlds-2.x.jar
 DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) \
                  $(JAVA_OPTS) -Dclassworlds.conf=$(CURDIR)/debian/m2.conf \
+                 -Dmaven.home=/usr/share/maven \
+                 -Dmaven.multiModuleProjectDirectory=$(CURDIR) \
                  org.codehaus.plexus.classworlds.launcher.Launcher \
                  -s/etc/maven2/settings-debian.xml \
                  -Dmaven.repo.local=$(DEB_MAVEN_REPO) \

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