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.

.fmf/version

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

.gitignore

@@ -1,4 +1,6 @@
-testng-5.11.zip
+/noarch/
+/.build-*.log
+/*.src.rpm
 /testng-6.0.1.tar.xz
 /testng-6.8.tar.gz
 /testng-6.8.5.tar.gz
@@ -7,3 +9,24 @@ testng-5.11.zip
 /testng-6.8.14.tar.gz
 /testng-6.8.17.tar.gz
 /testng-6.8.21.tar.gz
+/testng-6.9.5.tar.gz
+/6.9.8.tar.gz
+/6.9.9.tar.gz
+/6.9.10.tar.gz
+/6.9.11.tar.gz
+/6.9.12.tar.gz
+/6.11.tar.gz
+/6.12.tar.gz
+/6.14.3.tar.gz
+/testng-6.14.3.tar.gz
+/testng-7.0.0~beta4.tar.gz
+/testng-7.0.0~beta7.tar.gz
+/testng-7.0.0.tar.gz
+/testng-7.1.1.tar.gz
+/testng-7.2.0~SNAPSHOT.tar.gz
+/testng-7.3.0.tar.gz
+/testng-7.4.0.tar.gz
+/testng-7.6.1.tar.gz
+/testng-7.6.1.pom
+/testng-7.8.0.tar.gz
+/testng-7.8.0.pom

0001-Avoid-accidental-javascript-in-javadoc.patch

@@ -0,0 +1,27 @@
+From bce3019741aeb785658b23095ae408a6c2d8ca35 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Wed, 31 May 2017 13:44:36 +0200
+Subject: [PATCH 1/2] Avoid accidental javascript in javadoc
+
+---
+ testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
+index b74572a..7c490e9 100644
+--- a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
++++ b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
+@@ -250,7 +250,9 @@ public class TestNGContentHandler extends DefaultHandler {
+     }
+   }
+ 
+-  /** Parse <script> */
++  /**
++   * Parse &lt;script&gt;
++   */
+   private void xmlScript(boolean start, Attributes attributes) {
+     if (start) {
+       m_currentLanguage = attributes.getValue("language");
+-- 
+2.20.1
+

0002-Replace-bundled-jquery-with-CDN-link.patch

@@ -0,0 +1,38 @@
+From 9155677e2d5acdd2379c38041189da52c7f04946 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Wed, 18 Jul 2018 15:57:49 +0200
+Subject: [PATCH 2/2] Replace bundled jquery with CDN link
+
+---
+ testng-core/src/main/java/org/testng/reporters/jq/Main.java | 1 -
+ testng-core/src/main/resources/org/testng/header            | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/testng-core/src/main/java/org/testng/reporters/jq/Main.java b/testng-core/src/main/java/org/testng/reporters/jq/Main.java
+index efd6799..2d8b74e 100644
+--- a/testng-core/src/main/java/org/testng/reporters/jq/Main.java
++++ b/testng-core/src/main/java/org/testng/reporters/jq/Main.java
+@@ -21,7 +21,6 @@ public class Main implements IReporter {
+   private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
+   private static final String[] RESOURCES =
+       new String[] {
+-        "jquery-3.6.0.min.js",
+         "testng-reports.css",
+         "testng-reports.js",
+         "testng-reports1.css",
+diff --git a/testng-core/src/main/resources/org/testng/header b/testng-core/src/main/resources/org/testng/header
+index f5abbc3..817badc 100644
+--- a/testng-core/src/main/resources/org/testng/header
++++ b/testng-core/src/main/resources/org/testng/header
+@@ -7,7 +7,7 @@
+ 
+     <link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
+     <link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
+-    <script type="text/javascript" src="jquery-3.6.0.min.js"></script>
++    <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+     <script type="text/javascript" src="testng-reports.js"></script>
+     <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+     <script type='text/javascript'>
+-- 
+2.31.1
+

changelog

@@ -0,0 +1,246 @@
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
+- Rebuild
+
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
+- Update to upstream version 7.8.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
+- Rebuild with no changes
+
+* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
+- Port to Google Guice 5
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
+- Update to upstream version 7.6.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 7.4.0-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Nov 08 2021 Marian Koncek <mkoncek@redhat.com> - 7.4.0-1
+- Update to upstream version 7.4.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.3.0-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 30 2020 Marian Koncek <mkoncek@redhat.com> - 7.3.0-1
+- Update to upstream version 7.3.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.2.0~SNAPSHOT-1
+- Update to upstream version 7.2.0~SNAPSHOT
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.1.1-1
+- Update to upstream version 7.1.1
+
+* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 6.14.3-12
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Feb 19 2020 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-11
+- Drop unnecessary dependency on parent POM.
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
+- Update to upstream version 7.0.0
+
+* Wed Aug 14 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta7-1
+- Update to upstream version 7.0.0~beta7
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 23 2019 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-8
+- Disable groovy support by default.
+
+* Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta4-1
+- Update to upstream version 7.0.0~beta4
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-6
+- Mass rebuild for javapackages-tools 201901
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Dec 13 2018 Mat Booth <mat.booth@redhat.com> - 6.14.3-6
+- Fix test suite execution
+
+* Wed Jul 18 2018 Michael Simacek <msimacek@redhat.com> - 6.14.3-5
+- Clean tarball from binaries
+- Replace bundled jquery with CDN link
+
+* Tue Jul 17 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-4
+- Allow conditionally building without snakeyaml
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-2
+- Bump maven pom version.
+
+* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-1
+- Update to upstream 6.14.3.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 6.12-2
+- Allow OSGi metadata to export all packages including internal ones
+
+* Fri Jul 28 2017 Mat Booth <mat.booth@redhat.com> - 6.12-1
+- Update to latest release of testng
+- Fixes classloading from ant rhbz#1475842
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Mat Booth <mat.booth@redhat.com> - 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 <msimacek@redhat.com> - 6.9.12-5
+- Avoid accidental javascript in comment
+
+* Fri Feb 17 2017 Mat Booth <mat.booth@redhat.com> - 6.9.12-4
+- License correction
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb  1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.9.12-2
+- Introduce build-conditional to allow building without groovy
+
+* Tue Nov 01 2016 Mat Booth <mat.booth@redhat.com> - 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 <mizdebsk@redhat.com> - 6.9.11-1
+- Update to upstream version 6.9.11
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 08 2016 gil cattaneo <puntogil@libero.it> 6.9.10-1
+- Update to 6.9.10
+
+* Tue Oct 27 2015 gil cattaneo <puntogil@libero.it> 6.9.9-1
+- Update to 6.9.9
+
+* Tue Oct 13 2015 gil cattaneo <puntogil@libero.it> 6.9.8-1
+- Update to 6.9.8
+
+* Mon Sep 07 2015 Mat Booth <mat.booth@redhat.com> - 6.9.5-1
+- Update to 6.9.5
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.21-1
+- Update to 6.8.21
+- introduce license macro
+
+* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.17-1
+- Update to 6.8.17
+
+* Wed Jan 14 2015 gil cattaneo <puntogil@libero.it> 6.8.14-1
+- Update to 6.8.14
+
+* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-3
+- Fix build-requires on sonatype-oss-parent
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-1
+- Update to upstream version 6.8.8
+
+* Thu Sep 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.8.7-1
+- Update to upstream version 6.8.7
+- Provide additional jdk15 classifier
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.5-1
+- Update to upstream version 6.8.5
+
+* Sun Feb 10 2013 Mat Booth <fedora@matbooth.co.uk> - 6.8-1
+- Update to latest upstream release, rhbz #888233
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <sochotnicky@redhat.com> - 6.0.1-5
+- Part of testng is CPL, add it to license tag
+
+* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 6.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu May 12 2011 Jaromir Capik <jcapik@redhat.com> - 6.0.1-1
+- Update to 6.0.1
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 5.11-3
+- Drop backport util concurrent dependency, we don't build jdk14 jar
+
+* Mon Dec 21 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-2
+- Add POM
+
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-1
+- Bump to 5.11
+- Add maven depmap fragments
+- Fix line encoding of README
+
+* Wed Dec 09 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-2
+- Add javadoc
+- Don't ship jdk14 jar
+
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-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

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+name=testng
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+upstream_version="$(echo ${version} | tr '~' '-')"
+
+# RETRIEVE
+wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "${name}-${upstream_version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar -xf "../${name}-${upstream_version}.orig.tar.gz"
+
+# CLEAN TARBALL
+rm -r */bin*
+rm -r */gradle*
+find -name 'jquery-*.min.js' -delete
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${upstream_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

sources

@@ -1 +1,2 @@
-6d2331958850922796329a9d9e141e02  testng-6.8.21.tar.gz
+SHA512 (testng-7.8.0.tar.gz) = 845fd50bc94e0dac560a6dacd7fcf1cdc1dba870fd73c7fe89342460325c02f02e13a407d4dacf1328723b3c9fefa778b67f2e27208858c629e391cb1e3b4333
+SHA512 (testng-7.8.0.pom) = 1f203073eea51a187824e7096a9eb0fd5df7b76ebfe65fa49037b28826dda216f75e73ed352ce4af645389cbbd2d72ccbf2a1fe9ccafe0d5daddcab4ed6d3959

testng.spec

@@ -1,28 +1,37 @@
+%bcond_with bootstrap
 
-%global group_id  org.testng
+Name:           testng
+Version:        7.8.0
+Release:        %autorelease
+Summary:        Java-based testing framework
+License:        Apache-2.0
+URL:            https://testng.org/doc/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Name:             testng
-Version:          6.8.21
-Release:          2%{?dist}
-Summary:          Java-based testing framework
-# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL
-License:          ASL 2.0 and CPL
-URL:              http://testng.org/
-Source0:          https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz
+# ./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
 
-BuildArch:        noarch
+Patch:          0001-Avoid-accidental-javascript-in-javadoc.patch
+Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
 
-BuildRequires:    mvn(com.beust:jcommander) >= 1.27
-BuildRequires:    mvn(com.google.guava:guava)
-BuildRequires:    mvn(com.google.inject:guice)
-BuildRequires:    mvn(junit:junit)
-BuildRequires:    mvn(org.apache.ant:ant)
-BuildRequires:    mvn(org.beanshell:bsh)
-BuildRequires:    mvn(org.sonatype.oss:oss-parent:pom:)
-BuildRequires:    mvn(org.yaml:snakeyaml)
-
-BuildRequires:    maven-local
-BuildRequires:    maven-plugin-bundle
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(com.beust:jcommander)
+BuildRequires:  mvn(com.google.code.findbugs:jsr305)
+BuildRequires:  mvn(com.google.inject:guice)
+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
@@ -30,132 +39,43 @@ 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
-This package contains the API documentation for %{name}.
-
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%autosetup -p1 -C
 
-# build fix for new guice
-%pom_add_dep com.google.guava:guava::provided
-sed -i "s|com.google.inject.internal|com.google.common.collect|" \
-  src/main/java/org/testng/xml/XmlDependencies.java \
-  src/main/java/org/testng/xml/XmlGroups.java \
-  src/main/java/org/testng/xml/dom/TestNGTagFactory.java \
-  src/test/java/test/dependent/InstanceSkipSampleTest.java \
-  src/test/java/test/mustache/MustacheTest.java \
-  src/test/java/test/thread/B.java
+cp %{SOURCE1} pom.xml
 
-%pom_remove_plugin :maven-gpg-plugin
-%pom_remove_plugin :maven-source-plugin
-  
-# remove bundled stuff
-rm -rf spring
-rm -rf 3rdparty
-rm -rf lib-supplied
-rm -rf gigaspaces
-rm -f *.jar
 
-# convert to UTF-8
-native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \
-  src/main/java/org/testng/internal/Version.java
+# Contains differently licensed sources
+rm -r testng-test-osgi
 
-iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8
-mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt
+find . -mindepth 2 -name 'src' -type d -exec cp -r -t . {} +
+
+# remove any bundled libs, but not test resources
+find ! -path '*/test/*' -name '*.jar' -print -delete
+find -name '*.class' -delete
+
+%pom_remove_dep org.webjars:jquery
+
+%pom_remove_dep org.yaml:snakeyaml
+rm src/main/java/org/testng/internal/Yaml*.java
+rm src/main/java/org/testng/Converter.java
+
+cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %mvn_file : %{name}
 # jdk15 classifier is used by some other packages
 %mvn_alias : :::jdk15:
 
 %build
-%mvn_build -- -Dmaven.local.debug=true
+# Tests extend a class written in Kotlin
+%mvn_build -j -f -- -Dmaven.compiler.release=11
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc ANNOUNCEMENT.txt CHANGES.txt README
-%license LICENSE.txt
-
-%files javadoc -f .mfiles-javadoc
+%doc CHANGES.txt README.md
 %license LICENSE.txt
 
 %changelog
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.21-1
-- Update to 6.8.21
-- introduce license macro
-
-* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.17-1
-- Update to 6.8.17
-
-* Wed Jan 14 2015 gil cattaneo <puntogil@libero.it> 6.8.14-1
-- Update to 6.8.14
-
-* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-3
-- Fix build-requires on sonatype-oss-parent
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-1
-- Update to upstream version 6.8.8
-
-* Thu Sep 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.8.7-1
-- Update to upstream version 6.8.7
-- Provide additional jdk15 classifier
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.5-1
-- Update to upstream version 6.8.5
-
-* Sun Feb 10 2013 Mat Booth <fedora@matbooth.co.uk> - 6.8-1
-- Update to latest upstream release, rhbz #888233
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <sochotnicky@redhat.com> - 6.0.1-5
-- Part of testng is CPL, add it to license tag
-
-* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 6.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu May 12 2011 Jaromir Capik <jcapik@redhat.com> - 6.0.1-1
-- Update to 6.0.1
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 5.11-3
-- Drop backport util concurrent dependency, we don't build jdk14 jar
-
-* Mon Dec 21 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-2
-- Add POM
-
-* Sun Dec 20 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-1
-- Bump to 5.11
-- Add maven depmap fragments
-- Fix line encoding of README
-
-* Wed Dec 09 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-2
-- Add javadoc
-- Don't ship jdk14 jar
-
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-1
-- Initial packaging
+%autochangelog