[maven-scm] 04/34: Build 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 maven-scm.

commit 3082cee3db503885d46a7e97f79873e27dce5e4b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 11:45:39 2017 +0200

    Build depend on junit4 instead of junit
---
 debian/changelog                           |  4 +++-
 debian/control                             |  2 +-
 debian/maven.rules                         |  2 +-
 debian/patches/0003-junit-dependency.patch | 12 ++++++++++++
 debian/patches/series                      |  1 +
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb2faed..cf882d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-maven-scm (1.3-9) UNRELEASED; urgency=medium
+maven-scm (1.4-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Build depend on junit4 instead of junit
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index 96a84c3..0a77923 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: default-jdk-doc,
-                     junit (>= 3.8.2),
+                     junit4,
                      libganymed-ssh2-java,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index 36bc1dc..4b5247b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,7 +16,7 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\\..*/3.x/
 
-junit junit jar s/3\..*/3.x/ * *
+junit junit jar s/.*/4.x/ * *
 org.apache.maven.scm maven-scm-api jar s/.*/debian/ * *
 org.apache.maven.scm maven-scm-client jar s/.*/debian/ * *
 org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
diff --git a/debian/patches/0003-junit-dependency.patch b/debian/patches/0003-junit-dependency.patch
new file mode 100644
index 0000000..052e51c
--- /dev/null
+++ b/debian/patches/0003-junit-dependency.patch
@@ -0,0 +1,12 @@
+--- a/maven-scm-test/pom.xml
++++ b/maven-scm-test/pom.xml
+@@ -42,5 +42,9 @@
+       <groupId>org.apache.maven.scm</groupId>
+       <artifactId>maven-scm-manager-plexus</artifactId>
+     </dependency>
++    <dependency>
++      <groupId>junit</groupId>
++      <artifactId>junit</artifactId>
++    </dependency>
+   </dependencies>
+ </project>
diff --git a/debian/patches/series b/debian/patches/series
index 71d6f02..c5616de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-fix-perforce-tests.patch
+0003-junit-dependency.patch

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