Merge branch 'rawhide' into f35

This reverts commit 12b32807f7.

Unretirement request: https://pagure.io/releng/issue/10355

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>

.gitignore

@@ -1,2 +1 @@
 /metro-xmlstreambuffer-1.5.10.tar.gz
-/metro-xmlstreambuffer-2.1.0.tar.gz

sources

@@ -1 +1 @@
-SHA512 (metro-xmlstreambuffer-2.1.0.tar.gz) = c277aa96594ca4d6509ed2aa737fbe12d29b115041d3656e25f2ab05aafe7ce4b07c5f98a4d1f39927687fe038b567d317ca04382aa272a0eba528aaab329050
+SHA512 (metro-xmlstreambuffer-1.5.10.tar.gz) = 9015afb48bb874a53b60202a99ead291d9c3ac0cdfbb08a0c3c932574a768a84b5135be51d5e48cdd37a1a61c02859e2d4fffe7ae2629cb4ca4bccc4129887dd

xmlstreambuffer.spec

@@ -1,17 +1,17 @@
+%global srcname metro-xmlstreambuffer
+
 Name:           xmlstreambuffer
-Version:        2.1.0
-Release:        12%{?dist}
+Version:        1.5.10
+Release:        3%{?dist}
 Summary:        Stream Based Representation for XML Infoset
-# Automatically converted from old format: BSD - review is highly recommended.
-License:        LicenseRef-Callaway-BSD
+License:        BSD
 URL:            https://github.com/eclipse-ee4j/metro-xmlstreambuffer
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-Source0:        %{url}/archive/%{version}/metro-xmlstreambuffer-%{version}.tar.gz
+Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-BuildRequires:  maven-local-openjdk25
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.sun.activation:jakarta.activation)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
@@ -20,19 +20,14 @@ BuildRequires:  mvn(junit:junit)
 %description
 Stream based representation for XML infoset.
 
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-This package contains javadoc for %{name}.
-
 %prep
-%setup -q -n metro-xmlstreambuffer-%{version}
+%autosetup -n %{srcname}-%{version}
 
 pushd streambuffer
-
+# remove unnecessary dependency on parent POM
 %pom_remove_parent
 
+# remove unnecessary maven plugins
 %pom_remove_plugin :buildnumber-maven-plugin
 %pom_remove_plugin :glassfish-copyright-maven-plugin
 %pom_remove_plugin :maven-enforcer-plugin
@@ -42,7 +37,7 @@ popd
 
 %build
 pushd streambuffer
-%mvn_build
+%mvn_build -j -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -DbuildNumber=unknown
 popd
 
 %install
@@ -54,58 +49,7 @@ popd
 %license LICENSE.md NOTICE.md
 %doc CONTRIBUTING.md README.md
 
-%files javadoc -f streambuffer/.mfiles-javadoc
-%license LICENSE.md NOTICE.md
-
 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 2.1.0-10
-- Rebuilt for java-25-openjdk as preffered jdk
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 2.1.0-7
-- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.1.0-5
-- Rebuilt for java-21-openjdk as system jdk
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Nov 21 2022 Marian Koncek <mkoncek@redhat.com> - 2.1.0-1
-- Update to upstream version 2.1.0
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.10-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.10-6
-- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.10-5
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.10-3
 - Remove workaround for SUREFIRE-1897
 
@@ -200,3 +144,4 @@ popd
 
 * Sat Mar 31 2012 gil cattaneo <puntogil@libero.it> 1.4-1
 - initial rpm
+