manual bodhi update for jdk25 needed on selected pkgs

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.fmf/version

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

.gitignore

@@ -5,3 +5,8 @@
 /LICENSE-2.0.txt
 /plexus-languages-0.9.10.tar.gz
 /plexus-languages-1.0.3.tar.gz
+/plexus-languages-1.0.5.tar.gz
+/plexus-languages-1.0.6.tar.gz
+/plexus-languages-1.1.1.tar.gz
+/plexus-languages-1.1.2.tar.gz
+/plexus-languages-1.2.0.tar.gz

changelog

@@ -0,0 +1,130 @@
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.2.0-6
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.2.0-5
+- bump of release for for java-21-openjdk as system jdk
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Marian Koncek <mkoncek@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-2
+- Convert License tag to SPDX format
+
+* Wed Aug 23 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.2-1
+- Update to upstream version 1.1.2
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Aug 31 2022 Marian Koncek <mkoncek@redhat.com> - 1.1.1-3
+- Enable jpms support
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-1
+- Update to upstream version 1.1.1
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.0.6-6
+- Rebuilt for java-17-openjdk as system jdk
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Nov 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.6-4
+- Add patch for SUREFIRE-1897
+
+* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.6-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Sat Jan 30 2021 Fabio Valentini <decathorpe@gmail.com> - 1.0.6-1
+- Update to version 1.0.6.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 1.0.6-1
+- Update to upstream version 1.0.6
+
+* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-6
+- Rebuild correctly as a proper JPMS module
+
+* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.0.5-5
+- Bootstrap restoration of essential JPMS classes
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.0.5-1
+- Update to upstream version 1.0.5
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 22 2020 Fabio Valentini <decathorpe@gmail.com> - 1.0.5-3
+- Remove Java 9 specific classes for now to fix build.
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.0.5-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.0.5-1
+- Update to version 1.0.5.
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.10-5
+- Mass rebuild for javapackages-tools 201902
+
+* Fri Oct 11 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-1
+- Update to version 1.0.3.
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.10-4
+- Mass rebuild for javapackages-tools 201901
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 0.9.10-3
+- Repack tarball without bundled jars
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.10-1
+- Update to upstream version 0.9.10
+
+* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.3-5
+- Disable broken test
+
+* Wed Feb 14 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-4
+- Generate javadoc package automatically
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-2
+- Replace JARs used as test resources with symlinks to system JARs
+
+* Mon Sep 11 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-1
+- Initial packaging

ci.fmf

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

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

generate-tarball.sh

@@ -9,13 +9,13 @@ wget "https://github.com/codehaus-plexus/plexus-languages/archive/plexus-languag
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 find -name '*.jar' -delete
 find -name '*.class' -delete
 
-tar cf "../${name}-${version}.tar.gz" *
-cd ..
+tar -czf "../${name}-${version}.tar.gz" *
+popd
 rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

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: f43
+execute:
+  how: tmt

plexus-languages.spec

@@ -1,87 +1,54 @@
-Name:           plexus-languages
-Summary:        Plexus Languages
-Version:        1.0.3
-Release:        2%{?dist}
-License:        ASL 2.0
+%bcond_with bootstrap
 
+Name:           plexus-languages
+Version:        1.2.0
+Release:        %autorelease
+Summary:        Plexus Languages
+License:        Apache-2.0
 URL:            https://github.com/codehaus-plexus/plexus-languages
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 # Sources contain bundled jars that we cannot verify for licensing
 Source2:        generate-tarball.sh
 
-BuildArch:      noarch
-
-BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(com.thoughtworks.qdox:qdox)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 BuildRequires:  mvn(org.ow2.asm:asm)
+%endif
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 1.2.0-15
 
 %description
 Plexus Languages is a set of Plexus components that maintain shared
 language features.
 
-%{?javadoc_package}
-
-
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%autosetup -p1 -C
 
 cp %{SOURCE1} .
 
+%pom_remove_plugin :maven-enforcer-plugin
 
 %build
-# we don't have mockito 2 yet + many tests rely on bundled test jars/classes
-%mvn_build -f
-
+# many tests rely on bundled test jars/classes
+%mvn_build -j -f
 
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license LICENSE-2.0.txt
 
-
 %changelog
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Oct 11 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.3-1
-- Update to version 1.0.3.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 0.9.10-3
-- Repack tarball without bundled jars
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.10-1
-- Update to upstream version 0.9.10
-
-* Fri Jun 29 2018 Michael Simacek <msimacek@redhat.com> - 0.9.3-5
-- Disable broken test
-
-* Wed Feb 14 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-4
-- Generate javadoc package automatically
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Sep 12 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-2
-- Replace JARs used as test resources with symlinks to system JARs
-
-* Mon Sep 11 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.9.3-1
-- Initial packaging
-
+%autochangelog

sources

@@ -1,2 +1,2 @@
-SHA512 (plexus-languages-1.0.3.tar.gz) = a3ab1f1828536743cfacdfbf2d1c06e5e33ebd1d1e633f8af911e83f4f58377f7061e97e2faf06fcd42371993963ea3851e72ba3cfbbb5c767cdf257646df6d0
+SHA512 (plexus-languages-1.2.0.tar.gz) = 3791cca192dba4be99d208a3594ccfd647bb788274e3ae58a79d1f3d9db7918aba176895cc8c5f171fd5205c47f5030b74c12863506833f692a45538363869cf
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8