From c32d33f604a14b082b673bbdbb14ad78cd54d49e Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Wed, 10 Aug 2022 13:57:54 +0200 Subject: [PATCH] Fix FTBFS Resolves: RHBZ#2113509 --- maven-verifier-plugin.spec | 16 ++++++++++++++++ verifier_mojo.patch | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 verifier_mojo.patch diff --git a/maven-verifier-plugin.spec b/maven-verifier-plugin.spec index d63abe7..9d02525 100644 --- a/maven-verifier-plugin.spec +++ b/maven-verifier-plugin.spec @@ -17,6 +17,8 @@ BuildRequires: maven-parent BuildRequires: modello BuildRequires: plexus-utils +Patch1: verifier_mojo.patch + %description Assists in integration testing by means of evaluating success/error conditions read from a configuration file. @@ -29,10 +31,24 @@ API documentation for %{name}. %prep %setup -q +%patch1 -p2 %mvn_file :%{name} %{name} %pom_remove_parent %pom_add_parent org.apache.maven.plugins:maven-plugins:34 +%pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId='maven-plugin-api']" 'provided' +%pom_xpath_inject "pom:build/pom:plugins" ' + org.apache.maven.plugins + maven-plugin-plugin + 3.1 + + + default-descriptor + process-classes + + + +' %build %mvn_build diff --git a/verifier_mojo.patch b/verifier_mojo.patch new file mode 100644 index 0000000..a6c51cb --- /dev/null +++ b/verifier_mojo.patch @@ -0,0 +1,21 @@ +diff --git a/maven-verifier-plugin-1.0/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java b/maven-verifier-plugin-1.0/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java +index 894cf84..aec776e 100644 +--- a/maven-verifier-plugin-1.0/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java ++++ b/maven-verifier-plugin-1.0/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java +@@ -21,6 +21,8 @@ package org.apache.maven.plugin.verifier; + + import org.apache.maven.plugin.AbstractMojo; + import org.apache.maven.plugin.MojoExecutionException; ++import org.apache.maven.plugins.annotations.Mojo; ++import org.apache.maven.plugins.annotations.LifecyclePhase; + import org.apache.maven.plugin.verifier.model.Verifications; + import org.apache.maven.plugin.verifier.model.io.xpp3.VerificationsXpp3Reader; + import org.codehaus.plexus.util.FileUtils; +@@ -43,6 +45,7 @@ import java.util.regex.Pattern; + * @author Vincent Massol + * @version $Id: VerifierMojo.java 900472 2010-01-18 17:36:37Z dennisl $ + */ ++@Mojo(name = "verify", defaultPhase = LifecyclePhase.INTEGRATION_TEST ) + public class VerifierMojo + extends AbstractMojo + {