From 9f4703e0593314756d56c9003ba30e7b25ef19a5 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Mon, 13 May 2024 13:37:05 +0300
Subject: [PATCH] import opentest4j-1.1.1-1.module_el8.1.0+280+b8d347df

---
 .gitignore                                    |  2 +-
 .opentest4j.metadata                          |  2 +-
 ...ntest4j-1.2.0.pom => opentest4j-1.1.1.pom} |  2 +-
 SPECS/opentest4j.spec                         | 32 +++++++------------
 4 files changed, 15 insertions(+), 23 deletions(-)
 rename SOURCES/{opentest4j-1.2.0.pom => opentest4j-1.1.1.pom} (98%)

diff --git a/.gitignore b/.gitignore
index facef98..163ca85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/r1.2.0.tar.gz
+SOURCES/r1.1.1.tar.gz
diff --git a/.opentest4j.metadata b/.opentest4j.metadata
index ec7971b..893c9ed 100644
--- a/.opentest4j.metadata
+++ b/.opentest4j.metadata
@@ -1 +1 @@
-05f9dde376df2938ae78a17c2282211b749b2cf8 SOURCES/r1.2.0.tar.gz
+f3c18434813fc664afdc5387342b6ec9698a486b SOURCES/r1.1.1.tar.gz
diff --git a/SOURCES/opentest4j-1.2.0.pom b/SOURCES/opentest4j-1.1.1.pom
similarity index 98%
rename from SOURCES/opentest4j-1.2.0.pom
rename to SOURCES/opentest4j-1.1.1.pom
index d493612..66cfd8a 100644
--- a/SOURCES/opentest4j-1.2.0.pom
+++ b/SOURCES/opentest4j-1.1.1.pom
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opentest4j</groupId>
   <artifactId>opentest4j</artifactId>
-  <version>1.2.0</version>
+  <version>1.1.1</version>
   <name>org.opentest4j:opentest4j</name>
   <description>Open Test Alliance for the JVM</description>
   <url>https://github.com/ota4j-team/opentest4j</url>
diff --git a/SPECS/opentest4j.spec b/SPECS/opentest4j.spec
index 8202bae..ba4ae30 100644
--- a/SPECS/opentest4j.spec
+++ b/SPECS/opentest4j.spec
@@ -1,15 +1,15 @@
 Name:           opentest4j
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Summary:        Open Test Alliance for the JVM
 License:        ASL 2.0
-
 URL:            https://github.com/ota4j-team/opentest4j
-Source0:        %{url}/archive/r%{version}.tar.gz
-Source100:      https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom
-
 BuildArch:      noarch
 
+Source0:        https://github.com/ota4j-team/opentest4j/archive/r%{version}.tar.gz
+
+Source100:      https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 
@@ -34,7 +34,7 @@ API documentation for %{name}.
 find -name \*.jar -delete
 cp -p %{SOURCE100} pom.xml
 
-%pom_add_dep junit:junit::test
+%pom_add_dep junit:junit:4.12:test
 
 %pom_xpath_inject pom:project "
   <build>
@@ -65,6 +65,10 @@ cp -p %{SOURCE100} pom.xml
     </pluginManagement>
   </build>"
 
+# Fix unused reference to unused dependency
+# This is fixed upstream: https://github.com/ota4j-team/opentest4j/commit/70d3d54f2cd076a962e81d9510e6716f3cbf8060
+sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/AssertionFailedErrorTests.java
+
 %build
 %mvn_build
 
@@ -79,18 +83,6 @@ cp -p %{SOURCE100} pom.xml
 %license LICENSE
 
 %changelog
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.2.0-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Mar 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-1
-- Update to version 1.2.0.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Tue Mar 05 2019 Mat Booth <mat.booth@redhat.com> - 1.1.1-1
 - Update to latest upstream release
 
@@ -104,4 +96,4 @@ cp -p %{SOURCE100} pom.xml
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
 * Thu Sep 14 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.0-1
-- Initial packaging
\ No newline at end of file
+- Initial packaging