10 changed files with 168 additions and 205 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,22 @@
-SOURCES/hamcrest-2.2.tar.gz
+/hamcrest-all-1.3.pom
+/hamcrest-core-1.3.pom
+/hamcrest-generator-1.3.pom
+/hamcrest-integration-1.3.pom
+/hamcrest-library-1.3.pom
+/hamcrest-parent-1.3.pom
+/hamcrest-text-1.3.pom
+/hamcrest-*.tgz
+/hamcrest-*/
+/.project
+/*.src.rpm
+/noarch
+/.build-*.log
+/hamcrest-java-1.3.tar.gz
+/hamcrest-2.1.tar.gz
+/hamcrest-2.1.pom
+/hamcrest-2.2~rc1.tar.gz
+/hamcrest-2.2-rc1.pom
+/hamcrest-2.2.tar.gz
+/hamcrest-2.2.pom
+/hamcrest-3.0.tar.gz
+/hamcrest-3.0.pom
--- a/.hamcrest.metadata
+++ b/.hamcrest.metadata
@ -1 +0,0 @@
-0083e68913e577762eeff193eec742dc5ff2a4f3 SOURCES/hamcrest-2.2.tar.gz
--- a/SOURCES/0001-Fix-build-with-OpenJDK-11.patch
+++ b/SOURCES/0001-Fix-build-with-OpenJDK-11.patch
@ -1,131 +0,0 @@
-From d33031924faa557bb43ba0471f74d942ddfeae50 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-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 <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
-      return arrayContainingInAnyOrder(asList(itemMatchers));
-+      Collection<Matcher<? super E>> 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<E> extends TypeSafeMatcher<E[]> {
-      *     a list of matchers, each of which must be satisfied by an entry in an examined array
-      */
-     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
-        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
-+        return new IsArrayContainingInAnyOrder<E>(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<E> extends TypeSafeMatcher<E[]> {
-      *     the matchers that must be satisfied by the items in the examined array
-      */
-     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
-        return arrayContaining(asList(itemMatchers));
-+        return new IsArrayContainingInOrder<E>(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<T> extends TypeSafeDiagnosingMatcher
-      */
-     @SafeVarargs
-     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
-        return containsInAnyOrder(Arrays.asList(itemMatchers));
-+        return new IsIterableContainingInAnyOrder<T>(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<E> extends TypeSafeDiagnosingMa
-      */
-     @SafeVarargs
-     public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
-        return containsInRelativeOrder(asList(itemMatchers));
-+        return new IsIterableContainingInRelativeOrder<E>(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<T> extends DiagnosingMatcher<T> {
-      */
-     @SafeVarargs
-     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
-        return allOf(Arrays.asList(matchers));
-+        return new AllOf<T>(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<T> extends ShortcutCombination<T> {
-      */
-     @SafeVarargs
-     public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
-        return anyOf(Arrays.asList(matchers));
-+        return new AnyOf<T>(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<T> extends TypeSafeDiagnosingMatcher<T> {
-         this.first = matcher;
-     }
-     public CombinableMatcher<X> and(Matcher<? super X> other) {
-      return new CombinableMatcher<>(first).and(other);
-+      return new CombinableMatcher<>(first).and((Matcher)other);
-     }
-   }
- 
-@@ -76,7 +76,7 @@ public class CombinableMatcher<T> extends TypeSafeDiagnosingMatcher<T> {
-         this.first = matcher;
-     }
-     public CombinableMatcher<X> or(Matcher<? super X> other) {
-      return new CombinableMatcher<>(first).or(other);
-+      return new CombinableMatcher<>(first).or((Matcher)other);
-     }
-   }
- }
-- 
-2.21.0
-
--- a/SOURCES/hamcrest-2.2.pom
+++ b/SOURCES/hamcrest-2.2.pom
@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.hamcrest</groupId>
-  <artifactId>hamcrest</artifactId>
-  <version>2.2</version>
-  <name>Hamcrest</name>
-  <description>Core API and libraries of hamcrest matcher framework.</description>
-  <url>http://hamcrest.org/JavaHamcrest/</url>
-  <licenses>
-    <license>
-      <name>BSD License 3</name>
-      <url>http://opensource.org/licenses/BSD-3-Clause</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <id>joewalnes</id>
-      <name>Joe Walnes</name>
-    </developer>
-    <developer>
-      <id>npryce</id>
-      <name>Nat Pryce</name>
-    </developer>
-    <developer>
-      <id>sf105</id>
-      <name>Steve Freeman</name>
-    </developer>
-  </developers>
-  <scm>
-    <connection>git@github.com:hamcrest/JavaHamcrest.git</connection>
-    <url>https://github.com/hamcrest/JavaHamcrest</url>
-  </scm>
-</project>
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
--- 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 '
 <build>
-	<plugins>
-		<plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<version>3.8.1</version>
-		<configuration>
-			<source>1.8</source>
-			<target>1.8</target>
-		</configuration>
-		</plugin>
-	</plugins>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <version>any</version>
+      <configuration>
+        <source>1.8</source>
+        <target>1.8</target>
+      </configuration>
+    </plugin>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-jar-plugin</artifactId>
+      <version>any</version>
+      <configuration>
+        <archive>
+          <manifestEntries>
+            <Automatic-Module-Name>org.hamcrest</Automatic-Module-Name>
+          </manifestEntries>
+        </archive>
+      </configuration>
+    </plugin>
+  </plugins>
 </build>'

 %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 <mizdebsk@redhat.com> - 3.0-2
+- Update javapackages test plan to f42
+
+* Fri Aug 23 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0-1
+- Update to upstream version 3.0
+- Resolves: rhbz#2307508
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-17
+- Switch to a newer patch macro syntax
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.2-16
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 2.2-15
+- bump of release for for java-21-openjdk as system jdk
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-12
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Feb 23 2023 Marian Koncek <mkoncek@redhat.com> - 2.2-10
+- Add Automatic-Module-Name manifest entry
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.2-7
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 01 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-4
+- Obsolete hamcrest-core and -demo
+- Resolves: rhbz#1966269
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.2-3
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.3-29
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jun 24 2020 Roland Grunberg <rgrunber@redhat.com> - 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 <releng@fedoraproject.org> - 0:1.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 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 <mkoncek@redhat.com> - 2.1-1
 - Update to upstream version 2.1

+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-24
 - Mass rebuild for javapackages-tools 201901

+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 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 <rwatler at finali.com> - 0:3.8.1-4jpp
 - Rebuild with ant-1.6.2
+
 * Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
 - update for JPackage 1.5

--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: c9s
+execute:
+  how: tmt
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (hamcrest-3.0.tar.gz) = 7997afbc414d7ace3f150eb3ce775c10de4beb595deba02dd41f195e3d885e11dec9af1df4b92d36140217503aebb8c4b97192ed6f925f92287f72b0c2b1b6f5
+SHA512 (hamcrest-3.0.pom) = e1aab4b8ed9b99e6582dc722c2fe1b8538263d2cc6ef7f367fa2315a38462418b2b6e50737c6e87dc5d70b7b04c45fc3c83ff41730f9e681bf1810e9840c344f
				`@ -1 +0,0 @@`
				`0083e68913e577762eeff193eec742dc5ff2a4f3 SOURCES/hamcrest-2.2.tar.gz`