[plexus-interpolation] 09/10: Patched pom.xml to add the junit dependency

[Emmanuel Bourg]

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

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

commit 10c7a1ddfa0957e151232a35bf1416bf541fa703
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 15:27:03 2017 +0200

    Patched pom.xml to add the junit dependency
---
 debian/changelog                         |  1 +
 debian/control                           |  2 +-
 debian/maven.rules                       |  3 +--
 debian/patches/01-junit-dependency.patch | 19 +++++++++++++++++++
 debian/patches/series                    |  1 +
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf091e6..c1b5e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plexus-interpolation (1.24-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - New build dependency on libmaven-bundle-plugin-java
+    - Patched pom.xml to add the junit dependency
   * Updated the URL of the project homepage
   * Build with the DH sequencer instead of CDBS
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 5add630..d8ab251 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Torsten Werner <twerner at debian.org>,
            Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.2~)
-Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java, libmaven-bundle-plugin-java
+Build-Depends-Indep: default-jdk-doc, libmaven-javadoc-plugin-java, libmaven-bundle-plugin-java, junit4
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-interpolation.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-interpolation.git
diff --git a/debian/maven.rules b/debian/maven.rules
index 960a057..f162b0f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -15,5 +15,4 @@
 # Example rule: match jar with groupid= junit, artifactid= junit
 # and version starting with 3., replacing the version with 3.x
 
-junit junit jar s/3\..*/3.x/
-org.codehaus.plexus plexus-interpolation jar s/.*/debian/ * *
+junit junit jar s/.*/4.x/
diff --git a/debian/patches/01-junit-dependency.patch b/debian/patches/01-junit-dependency.patch
new file mode 100644
index 0000000..9f91e11
--- /dev/null
+++ b/debian/patches/01-junit-dependency.patch
@@ -0,0 +1,19 @@
+Description: Add the missing dependency on junit (should be inherited from the parent pom which is ignored)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -74,4 +74,13 @@
+     </plugins>
+   </build>
+ 
++  <dependencies>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++      <version>4.12</version>
++      <scope>test</scope>
++    </dependency>
++  </dependencies>
++
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9efca2d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-junit-dependency.patch

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