[surefire] 12/16: New build dependency on libmaven-dependency-plugin-java

[Emmanuel Bourg]

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

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

commit bf7b2b4ad683bac5b8ecee03033fffdf46487058
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 11:00:05 2017 +0200

    New build dependency on libmaven-dependency-plugin-java
---
 debian/changelog                                   |  3 ++-
 debian/control                                     |  1 +
 .../patches/dependency-plugin-configuration.patch  | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 71715c7..607e3b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ surefire (2.19-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - New dependency on libjcip-annotations-java
-    - New build dependency on libfest-assert-java and libmockito-java
+    - New build dependency on libmaven-dependency-plugin-java,
+      libfest-assert-java and libmockito-java
     - Relocate the version 2.17 of the plugin to the current one
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Jul 2017 10:05:17 +0200
diff --git a/debian/control b/debian/control
index 630f330..d996885 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends-Indep: javacc,
                      libjmock-java,
                      libjsr305-java,
                      libmaven-common-artifact-filters-java,
+                     libmaven-dependency-plugin-java,
                      libmaven-install-plugin-java,
                      libmaven-plugin-testing-java,
                      libmaven-plugin-tools-java (>= 3.2),
diff --git a/debian/patches/dependency-plugin-configuration.patch b/debian/patches/dependency-plugin-configuration.patch
new file mode 100644
index 0000000..3f930b1
--- /dev/null
+++ b/debian/patches/dependency-plugin-configuration.patch
@@ -0,0 +1,23 @@
+Description: Use the Debian version of the artifacts referenced by the dependency plugin
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/surefire-providers/surefire-junit47/pom.xml
++++ b/surefire-providers/surefire-junit47/pom.xml
+@@ -82,7 +82,7 @@
+                 <artifactItem>
+                   <groupId>junit</groupId>
+                   <artifactId>junit</artifactId>
+-                  <version>4.7</version>
++                  <version>4.x</version>
+                   <type>jar</type>
+                 </artifactItem>
+               </artifactItems>
+@@ -102,7 +102,7 @@
+                 <artifactItem>
+                   <groupId>junit</groupId>
+                   <artifactId>junit</artifactId>
+-                  <version>4.12</version>
++                  <version>4.x</version>
+                   <type>jar</type>
+                 </artifactItem>
+               </artifactItems>
diff --git a/debian/patches/series b/debian/patches/series
index 7c4c2f5..cc96cd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #pom.patch
 fix-junit-provider-selection.patch
 bypass-testng-version-check.patch
+dependency-plugin-configuration.patch

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