From 7ee3e71b95bebee53fa876a43dba0a06fd5870ea Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 23 Aug 2023 19:59:35 +0200
Subject: [PATCH] Update to upstream version 2.0.0~M1

---
 .gitignore          |  1 +
 maven-verifier.spec | 20 ++++++++++++--------
 sources             |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50e58f0..a3cbebb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /maven-verifier-1.6-source-release.zip
 /maven-verifier-1.7.2-source-release.zip
 /maven-verifier-1.8.0-source-release.zip
+/maven-verifier-2.0.0-M1-source-release.zip
diff --git a/maven-verifier.spec b/maven-verifier.spec
index f18d37f..8f196aa 100644
--- a/maven-verifier.spec
+++ b/maven-verifier.spec
@@ -1,21 +1,21 @@
 %bcond_with bootstrap
+%global upstream_version 2.0.0-M1
 
 Name:           maven-verifier
-Version:        1.8.0
-Release:        1%{?dist}
+Version:        2.0.0~M1
+Release:        2%{?dist}
 Summary:        Apache Maven Verifier Component
 License:        ASL 2.0
 URL:            https://maven.apache.org/shared/maven-verifier
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{upstream_version}/%{name}-%{upstream_version}-source-release.zip
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
-BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-connector-basic)
 BuildRequires:  mvn(org.apache.maven.resolver:maven-resolver-transport-http)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
@@ -23,6 +23,7 @@ BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-embedder)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
 %endif
 
@@ -36,14 +37,14 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
 
 # This test attempts to write outside the build directory
-rm src/test/java/org/apache/maven/it/ForkedLauncherTest.java
+rm src/test/java/org/apache/maven/shared/verifier/ForkedLauncherTest.java
 # Depends on ForkedLauncherTest
-rm src/test/java/org/apache/maven/it/VerifierTest.java
+rm src/test/java/org/apache/maven/shared/verifier/VerifierTest.java
 # This test attepmts to connect to the Internet
-rm src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java
+rm src/test/java/org/apache/maven/shared/verifier/Embedded3xLauncherTest.java
 
 %build
 %mvn_build
@@ -58,6 +59,9 @@ rm src/test/java/org/apache/maven/it/Embedded3xLauncherTest.java
 %license LICENSE NOTICE
 
 %changelog
+* Wed Aug 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.0~M1-2
+- Update to upstream version 2.0.0~M1
+
 * Thu Aug 17 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8.0-1
 - Update to upstream version 1.8.0
 
diff --git a/sources b/sources
index d719bd1..246223d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maven-verifier-1.8.0-source-release.zip) = 3e82235ca54fdb1d96cc2f51873b4033ebe2deb3d23678e61a3b20f1ddf76683e09ccfacd51088fba81dc83a0ce48eccff811e86728c6a7ef85369b6ff3dd09a
+SHA512 (maven-verifier-2.0.0-M1-source-release.zip) = 79f5bd400f67bff2832dae5b61297be6bcee0db6e3668ac7245f5493664db7b8e047f7442a1a053a2a4c931790e32cafd6556f3990e2e6c8aafbc6a72ccf3889