From cbd05ef1b159aa250bbaa0dee0b5a9bbedb54c1d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 01/36] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- testng.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/testng.spec b/testng.spec index b313c9a..8152fea 100644 --- a/testng.spec +++ b/testng.spec @@ -20,6 +20,7 @@ Patch0: 0001-Avoid-accidental-javascript-in-javadoc.patch Patch1: 0002-Replace-bundled-jquery-with-CDN-link.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local %if %{with bootstrap} From 3d85135bf77232468aa4decc3115f114381e5096 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 02/36] Update build-requires in bootstrap mode --- testng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 8152fea..60d9f7b 100644 --- a/testng.spec +++ b/testng.spec @@ -22,10 +22,10 @@ Patch1: 0002-Replace-bundled-jquery-with-CDN-link.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(com.beust:jcommander) BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.inject:guice::no_aop:) From 7df447536aa5220187eb7b293f3ebda5f3df520b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 10:19:26 +0000 Subject: [PATCH 03/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 60d9f7b..da4e8cc 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 7.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -93,6 +93,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* 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 From f9b06b06aa23a4ab9e47845a58b06349eb75c15f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 04/36] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/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} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 521d9a4cd950fc833a3e941b4ef583893fe413fa Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 26 Sep 2022 16:17:05 +0200 Subject: [PATCH 05/36] Update to upstream version 7.6.1 --- .gitignore | 2 + ...oid-accidental-javascript-in-javadoc.patch | 8 +- ...Replace-bundled-jquery-with-CDN-link.patch | 22 +- generate-tarball.sh | 1 + pom.xml | 240 ------------------ sources | 3 +- testng.spec | 28 +- 7 files changed, 35 insertions(+), 269 deletions(-) delete mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index d5fa4b3..f5c3b23 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ /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 diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch index fc97728..4e072e3 100644 --- a/0001-Avoid-accidental-javascript-in-javadoc.patch +++ b/0001-Avoid-accidental-javascript-in-javadoc.patch @@ -4,13 +4,13 @@ Date: Wed, 31 May 2017 13:44:36 +0200 Subject: [PATCH 1/2] Avoid accidental javascript in javadoc --- - src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++- + testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java +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/src/main/java/org/testng/xml/TestNGContentHandler.java -+++ b/src/main/java/org/testng/xml/TestNGContentHandler.java +--- 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 { } } diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch index d854bce..0223446 100644 --- a/0002-Replace-bundled-jquery-with-CDN-link.patch +++ b/0002-Replace-bundled-jquery-with-CDN-link.patch @@ -4,32 +4,32 @@ Date: Wed, 18 Jul 2018 15:57:49 +0200 Subject: [PATCH 2/2] Replace bundled jquery with CDN link --- - src/main/java/org/testng/reporters/jq/Main.java | 1 - - src/main/resources/org/testng/header | 2 +- + 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/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java +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/src/main/java/org/testng/reporters/jq/Main.java -+++ b/src/main/java/org/testng/reporters/jq/Main.java +--- 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.min.js", +- "jquery-3.6.0.min.js", "testng-reports.css", "testng-reports.js", "testng-reports1.css", -diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header +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/src/main/resources/org/testng/header -+++ b/src/main/resources/org/testng/header +--- a/testng-core/src/main/resources/org/testng/header ++++ b/testng-core/src/main/resources/org/testng/header @@ -7,7 +7,7 @@ -- -+ +- ++