[stapler] 02/03: Removed 0009-remove-maven3-prereq.patch

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository stapler.

commit 37f1eba4634604c1d90899a718b9d7cce5bfce45
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 16 16:40:58 2016 +0200

    Removed 0009-remove-maven3-prereq.patch
---
 debian/changelog                               |  1 +
 debian/control                                 |  2 +-
 debian/patches/0009-remove-maven3-prereq.patch | 14 --------------
 debian/patches/series                          |  1 -
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47b5834..1d96069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ stapler (1.242-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on groovy2 instead of groovy
+  * Removed 0009-remove-maven3-prereq.patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 May 2016 16:27:55 +0200
 
diff --git a/debian/control b/debian/control
index 78ae90c..9020765 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Build-Depends:
  libmockito-java,
  libservlet3.1-java,
  libtiger-types-java,
- maven-debian-helper
+ maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/stapler.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/stapler.git
diff --git a/debian/patches/0009-remove-maven3-prereq.patch b/debian/patches/0009-remove-maven3-prereq.patch
deleted file mode 100644
index 5c0a625..0000000
--- a/debian/patches/0009-remove-maven3-prereq.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Remove the prerequisite on Maven 3
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -41,7 +41,7 @@
-   </scm>
- 
-   <prerequisites>
--    <maven>3.0.4</maven>
-+    <maven>2.2.1</maven>
-   </prerequisites>
- 
-   <distributionManagement>
diff --git a/debian/patches/series b/debian/patches/series
index 246dd06..e2727f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 0003-fix-groovy-build.patch
 0006-servlet25-compat.patch
 0008-Drop-use-of-custom-doklet.patch
-0009-remove-maven3-prereq.patch
 servlet3.1.patch
 0005-revert-kohsuke-asm5.patch

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