Switch to javapackages tests from CentOS Stream GitLab

.build-helper-maven-plugin.metadata

@@ -1 +0,0 @@
-10cf6088d6a3b61e9a5f7801e5f905c0f7d9a1cd SOURCES/build-helper-maven-plugin-3.6.0-source-release.zip

.fmf/version

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

.gitignore

@@ -1 +1,12 @@
-SOURCES/build-helper-maven-plugin-3.6.0-source-release.zip
+maven-plugin-build-helper-1.4.tar.bz2
+/maven-plugin-build-helper-1.8.tar.xz
+/LICENSE-2.0.txt
+/maven-plugin-build-helper-1.9.tar.xz
+/maven-plugin-build-helper-1.9.1.tar.xz
+/build-helper-maven-plugin-3.1.0.tar.gz
+/build-helper-maven-plugin-3.2.0.tar.gz
+/build-helper-maven-plugin-3.1.0-source-release.zip
+/build-helper-maven-plugin-3.2.0-source-release.zip
+/build-helper-maven-plugin-3.3.0-source-release.zip
+/build-helper-maven-plugin-3.4.0-source-release.zip
+/build-helper-maven-plugin-3.5.0-source-release.zip

build-helper-maven-plugin.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           build-helper-maven-plugin
-Version:        3.6.0
-Release:        7%{?dist}
+Version:        3.5.0
+Release:        6%{?dist}
 Summary:        Build Helper Maven Plugin
 License:        MIT
 URL:            https://www.mojohaus.org/build-helper-maven-plugin/
@@ -28,6 +28,10 @@ BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
 %endif
 
+# TODO remove Provides / Obsoletes on maven-plugin-build-helper in Fedora 41
+Provides:       maven-plugin-build-helper = %{version}-%{release}
+Obsoletes:      maven-plugin-build-helper < 3.3.0-4
+
 %description
 This plugin contains various small independent goals to assist with
 Maven build lifecycle.
@@ -35,15 +39,19 @@ Maven build lifecycle.
 %package javadoc
 Summary:        API documentation for %{name}
 
+# TODO remove Provides / Obsoletes on maven-plugin-build-helper-javadoc in Fedora 41
+Provides:       maven-plugin-build-helper-javadoc = %{version}-%{release}
+Obsoletes:      maven-plugin-build-helper-javadoc < 3.3.0-4
+
 %description javadoc
-API documentation for %{name}.
+This package provides %{summary}.
 
 %prep
-%autosetup -p1
+%setup -q
 
 %pom_add_dep junit:junit::test
 
-rm src/main/java/org/codehaus/mojo/buildhelper/BeanshellPropertyMojo.java
+find -name BeanshellPropertyMojo.java -delete
 %pom_remove_dep :bsh
 
 %pom_remove_plugin :maven-invoker-plugin
@@ -62,17 +70,15 @@ rm src/main/java/org/codehaus/mojo/buildhelper/BeanshellPropertyMojo.java
 %license LICENSE.txt
 
 %changelog
-* Fri Nov 29 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6.0-6
-- Update javapackages test plan to f42
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.5.0-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.5.0-5
+- Bump release for Aug 2024 java mass rebuild
 
-* Mon Jul 15 2024 Marian Koncek <mkoncek@redhat.com> - 3.6.0-1
-- Update to upstream version 3.6.0
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 3.5.0-4
-- bump of release for for java-21-openjdk as system jdk
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.5.0-4
+- Bump release for June 2024 mass rebuild
 
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

ci.fmf

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

gating.yaml

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

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: c10s
+execute:
+  how: tmt

sources

@@ -0,0 +1 @@
+SHA512 (build-helper-maven-plugin-3.5.0-source-release.zip) = 7655803c1f7a4dda0a9c59d48bc4bf5aa619e6db4331c2821438f7cb26b66246cba9e606f0ff42cb82fdcc6ff47b1295cf887341fc1dd576decb6e39581c7101