[plexus-compiler] 10/21: Depend on junit4 instead of junit

[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-compiler.

commit 063715493f64058ad8e12d4667cddfabf60a502c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 30 15:54:54 2017 +0200

    Depend on junit4 instead of junit
---
 debian/changelog   | 1 +
 debian/control     | 4 ++--
 debian/maven.rules | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bc7ee6..a0e2e7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plexus-compiler (2.6-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Depend on junit4 instead of junit
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index d07e2d9..6141322 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Torsten Werner <twerner at debian.org>,
            Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
 Build-Depends-Indep: default-jdk-doc,
-                     junit (>= 3.8.2),
+                     junit4,
                      libcommons-lang-java (>= 2.0),
                      libecj-java,
                      libmaven-javadoc-plugin-java,
@@ -30,7 +30,7 @@ Depends: libcommons-lang-java (>= 2.6),
          libplexus-container-default-java,
          libplexus-utils-java,
          ${misc:Depends}
-Suggests: junit (>= 3.8.2), libecj-java, libplexus-compiler-java-doc
+Suggests: junit4, libecj-java, libplexus-compiler-java-doc
 Description: Plexus compiler system
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can
diff --git a/debian/maven.rules b/debian/maven.rules
index 075f446..c4d452a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,5 @@
 
-junit junit jar s/.*/3.x/ * *
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/4.x/ * *
 org.codehaus.plexus plexus-compiler-api jar s/.*/2.x/ * *
 org.codehaus.plexus plexus-compiler-csharp jar s/.*/2.x/ * *
 org.codehaus.plexus plexus-compiler-eclipse jar s/.*/2.x/ * *

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