.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,20 +1 @@
-/hamcrest-all-1.3.pom
+SOURCES/hamcrest-2.2.tar.gz
-/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.metadata

@@ -0,0 +1 @@
+0083e68913e577762eeff193eec742dc5ff2a4f3 SOURCES/hamcrest-2.2.tar.gz

SOURCES/hamcrest-2.2.pom

@@ -0,0 +1,35 @@
+<?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>

SPECS/hamcrest.spec

@@ -1,27 +1,20 @@
-%bcond_with bootstrap
-
 %global upstream_version %(echo %{version} | tr '~' '-')
 
 Name:           hamcrest
 Version:        2.2
-Release:        17%{?dist}
+Release:        2%{?dist}
 Summary:        Library of matchers for building test expressions
-License:        BSD-3-Clause
+License:        BSD
 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)
@@ -39,35 +32,30 @@ Javadoc for %{name}.
 %setup -q -n JavaHamcrest-%{upstream_version}
 %patch0 -p1
 
-sed -i 's/\r//' LICENSE.txt
+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
 
-pushd hamcrest
 cp -p %{SOURCE1} pom.xml
-%pom_add_dep junit:junit::test
+%pom_add_dep junit:junit
 %pom_xpath_inject pom:project '
 <build>
 	<plugins>
 		<plugin>
 		<groupId>org.apache.maven.plugins</groupId>
 		<artifactId>maven-compiler-plugin</artifactId>
-      <version>any</version>
+		<version>3.8.1</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>'
 
@@ -75,88 +63,22 @@ cp -p %{SOURCE1} pom.xml
 %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 hamcrest/.mfiles
+%files -f .mfiles
 %doc README.md
 %license LICENSE.txt
 
-%files javadoc -f hamcrest/.mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2-17
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.2-16
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.2-15
-- Bump release for June 2024 mass rebuild
-
-* 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
 
@@ -169,18 +91,9 @@ popd
 * 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
 
@@ -399,7 +312,6 @@ popd
 
 * 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
 

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_contexts:
-  - osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: c10s
-execute:
-  how: tmt

sources

@@ -1,2 +0,0 @@
-SHA512 (hamcrest-2.2.tar.gz) = 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
-SHA512 (hamcrest-2.2.pom) = e48470aa7c3c1d3fe2cac3a7b218e07564ed7ce6e4eafc90433ae0ffb8e303322027092d2358b3e655ae1b5e58ea313249c8d3ceed9d550a655af8d890df6390