From bd64975b429435f1b1410e89cde092995fd2702c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- .gitignore | 6 ++ ...oid-accidental-javascript-in-javadoc.patch | 18 ++-- ...Replace-bundled-jquery-with-CDN-link.patch | 35 ++++---- generate-tarball.sh | 13 +-- pom.xml | 7 +- sources | 2 +- testng.spec | 82 +++++++++++-------- 7 files changed, 90 insertions(+), 73 deletions(-) diff --git a/.gitignore b/.gitignore index 17ee1c1..7f50cd8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,9 @@ /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 diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch index 9df54e3..fc97728 100644 --- a/0001-Avoid-accidental-javascript-in-javadoc.patch +++ b/0001-Avoid-accidental-javascript-in-javadoc.patch @@ -4,22 +4,24 @@ 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 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 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 -index 450678f..11543e3 100644 +index b74572a..7c490e9 100644 --- a/src/main/java/org/testng/xml/TestNGContentHandler.java +++ b/src/main/java/org/testng/xml/TestNGContentHandler.java -@@ -245,7 +245,7 @@ public class TestNGContentHandler extends DefaultHandler { +@@ -250,7 +250,9 @@ public class TestNGContentHandler extends DefaultHandler { + } } - /** -- * Parse -+ + + +- ++