[jruby] 01/02: Fix an FTBFS caused by a change in Maven 3

[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 accb4867b1cb33aa6beb5f0f59dbeb794f44b3de
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Dec 28 13:01:30 2015 -0300

    Fix an FTBFS caused by a change in Maven 3
---
 debian/changelog | 6 ++++++
 debian/maven3.mk | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e774ecc..761944a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jruby (1.7.22-2) UNRELEASED; urgency=medium
+
+  * Fix an FTBFS caused by a change in Maven 3.
+
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 28 Dec 2015 13:00:05 -0300
+
 jruby (1.7.22-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/maven3.mk b/debian/maven3.mk
index 331165a..d4dd478 100644
--- a/debian/maven3.mk
+++ b/debian/maven3.mk
@@ -9,6 +9,6 @@ DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH)
                  -Dmaven.home=/usr/share/maven \
                  -Dmaven.multiModuleProjectDirectory=$(CURDIR) \
                  org.codehaus.plexus.classworlds.launcher.Launcher \
-                 -s/etc/maven2/settings-debian.xml \
+                 -s/etc/maven/settings-debian.xml \
                  -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
                  $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))

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