Update to latest upstream 1.1 release

This commit is contained in:
Severin Gehwolf 2022-08-10 15:18:05 +02:00
parent c32d33f604
commit dc223328ae
4 changed files with 7 additions and 39 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
maven-verifier-plugin-1.0.tar.gz
/maven-verifier-plugin-1.0-source-release.zip
/maven-verifier-plugin-1.1-source-release.zip

View File

@ -1,6 +1,6 @@
Name: maven-verifier-plugin
Version: 1.0
Release: 32%{?dist}
Version: 1.1
Release: 1%{?dist}
Summary: Maven Verifier Plugin
License: ASL 2.0
@ -17,8 +17,6 @@ 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.
@ -31,24 +29,11 @@ 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
@ -63,6 +48,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
* Wed Aug 10 2022 Severin Gehwolf <sgehwolf@redhat.com> - 1.1-1
- Update to latest upstream 1.1 release
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
037d7f28d674c7fe1a6696904a213ff2 maven-verifier-plugin-1.0-source-release.zip
SHA512 (maven-verifier-plugin-1.1-source-release.zip) = 0c968a7ead7cc86145a838672cb2d730abc9f09581253cb2007cb9e8954477d4d603b975ec6332c88be59b626850cfad1191bdaadbc1f4adb51e24a640d29f24

View File

@ -1,21 +0,0 @@
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
{