Update to upstream version 7.0.0~beta4

.gitignore

@@ -19,3 +19,4 @@
 /6.12.tar.gz
 /6.14.3.tar.gz
 /testng-6.14.3.tar.gz
+/testng-7.0.0~beta4.tar.gz

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 +-
+ src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 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 <script> */
--   * Parse <script>
++  /**
 +   * Parse &lt;script&gt;
-    */
++   */
    private void xmlScript(boolean start, Attributes attributes) {
      if (start) {
+       m_currentLanguage = attributes.getValue("language");
 -- 
-2.17.1
+2.20.1
 

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

@@ -4,23 +4,22 @@ 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 | 2 +-
+ src/main/java/org/testng/reporters/jq/Main.java | 1 -
  src/main/resources/org/testng/header            | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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 cb83ff9..b691674 100644
+index 1d3e950..3b5bc0d 100644
 --- a/src/main/java/org/testng/reporters/jq/Main.java
 +++ b/src/main/java/org/testng/reporters/jq/Main.java
-@@ -19,7 +19,7 @@ import java.util.List;
+@@ -21,7 +21,6 @@ public class Main implements IReporter {
- public class Main implements IReporter {
    private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
-   private static final String[] RESOURCES = new String[] {
+   private static final String[] RESOURCES =
--    "jquery-1.7.1.min.js", "testng-reports.css", "testng-reports.js",
+       new String[] {
-+    "testng-reports.css", "testng-reports.js",
+-        "jquery-1.7.1.min.js",
-     "passed.png", "failed.png", "skipped.png", "navigator-bullet.png",
+         "testng-reports.css",
-     "bullet_point.png", "collapseall.gif"
+         "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
@@ -35,5 +34,5 @@ index 47f897b..a302d47 100644
      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
      <script type='text/javascript'>
 -- 
-2.17.1
+2.20.1
 

generate-tarball.sh

@@ -3,14 +3,15 @@ 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/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+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
 cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
+tar xf "../${name}-${upstream_version}.orig.tar.gz"
 
 # CLEAN TARBALL
 rm -r */gradle* */kobalt*
@@ -18,4 +19,4 @@ rm */src/main/resources/org/testng/jquery-*.js
 
 tar cf "../${name}-${version}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"

pom.xml

@@ -137,8 +137,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
+          <source>1.8</source>
-          <target>1.7</target>
+          <target>1.8</target>
         </configuration>
       </plugin>
 

sources

@@ -1 +1 @@
-SHA512 (testng-6.14.3.tar.gz) = cec176c1c886b4f8f54021910af4637004854e88f928496acd67b9bc1ea2c78bc86451f37b98269aa56d8ec88b2c0fb75fa5c3cf7ea72e19192f910dd8242cfa
+SHA512 (testng-7.0.0~beta4.tar.gz) = 39b50d6f5b677830e0e11c5d5fc5667f92f0ffb75fa8be96e33c87f642398e687396ad71826fbc6c04088470d7bb5fd1ff12672e348e83119982e759bfa1e2fb

testng.spec

@@ -1,7 +1,6 @@
-
 Name:           testng
-Version:        6.14.3
+Version:        7.0.0~beta4
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -42,7 +41,7 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-7.0.0-beta4
 
 %patch0 -p1
 %patch1 -p1
@@ -86,6 +85,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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