[maven] 07/10: Build depend on junit4 instead of junit

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 9 06:58:02 UTC 2015


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

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

commit 64d99a5cbd4c39387f9b14e7637daddc2eb92709
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 8 14:18:52 2015 +0200

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

diff --git a/debian/changelog b/debian/changelog
index d3fe4f5..cc578cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ maven (3.2.5-1) UNRELEASED; urgency=medium
     - Install the new logging directory in the conf directory
     - Install the guice dependencies (aopalliance and javax.inject)
       in the /usr/share/maven/lib/ directory
+    - Build depend on junit4 instead of junit
   * Moved the libraries to a separate libmaven3-core-java package
   * Removed the unused dependencies on commons-codec, commons-httpclient
     and commons-logging
diff --git a/debian/control b/debian/control
index 24288f1..bb0d549 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends-Indep: ant-optional,
-                     junit,
+                     junit4,
                      libeclipse-aether-java (>= 1.0),
                      libcommons-jxpath-java,
                      libcommons-logging-java,
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index 952afd8..078f63a 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -1,7 +1,7 @@
 # keep the version for all Maven plugins as versionless plugins don't work
 * * maven-plugin *
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 
 org.eclipse.sisu org.eclipse.sisu.plexus * s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 44634dc..68d653a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,7 +1,7 @@
 # keep the version for all Maven plugins as versionless plugins don't work
 * * maven-plugin *
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/4\..*/4.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
 
 org.apache.maven.wagon * jar s/.*/2.x/ * *

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



More information about the pkg-java-commits mailing list