[jruby] 01/01: wip

[Miguel Landaeta]

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

nomadium pushed a commit to branch next-miguel
in repository jruby.

commit 08b3abdfaae4b8a98d3afea2b9c248a1b167e804
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Mar 8 21:16:13 2015 -0300

    wip
---
 debian/control                                             | 2 +-
 debian/patches/0007-add-missing-versions-to-pom-file.patch | 2 +-
 debian/rules                                               | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 86cc0d5..3822942 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9~), openjdk-7-jdk (>= 7u71-2.5.3), ant-optional,
  libmaven-antrun-plugin-java, libmaven-dependency-plugin-java,
  libyaml-snake-java, libinvokebinder-java, libjnr-x86asm-java (>= 1.0.2~),
  libheadius-options-java, libjnr-unixsocket-java, libjnr-ffi-java,
- libjnr-enxio-java, libunsafe-mock-java
+ libjnr-enxio-java, libunsafe-mock-java, libmaven-compiler-plugin-java (>= 3.2~)
 Standards-Version: 3.9.6
 Homepage: http://jruby.org
 Vcs-Git: git://anonscm.debian.org/pkg-java/jruby.git
diff --git a/debian/patches/0007-add-missing-versions-to-pom-file.patch b/debian/patches/0007-add-missing-versions-to-pom-file.patch
index f049868..85452dc 100644
--- a/debian/patches/0007-add-missing-versions-to-pom-file.patch
+++ b/debian/patches/0007-add-missing-versions-to-pom-file.patch
@@ -18,7 +18,7 @@ Last-Update: 2015-02-27
        </plugin>
        <plugin>
          <artifactId>maven-compiler-plugin</artifactId>
-+        <version>2.5.1</version>
++        <version>3.2</version>
          <configuration>
            <encoding>utf-8</encoding>
            <debug>true</debug>
diff --git a/debian/rules b/debian/rules
index 3a3ef08..3c2ccf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,6 @@ DEB_MAVEN_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH)
 		 -Dmaven.repo.local=$(DEB_MAVEN_REPO) \
 		 $(if $(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS_$(cdbs_curpkg)),$(DEB_MAVEN_ARGS))
 
-# I suspect I'm going to need to update maven-compiler-plugin
-
 maven-sanity-check:
 	@if ! test -x "$(JAVACMD)"; then \
 		echo "You must specify a valid JAVA_HOME or JAVACMD!"; \

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