commit 898bd6dfe27584dcfab60f797f96d146b05f8ccc
Author: Johnny Hughes <jhughes@redhat.com>
Date: Wed Jan 15 13:02:00 2025 -0600
Import from Fedora
diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b0fbcb0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
+apache-jar-resource-bundle-1.4-sources.jar
+apache-license-header-resource-bundle-1.1-sources.jar
+/apache-resource-bundles-36.pom
+/apache-resource-bundles-37.pom
+/apache-resource-bundles-1.5-source-release.zip
diff --git a/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch b/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
new file mode 100644
index 0000000..3adcbc9
--- /dev/null
+++ b/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
@@ -0,0 +1,171 @@
+From af8542b406e06808ee416c93f2b2c550c688e9f5 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Wed, 23 Aug 2023 20:19:06 +0200
+Subject: [PATCH] Port ITs to Maven Verifier 2.0.0~M1
+
+---
+ .../test/java/org/apache/its/IT_000_BasicArchiveCreation.java | 4 ++--
+ .../org/apache/its/IT_001_ExcludeBuildOutputDirectory.java | 4 ++--
+ .../its/IT_002_IncludeSrcDirWithBuildOutputDirName.java | 4 ++--
+ .../java/org/apache/its/IT_003_SharedResourceInclusion.java | 4 ++--
+ .../src/test/java/org/apache/its/IT_004_IdeExcludes.java | 4 ++--
+ .../java/org/apache/its/IT_005_MiscellaneousExcludes.java | 4 ++--
+ .../src/test/java/org/apache/its/IT_006_CiExcludes.java | 4 ++--
+ .../org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java | 4 ++--
+ .../java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java | 4 ++--
+ .../src/test/java/org/apache/its/IT_ZipAndTarCreation.java | 4 ++--
+ 10 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
+index effd007..d2bf3d4 100644
+--- a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
++++ b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java
+@@ -26,8 +26,8 @@ import java.util.HashSet;
+ import java.util.Set;
+
+ import junit.framework.Assert;
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
+index 966a8bc..b1353ff 100644
+--- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
++++ b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java
+@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
+index 3adbdab..0c9af50 100644
+--- a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
++++ b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java
+@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
+index 3e90d5b..de54608 100644
+--- a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
++++ b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java
+@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
+index 760899a..e5b780f 100644
+--- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
++++ b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java
+@@ -25,8 +25,8 @@ import java.util.Collections;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
+index cb584c1..e692a95 100644
+--- a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
++++ b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java
+@@ -25,8 +25,8 @@ import java.util.Collections;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
+index 5a5d0bd..9c5f406 100644
+--- a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
++++ b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java
+@@ -25,8 +25,8 @@ import java.util.Collections;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromProject;
+diff --git a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
+index 3e0f7c5..2762372 100644
+--- a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
++++ b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java
+@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
+index bc86d6f..77729e9 100644
+--- a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
++++ b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java
+@@ -24,8 +24,8 @@ import java.net.URISyntaxException;
+ import java.util.HashSet;
+ import java.util.Set;
+
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+diff --git a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
+index 040beee..9ae94cd 100644
+--- a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
++++ b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java
+@@ -26,8 +26,8 @@ import java.util.HashSet;
+ import java.util.Set;
+
+ import junit.framework.Assert;
+-import org.apache.maven.it.VerificationException;
+-import org.apache.maven.it.Verifier;
++import org.apache.maven.shared.verifier.VerificationException;
++import org.apache.maven.shared.verifier.Verifier;
+ import org.junit.Test;
+
+ import static org.apache.its.util.TestUtils.archivePathFromChild;
+--
+2.41.0
+
diff --git a/apache-resource-bundles.spec b/apache-resource-bundles.spec
new file mode 100644
index 0000000..c4b2275
--- /dev/null
+++ b/apache-resource-bundles.spec
@@ -0,0 +1,199 @@
+%bcond_with bootstrap
+
+Name: apache-resource-bundles
+Epoch: 1
+Version: 1.5
+Release: 18%{?dist}
+Summary: Apache Resource Bundles
+License: Apache-2.0
+URL: https://maven.apache.org/apache-resource-bundles/
+BuildArch: noarch
+ExclusiveArch: %{java_arches} noarch
+
+Source0: https://repo1.maven.org/maven2/org/apache/apache/resources/apache-resource-bundles/%{version}/apache-resource-bundles-%{version}-source-release.zip
+
+Patch: 0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch
+
+%if %{with bootstrap}
+BuildRequires: javapackages-bootstrap
+%else
+BuildRequires: maven-local
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
+BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+%endif
+
+%description
+An archive which contains templates for generating the necessary license files
+and notices for all Apache releases.
+
+%prep
+%autosetup -p1
+%pom_disable_module resources-bundles-sample
+%mvn_alias :apache-jar-resource-bundle org.apache:
+
+%build
+# Use system version of apache-resource-bundles instead of reactor version
+%mvn_build -- -Dversion.apache-resource-bundles=SYSTEM
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%license LICENSE NOTICE
+
+%changelog
+* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-18
+- Update javapackages test plan to f42
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri May 31 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-8
+- Switch to a newer patch macro syntax
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1:1.5-7
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1:1.5-6
+- bump of release for for java-21-openjdk as system jdk
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-3
+- Convert License tag to SPDX format
+
+* Wed Aug 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-2
+- Port to maven-verifier 2.0.0~M1
+
+* Fri Aug 11 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-1
+- Update to upstream version 1.5
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 37-1
+- Update to upstream version 37
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed May 04 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 36-1
+- Update to upstream version 36
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 30-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2-25
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 30-1
+- Update to upstream version 30
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-22
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-21
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-15
+- Cleanup spec file
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-13
+- Use Requires: java-headless rebuild (#1067528)
+
+* Wed Feb 19 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-12
+- Fix unowned directory
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 2-10
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Wed Jan 16 2013 Michal Srb <msrb@redhat.com> - 2-9
+- Build with xmvn
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Nov 25 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2-5
+- Fix pom file names and add_to_maven_depmap calls (Resolves rhbz#655790)
+
+* Wed Sep 8 2010 Alexander Kurtakov <akurtako@redhat.com> 2-4
+- Add maven-site-plugin BR.
+- Use newer names of maven plugins.
+
+* Mon Feb 1 2010 Mary Ellen Foster <mefoster at gmail.com> 2-3
+- Fix license
+
+* Tue Jan 19 2010 Mary Ellen Foster <mefoster at gmail.com> 2-2
+- Add plugin dependencies from POMs
+- Fix description
+- Remove maven-release plugin (not on Fedora yet)
+
+* Mon Jan 18 2010 Mary Ellen Foster <mefoster at gmail.com> 2-1
+- Initial package
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..df26947
--- /dev/null
+++ 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}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
new file mode 100644
index 0000000..8ba3510
--- /dev/null
+++ 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
diff --git a/sources b/sources
new file mode 100644
index 0000000..f6ab908
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (apache-resource-bundles-1.5-source-release.zip) = ba10e36f8f20b54676b78a1fb5ff20f570f18daa6fe314e7372824ecda72f4c94c85d5c172b79716cc9b79ef4a65b06dbd5f7e83305e4aac0734fa351f3691f1