From 3d192bfedb9ced1527087f2c7b6c2b3abea08b52 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:09:44 +0000 Subject: [PATCH] import CS testng-7.8.0-17.module_el9+1171+eb38a622 --- .gitignore | 2 +- .testng.metadata | 2 +- ...oid-accidental-javascript-in-javadoc.patch | 8 +- ...Replace-bundled-jquery-with-CDN-link.patch | 36 +-- SOURCES/generate-tarball.sh | 13 +- SOURCES/pom.xml | 246 ------------------ SOURCES/testng-7.8.0.pom | 88 +++++++ SPECS/testng.spec | 151 ++++++++--- 8 files changed, 240 insertions(+), 306 deletions(-) delete mode 100644 SOURCES/pom.xml create mode 100644 SOURCES/testng-7.8.0.pom diff --git a/.gitignore b/.gitignore index e6637e3..a369660 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/testng-7.0.0.tar.gz +SOURCES/testng-7.8.0.tar.gz diff --git a/.testng.metadata b/.testng.metadata index 118d268..1cfbb7c 100644 --- a/.testng.metadata +++ b/.testng.metadata @@ -1 +1 @@ -9249508bc41850d68038bede149fc0ef87f5d7a5 SOURCES/testng-7.0.0.tar.gz +c2d68e783185920c9e2dfc8738597002aec9f4c3 SOURCES/testng-7.8.0.tar.gz diff --git a/SOURCES/0001-Avoid-accidental-javascript-in-javadoc.patch b/SOURCES/0001-Avoid-accidental-javascript-in-javadoc.patch index fc97728..4e072e3 100644 --- a/SOURCES/0001-Avoid-accidental-javascript-in-javadoc.patch +++ b/SOURCES/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/SOURCES/0002-Replace-bundled-jquery-with-CDN-link.patch b/SOURCES/0002-Replace-bundled-jquery-with-CDN-link.patch index bab0173..0223446 100644 --- a/SOURCES/0002-Replace-bundled-jquery-with-CDN-link.patch +++ b/SOURCES/0002-Replace-bundled-jquery-with-CDN-link.patch @@ -4,35 +4,35 @@ 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 -index 1d3e950..3b5bc0d 100644 ---- 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/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-1.7.1.min.js", +- "jquery-3.6.0.min.js", "testng-reports.css", "testng-reports.js", - "passed.png", -diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header -index 47f897b..a302d47 100644 ---- a/src/main/resources/org/testng/header -+++ b/src/main/resources/org/testng/header -@@ -6,7 +6,7 @@ - TestNG reports + "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 @@ - -- -+ + + +- ++