Fix FTBFS
Resolves: RHBZ#2113509
This commit is contained in:
parent
29cffb1843
commit
c32d33f604
@ -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']" '<scope>provided</scope>'
|
||||
%pom_xpath_inject "pom:build/pom:plugins" '<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>3.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-descriptor</id>
|
||||
<phase>process-classes</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
'
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
21
verifier_mojo.patch
Normal file
21
verifier_mojo.patch
Normal file
@ -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 <a href="vmassol@apache.org">Vincent Massol</a>
|
||||
* @version $Id: VerifierMojo.java 900472 2010-01-18 17:36:37Z dennisl $
|
||||
*/
|
||||
+@Mojo(name = "verify", defaultPhase = LifecyclePhase.INTEGRATION_TEST )
|
||||
public class VerifierMojo
|
||||
extends AbstractMojo
|
||||
{
|
||||
Loading…
Reference in New Issue
Block a user