From e4e4de3827fe1147751e7f852523a3fddcbd3af1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:52:36 +0000 Subject: [PATCH] import CS hamcrest-3.0-4.module_el9+1171+eb38a622 --- .gitignore | 2 +- .hamcrest.metadata | 2 +- SOURCES/0001-Fix-build-with-OpenJDK-11.patch | 131 -------------- .../{hamcrest-2.2.pom => hamcrest-3.0.pom} | 16 +- SPECS/hamcrest.spec | 165 ++++++++++++++---- 5 files changed, 141 insertions(+), 175 deletions(-) delete mode 100644 SOURCES/0001-Fix-build-with-OpenJDK-11.patch rename SOURCES/{hamcrest-2.2.pom => hamcrest-3.0.pom} (52%) diff --git a/.gitignore b/.gitignore index c8e5a10..667c9ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/hamcrest-2.2.tar.gz +SOURCES/hamcrest-3.0.tar.gz diff --git a/.hamcrest.metadata b/.hamcrest.metadata index 7d036b1..2779f8a 100644 --- a/.hamcrest.metadata +++ b/.hamcrest.metadata @@ -1 +1 @@ -0083e68913e577762eeff193eec742dc5ff2a4f3 SOURCES/hamcrest-2.2.tar.gz +2f3d138a29a4a019ef583a97793d2188b4729408 SOURCES/hamcrest-3.0.tar.gz diff --git a/SOURCES/0001-Fix-build-with-OpenJDK-11.patch b/SOURCES/0001-Fix-build-with-OpenJDK-11.patch deleted file mode 100644 index 4e882e2..0000000 --- a/SOURCES/0001-Fix-build-with-OpenJDK-11.patch +++ /dev/null @@ -1,131 +0,0 @@ -From d33031924faa557bb43ba0471f74d942ddfeae50 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Tue, 5 Nov 2019 14:50:23 +0100 -Subject: [PATCH] Fix build with OpenJDK 11 - ---- - .../src/main/java/org/hamcrest/collection/ArrayMatching.java | 3 ++- - .../org/hamcrest/collection/IsArrayContainingInAnyOrder.java | 2 +- - .../org/hamcrest/collection/IsArrayContainingInOrder.java | 2 +- - .../hamcrest/collection/IsIterableContainingInAnyOrder.java | 2 +- - .../collection/IsIterableContainingInRelativeOrder.java | 2 +- - hamcrest/src/main/java/org/hamcrest/core/AllOf.java | 2 +- - hamcrest/src/main/java/org/hamcrest/core/AnyOf.java | 2 +- - .../src/main/java/org/hamcrest/core/CombinableMatcher.java | 4 ++-- - 8 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -index fc968e0..baab775 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java -@@ -67,7 +67,8 @@ public class ArrayMatching { - */ - @SafeVarargs - public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { -- return arrayContainingInAnyOrder(asList(itemMatchers)); -+ Collection> itemMatchersList = asList(itemMatchers); -+ return new ArrayAsIterableMatcher<>(new IsIterableContainingInAnyOrder<>(itemMatchersList), itemMatchersList, "in any order"); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -index 7e72a62..c0c7efc 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java -@@ -59,7 +59,7 @@ public class IsArrayContainingInAnyOrder extends TypeSafeMatcher { - * a list of matchers, each of which must be satisfied by an entry in an examined array - */ - public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { -- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); -+ return new IsArrayContainingInAnyOrder(Arrays.asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -index c046914..2022f1a 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java -@@ -73,7 +73,7 @@ public class IsArrayContainingInOrder extends TypeSafeMatcher { - * the matchers that must be satisfied by the items in the examined array - */ - public static Matcher arrayContaining(Matcher... itemMatchers) { -- return arrayContaining(asList(itemMatchers)); -+ return new IsArrayContainingInOrder(asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -index d6a9a33..9a7e6c0 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java -@@ -98,7 +98,7 @@ public class IsIterableContainingInAnyOrder extends TypeSafeDiagnosingMatcher - */ - @SafeVarargs - public static Matcher> containsInAnyOrder(Matcher... itemMatchers) { -- return containsInAnyOrder(Arrays.asList(itemMatchers)); -+ return new IsIterableContainingInAnyOrder(Arrays.asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -index 0657768..06d6a57 100644 ---- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -+++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java -@@ -99,7 +99,7 @@ public class IsIterableContainingInRelativeOrder extends TypeSafeDiagnosingMa - */ - @SafeVarargs - public static Matcher> containsInRelativeOrder(Matcher... itemMatchers) { -- return containsInRelativeOrder(asList(itemMatchers)); -+ return new IsIterableContainingInRelativeOrder(asList(itemMatchers)); - } - - /** -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -index b8c3faa..f8951bd 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java -@@ -56,6 +56,6 @@ public class AllOf extends DiagnosingMatcher { - */ - @SafeVarargs - public static Matcher allOf(Matcher... matchers) { -- return allOf(Arrays.asList(matchers)); -+ return new AllOf(Arrays.asList(matchers)); - } - } -diff --git a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -index 7a22c22..5a63574 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java -@@ -46,6 +46,6 @@ public class AnyOf extends ShortcutCombination { - */ - @SafeVarargs - public static AnyOf anyOf(Matcher... matchers) { -- return anyOf(Arrays.asList(matchers)); -+ return new AnyOf(Arrays.asList(matchers)); - } - } -diff --git a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -index e37efce..6b44884 100644 ---- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -+++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java -@@ -57,7 +57,7 @@ public class CombinableMatcher extends TypeSafeDiagnosingMatcher { - this.first = matcher; - } - public CombinableMatcher and(Matcher other) { -- return new CombinableMatcher<>(first).and(other); -+ return new CombinableMatcher<>(first).and((Matcher)other); - } - } - -@@ -76,7 +76,7 @@ public class CombinableMatcher extends TypeSafeDiagnosingMatcher { - this.first = matcher; - } - public CombinableMatcher or(Matcher other) { -- return new CombinableMatcher<>(first).or(other); -+ return new CombinableMatcher<>(first).or((Matcher)other); - } - } - } --- -2.21.0 - diff --git a/SOURCES/hamcrest-2.2.pom b/SOURCES/hamcrest-3.0.pom similarity index 52% rename from SOURCES/hamcrest-2.2.pom rename to SOURCES/hamcrest-3.0.pom index 89489bc..aa2f564 100644 --- a/SOURCES/hamcrest-2.2.pom +++ b/SOURCES/hamcrest-3.0.pom @@ -1,17 +1,22 @@ - + + + + + 4.0.0 org.hamcrest hamcrest - 2.2 + 3.0 Hamcrest Core API and libraries of hamcrest matcher framework. http://hamcrest.org/JavaHamcrest/ - BSD License 3 - http://opensource.org/licenses/BSD-3-Clause + BSD-3-Clause + https://raw.githubusercontent.com/hamcrest/JavaHamcrest/master/LICENSE @@ -29,7 +34,8 @@ - git@github.com:hamcrest/JavaHamcrest.git + scm:git:https://github.com/hamcrest/JavaHamcrest.git + scm:git:ssh://github.com/hamcrest/JavaHamcrest.git https://github.com/hamcrest/JavaHamcrest diff --git a/SPECS/hamcrest.spec b/SPECS/hamcrest.spec index 7c5eac7..88dbf52 100644 --- a/SPECS/hamcrest.spec +++ b/SPECS/hamcrest.spec @@ -1,20 +1,24 @@ +%bcond_with bootstrap %global upstream_version %(echo %{version} | tr '~' '-') Name: hamcrest -Version: 2.2 -Release: 2%{?dist} +Version: 3.0 +Release: 4%{?dist} Summary: Library of matchers for building test expressions -License: BSD +License: BSD-3-Clause URL: https://github.com/hamcrest/JavaHamcrest BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://github.com/hamcrest/JavaHamcrest/archive/v%{upstream_version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://repo1.maven.org/maven2/org/hamcrest/hamcrest/%{upstream_version}/hamcrest-%{upstream_version}.pom -Patch0: 0001-Fix-build-with-OpenJDK-11.patch - +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(junit:junit) +%endif %description Provides a library of matcher objects (also known as constraints or predicates) @@ -23,62 +27,139 @@ frameworks. Typical scenarios include testing frameworks, mocking libraries and UI validation rules. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep -%setup -q -n JavaHamcrest-%{upstream_version} -%patch0 -p1 - -rm -rf docs -rm -rf *gradle* -rm -rf */*.gradle - -mv hamcrest/src . -rm -rf hamcrest -rm -rf hamcrest-core -rm -rf hamcrest-integration -rm -rf hamcrest-library +%autosetup -p1 -n JavaHamcrest-%{upstream_version} +pushd hamcrest cp -p %{SOURCE1} pom.xml -%pom_add_dep junit:junit +%pom_add_dep junit:junit::test %pom_xpath_inject pom:project ' - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - + + + org.apache.maven.plugins + maven-compiler-plugin + any + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-jar-plugin + any + + + + org.hamcrest + + + + + ' %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-all %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-core %mvn_alias org.hamcrest:hamcrest org.hamcrest:hamcrest-library -sed -i 's/\r//' LICENSE.txt - %build +pushd hamcrest %mvn_build +popd %install +pushd hamcrest %mvn_install +popd -%files -f .mfiles +%files -f hamcrest/.mfiles %doc README.md -%license LICENSE.txt +%license LICENSE -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt +%files javadoc -f hamcrest/.mfiles-javadoc +%license LICENSE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.0-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 3.0-1 +- Update to upstream version 3.0 +- Resolves: rhbz#2307508 + +* Thu Jul 18 2024 Fedora Release Engineering - 2.2-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 2.2-17 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 2.2-16 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.2-15 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.2-12 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Feb 23 2023 Marian Koncek - 2.2-10 +- Add Automatic-Module-Name manifest entry + +* Thu Jan 19 2023 Fedora Release Engineering - 2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.2-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 01 2021 Mikolaj Izdebski - 2.2-4 +- Obsolete hamcrest-core and -demo +- Resolves: rhbz#1966269 + +* Mon May 17 2021 Mikolaj Izdebski - 2.2-3 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0:1.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0:1.3-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:1.3-29 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 24 2020 Roland Grunberg - 0:1.3-28 +- Use source/target 1.6 to build against Java 11. +- Disable checking of remote javadoc links. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:1.3-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 2.2-2 - Mass rebuild for javapackages-tools 201902 @@ -91,9 +172,18 @@ sed -i 's/\r//' LICENSE.txt * Mon Aug 19 2019 Marian Koncek - 2.1-1 - Update to upstream version 2.1 +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1.3-24 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 0:1.3-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0:1.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0:1.3-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -312,6 +402,7 @@ sed -i 's/\r//' LICENSE.txt * Mon Aug 23 2004 Randy Watler - 0:3.8.1-4jpp - Rebuild with ant-1.6.2 + * Fri May 09 2003 David Walluck 0:3.8.1-3jpp - update for JPackage 1.5