From aa4e86a1aecb322373e740ef6ca7e189d8d25386 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 01/14] Switch from %setup to %autosetup --- testng.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testng.spec b/testng.spec index ec66902..50a9ecc 100644 --- a/testng.spec +++ b/testng.spec @@ -47,12 +47,10 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%(echo %{version} | tr '~' '-') +%autosetup -p1 -C cp %{SOURCE1} pom.xml -%patch 0 -p1 -%patch 1 -p1 # Contains differently licensed sources rm -r testng-test-osgi From 7cf83d3e04a8885cdd77e9d097c93809a040cb00 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 02/14] Switch to non-numdered patches --- testng.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testng.spec b/testng.spec index 50a9ecc..869c2d3 100644 --- a/testng.spec +++ b/testng.spec @@ -16,8 +16,8 @@ Source1: https://repo1.maven.org/maven2/org/testng/testng/%{version}/test # Remove bundled binaries to make sure we don't ship anything forbidden Source2: generate-tarball.sh -Patch0: 0001-Avoid-accidental-javascript-in-javadoc.patch -Patch1: 0002-Replace-bundled-jquery-with-CDN-link.patch +Patch: 0001-Avoid-accidental-javascript-in-javadoc.patch +Patch: 0002-Replace-bundled-jquery-with-CDN-link.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch From 2f17814a14704849a385069899818346163297a0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:19 +0200 Subject: [PATCH 03/14] Convert to %autorelease and %autochangelog --- changelog | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++ testng.spec | 249 +--------------------------------------------------- 2 files changed, 248 insertions(+), 247 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..24dbf34 --- /dev/null +++ b/changelog @@ -0,0 +1,246 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 7.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 7.8.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 7.8.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Sat Jan 27 2024 Fedora Release Engineering - 7.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 7.8.0-2 +- Rebuild + +* Thu Aug 17 2023 Marian Koncek - 7.8.0-1 +- Update to upstream version 7.8.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 7.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 7.6.1-4 +- Rebuild with no changes + +* Tue Mar 21 2023 Mikolaj Izdebski - 7.6.1-3 +- Port to Google Guice 5 + +* Sat Jan 21 2023 Fedora Release Engineering - 7.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Sep 09 2022 Marian Koncek - 7.6.1-1 +- Update to upstream version 7.6.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 7.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 7.4.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Sat Jan 22 2022 Fedora Release Engineering - 7.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 08 2021 Marian Koncek - 7.4.0-1 +- Update to upstream version 7.4.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 7.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 7.3.0-2 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 6.14.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 30 2020 Marian Koncek - 7.3.0-1 +- Update to upstream version 7.3.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 6.14.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Marian Koncek - 7.2.0~SNAPSHOT-1 +- Update to upstream version 7.2.0~SNAPSHOT + +* Wed Jul 29 2020 Marian Koncek - 7.1.1-1 +- Update to upstream version 7.1.1 + +* Sat Jul 11 2020 Jiri Vanek - 6.14.3-12 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Feb 19 2020 Fabio Valentini - 6.14.3-11 +- Drop unnecessary dependency on parent POM. + +* Fri Jan 31 2020 Fedora Release Engineering - 6.14.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-2 +- Mass rebuild for javapackages-tools 201902 + +* Mon Sep 02 2019 Marian Koncek - 7.0.0-1 +- Update to upstream version 7.0.0 + +* Wed Aug 14 2019 Marian Koncek - 7.0.0~beta7-1 +- Update to upstream version 7.0.0~beta7 + +* Sat Jul 27 2019 Fedora Release Engineering - 6.14.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 23 2019 Fabio Valentini - 6.14.3-8 +- Disable groovy support by default. + +* Thu Jun 06 2019 Marian Koncek - 7.0.0~beta4-1 +- Update to upstream version 7.0.0~beta4 + +* Fri May 24 2019 Mikolaj Izdebski - 6.14.3-6 +- Mass rebuild for javapackages-tools 201901 + +* Sun Feb 03 2019 Fedora Release Engineering - 6.14.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Dec 13 2018 Mat Booth - 6.14.3-6 +- Fix test suite execution + +* Wed Jul 18 2018 Michael Simacek - 6.14.3-5 +- Clean tarball from binaries +- Replace bundled jquery with CDN link + +* Tue Jul 17 2018 Mikolaj Izdebski - 6.14.3-4 +- Allow conditionally building without snakeyaml + +* Sat Jul 14 2018 Fedora Release Engineering - 6.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-2 +- Bump maven pom version. + +* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-1 +- Update to upstream 6.14.3. + +* Fri Feb 09 2018 Fedora Release Engineering - 6.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 23 2017 Mat Booth - 6.12-2 +- Allow OSGi metadata to export all packages including internal ones + +* Fri Jul 28 2017 Mat Booth - 6.12-1 +- Update to latest release of testng +- Fixes classloading from ant rhbz#1475842 + +* Thu Jul 27 2017 Fedora Release Engineering - 6.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jul 04 2017 Mat Booth - 6.11-1 +- Update to latest upstream release +- Continue building with maven for now, instead of moving to gradle due to + rhbz#1467724 + +* Wed May 31 2017 Michael Simacek - 6.9.12-5 +- Avoid accidental javascript in comment + +* Fri Feb 17 2017 Mat Booth - 6.9.12-4 +- License correction + +* Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 +- Introduce build-conditional to allow building without groovy + +* Tue Nov 01 2016 Mat Booth - 6.9.12-1 +- Update to upstream version 6.9.12 +- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package + +* Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1 +- Update to upstream version 6.9.11 + +* Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jan 08 2016 gil cattaneo 6.9.10-1 +- Update to 6.9.10 + +* Tue Oct 27 2015 gil cattaneo 6.9.9-1 +- Update to 6.9.9 + +* Tue Oct 13 2015 gil cattaneo 6.9.8-1 +- Update to 6.9.8 + +* Mon Sep 07 2015 Mat Booth - 6.9.5-1 +- Update to 6.9.5 + +* Fri Jun 19 2015 Fedora Release Engineering - 6.8.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jan 20 2015 gil cattaneo 6.8.21-1 +- Update to 6.8.21 +- introduce license macro + +* Tue Jan 20 2015 gil cattaneo 6.8.17-1 +- Update to 6.8.17 + +* Wed Jan 14 2015 gil cattaneo 6.8.14-1 +- Update to 6.8.14 + +* Mon Aug 4 2014 Mikolaj Izdebski - 6.8.8-3 +- Fix build-requires on sonatype-oss-parent + +* Sun Jun 08 2014 Fedora Release Engineering - 6.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Feb 26 2014 Mikolaj Izdebski - 6.8.8-1 +- Update to upstream version 6.8.8 + +* Thu Sep 12 2013 Stanislav Ochotnicky - 6.8.7-1 +- Update to upstream version 6.8.7 +- Provide additional jdk15 classifier + +* Sun Aug 04 2013 Fedora Release Engineering - 6.8.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue May 14 2013 Mikolaj Izdebski - 6.8.5-1 +- Update to upstream version 6.8.5 + +* Sun Feb 10 2013 Mat Booth - 6.8-1 +- Update to latest upstream release, rhbz #888233 + +* Wed Feb 06 2013 Java SIG - 6.0.1-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 08 2012 Stanislav Ochotnicky - 6.0.1-5 +- Part of testng is CPL, add it to license tag + +* Thu Jul 26 2012 Stanislav Ochotnicky - 6.0.1-4 +- Spec file cleanups and add_maven_depmap macro use +- Drop no longer needed depmap + +* Sat Jul 21 2012 Fedora Release Engineering - 6.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu May 12 2011 Jaromir Capik - 6.0.1-1 +- Update to 6.0.1 + +* Wed Feb 09 2011 Fedora Release Engineering - 5.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jul 19 2010 Lubomir Rintel - 5.11-3 +- Drop backport util concurrent dependency, we don't build jdk14 jar + +* Mon Dec 21 2009 Lubomir Rintel - 5.11-2 +- Add POM + +* Sun Dec 20 2009 Lubomir Rintel - 5.11-1 +- Bump to 5.11 +- Add maven depmap fragments +- Fix line encoding of README + +* Wed Dec 09 2009 Lubomir Rintel - 5.10-2 +- Add javadoc +- Don't ship jdk14 jar + +* Fri Nov 27 2009 Lubomir Rintel - 5.10-1 +- Initial packaging diff --git a/testng.spec b/testng.spec index 869c2d3..0ca5e1d 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 7.8.0 -Release: 6%{?dist} +Release: %autorelease Summary: Java-based testing framework License: Apache-2.0 URL: https://testng.org/doc/ @@ -88,249 +88,4 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 7.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 7.8.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 7.8.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Sat Jan 27 2024 Fedora Release Engineering - 7.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 7.8.0-2 -- Rebuild - -* Thu Aug 17 2023 Marian Koncek - 7.8.0-1 -- Update to upstream version 7.8.0 - -* Sat Jul 22 2023 Fedora Release Engineering - 7.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 31 2023 Mikolaj Izdebski - 7.6.1-4 -- Rebuild with no changes - -* Tue Mar 21 2023 Mikolaj Izdebski - 7.6.1-3 -- Port to Google Guice 5 - -* Sat Jan 21 2023 Fedora Release Engineering - 7.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 09 2022 Marian Koncek - 7.6.1-1 -- Update to upstream version 7.6.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 7.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 7.4.0-3 -- Rebuilt for java-17-openjdk as system jdk - -* Sat Jan 22 2022 Fedora Release Engineering - 7.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 08 2021 Marian Koncek - 7.4.0-1 -- Update to upstream version 7.4.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 7.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 7.3.0-2 -- Bootstrap build -- Non-bootstrap build - -* Wed Jan 27 2021 Fedora Release Engineering - 6.14.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Sep 30 2020 Marian Koncek - 7.3.0-1 -- Update to upstream version 7.3.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 6.14.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Marian Koncek - 7.2.0~SNAPSHOT-1 -- Update to upstream version 7.2.0~SNAPSHOT - -* Wed Jul 29 2020 Marian Koncek - 7.1.1-1 -- Update to upstream version 7.1.1 - -* Sat Jul 11 2020 Jiri Vanek - 6.14.3-12 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Feb 19 2020 Fabio Valentini - 6.14.3-11 -- Drop unnecessary dependency on parent POM. - -* Fri Jan 31 2020 Fedora Release Engineering - 6.14.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-2 -- Mass rebuild for javapackages-tools 201902 - -* Mon Sep 02 2019 Marian Koncek - 7.0.0-1 -- Update to upstream version 7.0.0 - -* Wed Aug 14 2019 Marian Koncek - 7.0.0~beta7-1 -- Update to upstream version 7.0.0~beta7 - -* Sat Jul 27 2019 Fedora Release Engineering - 6.14.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jul 23 2019 Fabio Valentini - 6.14.3-8 -- Disable groovy support by default. - -* Thu Jun 06 2019 Marian Koncek - 7.0.0~beta4-1 -- Update to upstream version 7.0.0~beta4 - -* Fri May 24 2019 Mikolaj Izdebski - 6.14.3-6 -- Mass rebuild for javapackages-tools 201901 - -* Sun Feb 03 2019 Fedora Release Engineering - 6.14.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Dec 13 2018 Mat Booth - 6.14.3-6 -- Fix test suite execution - -* Wed Jul 18 2018 Michael Simacek - 6.14.3-5 -- Clean tarball from binaries -- Replace bundled jquery with CDN link - -* Tue Jul 17 2018 Mikolaj Izdebski - 6.14.3-4 -- Allow conditionally building without snakeyaml - -* Sat Jul 14 2018 Fedora Release Engineering - 6.14.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-2 -- Bump maven pom version. - -* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-1 -- Update to upstream 6.14.3. - -* Fri Feb 09 2018 Fedora Release Engineering - 6.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 23 2017 Mat Booth - 6.12-2 -- Allow OSGi metadata to export all packages including internal ones - -* Fri Jul 28 2017 Mat Booth - 6.12-1 -- Update to latest release of testng -- Fixes classloading from ant rhbz#1475842 - -* Thu Jul 27 2017 Fedora Release Engineering - 6.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jul 04 2017 Mat Booth - 6.11-1 -- Update to latest upstream release -- Continue building with maven for now, instead of moving to gradle due to - rhbz#1467724 - -* Wed May 31 2017 Michael Simacek - 6.9.12-5 -- Avoid accidental javascript in comment - -* Fri Feb 17 2017 Mat Booth - 6.9.12-4 -- License correction - -* Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 -- Introduce build-conditional to allow building without groovy - -* Tue Nov 01 2016 Mat Booth - 6.9.12-1 -- Update to upstream version 6.9.12 -- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package - -* Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1 -- Update to upstream version 6.9.11 - -* Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jan 08 2016 gil cattaneo 6.9.10-1 -- Update to 6.9.10 - -* Tue Oct 27 2015 gil cattaneo 6.9.9-1 -- Update to 6.9.9 - -* Tue Oct 13 2015 gil cattaneo 6.9.8-1 -- Update to 6.9.8 - -* Mon Sep 07 2015 Mat Booth - 6.9.5-1 -- Update to 6.9.5 - -* Fri Jun 19 2015 Fedora Release Engineering - 6.8.21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Jan 20 2015 gil cattaneo 6.8.21-1 -- Update to 6.8.21 -- introduce license macro - -* Tue Jan 20 2015 gil cattaneo 6.8.17-1 -- Update to 6.8.17 - -* Wed Jan 14 2015 gil cattaneo 6.8.14-1 -- Update to 6.8.14 - -* Mon Aug 4 2014 Mikolaj Izdebski - 6.8.8-3 -- Fix build-requires on sonatype-oss-parent - -* Sun Jun 08 2014 Fedora Release Engineering - 6.8.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 26 2014 Mikolaj Izdebski - 6.8.8-1 -- Update to upstream version 6.8.8 - -* Thu Sep 12 2013 Stanislav Ochotnicky - 6.8.7-1 -- Update to upstream version 6.8.7 -- Provide additional jdk15 classifier - -* Sun Aug 04 2013 Fedora Release Engineering - 6.8.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue May 14 2013 Mikolaj Izdebski - 6.8.5-1 -- Update to upstream version 6.8.5 - -* Sun Feb 10 2013 Mat Booth - 6.8-1 -- Update to latest upstream release, rhbz #888233 - -* Wed Feb 06 2013 Java SIG - 6.0.1-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Nov 08 2012 Stanislav Ochotnicky - 6.0.1-5 -- Part of testng is CPL, add it to license tag - -* Thu Jul 26 2012 Stanislav Ochotnicky - 6.0.1-4 -- Spec file cleanups and add_maven_depmap macro use -- Drop no longer needed depmap - -* Sat Jul 21 2012 Fedora Release Engineering - 6.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 6.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu May 12 2011 Jaromir Capik - 6.0.1-1 -- Update to 6.0.1 - -* Wed Feb 09 2011 Fedora Release Engineering - 5.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jul 19 2010 Lubomir Rintel - 5.11-3 -- Drop backport util concurrent dependency, we don't build jdk14 jar - -* Mon Dec 21 2009 Lubomir Rintel - 5.11-2 -- Add POM - -* Sun Dec 20 2009 Lubomir Rintel - 5.11-1 -- Bump to 5.11 -- Add maven depmap fragments -- Fix line encoding of README - -* Wed Dec 09 2009 Lubomir Rintel - 5.10-2 -- Add javadoc -- Don't ship jdk14 jar - -* Fri Nov 27 2009 Lubomir Rintel - 5.10-1 -- Initial packaging +%autochangelog From 808211b59f45d7dbbce5e2f4b75582fbdc6bd34e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:39 +0100 Subject: [PATCH 04/14] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From c318afa9c8bc02e63aa8a0da817038f9c8626ce8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 05/14] Unify spec style with the rest of Java/Maven packages [skip changelog] --- testng.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/testng.spec b/testng.spec index 0ca5e1d..28531f4 100644 --- a/testng.spec +++ b/testng.spec @@ -9,16 +9,13 @@ URL: https://testng.org/doc/ # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz - # Allows building with maven instead of gradle Source1: https://repo1.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom - # Remove bundled binaries to make sure we don't ship anything forbidden Source2: generate-tarball.sh Patch: 0001-Avoid-accidental-javascript-in-javadoc.patch Patch: 0002-Replace-bundled-jquery-with-CDN-link.patch - BuildArch: noarch ExclusiveArch: %{java_arches} noarch From b4c3243639a87ea62332833a7df367d8ceb18f5f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 06/14] Reorder spec file tags [skip changelog] --- testng.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testng.spec b/testng.spec index 28531f4..494e963 100644 --- a/testng.spec +++ b/testng.spec @@ -6,6 +6,8 @@ Release: %autorelease Summary: Java-based testing framework License: Apache-2.0 URL: https://testng.org/doc/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz @@ -16,8 +18,6 @@ Source2: generate-tarball.sh Patch: 0001-Avoid-accidental-javascript-in-javadoc.patch Patch: 0002-Replace-bundled-jquery-with-CDN-link.patch -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From eb749712ea967da0e36f7669c8921ce7bf5ca990 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:11 +0100 Subject: [PATCH 07/14] Update javadoc package description [skip changelog] --- testng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 494e963..cee1b41 100644 --- a/testng.spec +++ b/testng.spec @@ -41,7 +41,7 @@ functional, end-to-end, integration, etc. Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 02bd2106401b092c6a3d3e4b873615a97442420c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:38:57 +0000 Subject: [PATCH 08/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 40de6aa7f320a09753134053c0dd867f7ac9a570 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:14 +0100 Subject: [PATCH 09/14] Remove javadoc subpackage --- testng.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/testng.spec b/testng.spec index cee1b41..922f954 100644 --- a/testng.spec +++ b/testng.spec @@ -30,6 +30,8 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 7.8.0-20 %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -37,12 +39,6 @@ some new functionality, including flexible test configuration, and distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -72,7 +68,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %build # Tests extend a class written in Kotlin -%mvn_build -f -- -Dmaven.compiler.release=11 +%mvn_build -j -f -- -Dmaven.compiler.release=11 %install %mvn_install @@ -81,8 +77,5 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %doc CHANGES.txt README.md %license LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt - %changelog %autochangelog From e12be2f374497ac816ea945d2a67d26b654ec8ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 10/14] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 1ae91a77b999b2d71e6afe13d9f76e6217d91a5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 11/14] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 3fc566ac891cd6e25d61fcdaba79a75f0c3f38f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 12/14] Build with OpenJDK 25 --- testng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 922f954..6173a52 100644 --- a/testng.spec +++ b/testng.spec @@ -22,7 +22,7 @@ Patch: 0002-Replace-bundled-jquery-with-CDN-link.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.beust:jcommander) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.inject:guice) From 1fdd38ec1d2c063aa7694a3ff8a9ca28072d1244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:13:09 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ec0b345eaf52ebf96ff510a6958e1bf7637cb949 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:22:25 +0200 Subject: [PATCH 14/14] Rebuilt for java-25-openjdk as preffered jdk 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.