[surefire] 03/04: Transition to Maven 3

[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 e6432a4221bc8b71a14ed20f628ab7d5a4ca7a4d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 3 23:57:32 2017 +0200

    Transition to Maven 3
---
 debian/changelog                         |  1 +
 debian/control                           |  1 +
 debian/maven.ignoreRules                 |  2 ++
 debian/maven.rules                       |  4 ++++
 debian/patches/maven-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                    |  1 +
 6 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db733d7..d883101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 surefire (2.19.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Transition to Maven 3
   * Fixed the build failure caused by the Doxia upgrade (Closes: #871112)
   * Standards-Version updated to 4.1.0
 
diff --git a/debian/control b/debian/control
index 5470ec1..98ebfe7 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends-Indep: javacc,
                      libmaven-install-plugin-java,
                      libmaven-plugin-testing-java,
                      libmaven-plugin-tools-java (>= 3.2),
+                     libmaven-reporting-api-java,
                      libmaven-resources-plugin-java,
                      libmaven-shade-plugin-java,
                      libmaven-shared-utils-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 28fca27..ad1b0a9 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,5 @@
+org.apache.maven maven-plugin-descriptor * * * *
+org.apache.maven maven-toolchain * * * *
 org.apache.maven.plugins maven-assembly-plugin * * * *
 org.apache.maven.plugins maven-deploy-plugin * * * *
 org.apache.maven.plugins maven-enforcer-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index cbed498..63dfbf3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -5,6 +5,10 @@ junit junit jar s/4\..*/4.x/
 jmock jmock jar s/1\..*/1.x/
 org.easytesting s/fest-assert/fest-assert-core/ * s/.*/debian/
 org.apache.commons commons-lang3 * s/.*/debian/
+org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * *
+org.apache.maven maven-* * s/.*/3.x/ * *
+org.apache.maven.reporting maven-reporting-api * s/.*/3.x/ * *
+org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
 org.testng testng * s/.*/6.x/ s/.*// *
 # fix the version of maven-shade-plugin
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness
diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch
new file mode 100644
index 0000000..acb5a00
--- /dev/null
+++ b/debian/patches/maven-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the compatibility with the version of Maven in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+@@ -164,7 +164,7 @@
+     {
+         try
+         {
+-            return request.getFailureBehavior();
++            return request.getReactorFailureBehavior();
+         }
+         catch ( NoSuchMethodError e )
+         {
diff --git a/debian/patches/series b/debian/patches/series
index d4647db..7e4bd7b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ bypass-testng-version-check.patch
 dependency-plugin-configuration.patch
 surefire-execution-parameters-compatibility.patch
 doxia-compatibility.patch
+maven-compatibility.patch

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