[plexus-utils2] 01/03: Fixed the build failure caused by maven-plugin-testing 2.x (Closes: #869005)

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

commit 37fe47a754bc2a16c8bb05ba4a1d64c321283537
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 09:49:01 2017 +0200

    Fixed the build failure caused by maven-plugin-testing 2.x (Closes: #869005)
---
 debian/changelog                                       |  7 +++++++
 debian/maven.rules                                     |  1 +
 .../03-maven-plugin-testing-compatibility.patch        | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 4 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 527c6e4..24b64fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plexus-utils2 (3.0.24-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure caused by maven-plugin-testing 2.x (Closes: #869005)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Jul 2017 09:49:44 +0200
+
 plexus-utils2 (3.0.24-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/maven.rules b/debian/maven.rules
index 5293bef..f6cb4db 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -20,3 +20,4 @@ junit junit jar s/3\..*/3.x/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 org.codehaus.plexus plexus pom s/.*/2.x/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
+org.apache.maven maven-core * s/.*/3.x/ * *
diff --git a/debian/patches/03-maven-plugin-testing-compatibility.patch b/debian/patches/03-maven-plugin-testing-compatibility.patch
new file mode 100644
index 0000000..e8b6f36
--- /dev/null
+++ b/debian/patches/03-maven-plugin-testing-compatibility.patch
@@ -0,0 +1,18 @@
+Description: Adds the missing maven-core dependency since it's no longer provided by maven-plugin-testing-harness 2.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,6 +58,12 @@
+         <scope>test</scope>
+       </dependency>
+       <dependency>
++        <groupId>org.apache.maven</groupId>
++        <artifactId>maven-core</artifactId>
++        <version>3.x</version>
++        <scope>test</scope>
++      </dependency>
++      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>3.8.2</version>
diff --git a/debian/patches/series b/debian/patches/series
index 99661e4..127cf5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-add-junit-dependency.patch
 02-propertyutils-compatibility.patch
+03-maven-plugin-testing-compatibility.patch

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