Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package testng for openSUSE:Factory checked in at 2022-04-27 21:42:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/testng (Old) and /work/SRC/openSUSE:Factory/.testng.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "testng" Wed Apr 27 21:42:12 2022 rev:2 rq:973206 version:7.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/testng/testng.changes 2019-04-03 10:50:05.757909906 +0200 +++ /work/SRC/openSUSE:Factory/.testng.new.1538/testng.changes 2022-04-27 21:42:22.665088933 +0200 @@ -1,0 +2,11 @@ +Wed Apr 27 13:42:54 UTC 2022 - Fridrich Strba <[email protected]> + +- Upgrade to version 7.4.0 +- Fetch sources using source service instead of a script +- Build with java source and target levels 8 +- Modified patches: + * 0001-Avoid-accidental-javascript-in-javadoc.patch + * 0002-Replace-bundled-jquery-with-CDN-link.patch + + Rediff to changed context + +------------------------------------------------------------------- Old: ---- generate-tarball.sh testng-6.14.3.tar.xz New: ---- _service testng-7.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ testng.spec ++++++ --- /var/tmp/diff_new_pack.nYXtu2/_old 2022-04-27 21:42:23.213089602 +0200 +++ /var/tmp/diff_new_pack.nYXtu2/_new 2022-04-27 21:42:23.217089606 +0200 @@ -1,7 +1,7 @@ # # spec file for package testng # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,15 @@ Name: testng -Version: 6.14.3 +Version: 7.4.0 Release: 0 Summary: Java-based testing framework License: Apache-2.0 Group: Development/Libraries/Java -URL: http://testng.org/ -# ./generate-tarball.sh +URL: https://testng.org/ Source0: %{name}-%{version}.tar.xz Source1: pom.xml Source2: %{name}-build.xml -# Remove bundled binaries to make sure we don't ship anything forbidden -Source3: generate-tarball.sh Patch0: 0001-Avoid-accidental-javascript-in-javadoc.patch Patch1: 0002-Replace-bundled-jquery-with-CDN-link.patch BuildRequires: ant @@ -40,8 +37,8 @@ BuildRequires: jsr-305 BuildRequires: junit BuildRequires: snakeyaml -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve +Requires: mvn(com.beust:jcommander) +Requires: mvn(org.yaml:snakeyaml) BuildArch: noarch %description @@ -63,7 +60,7 @@ %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} . +sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml cp %{SOURCE2} build.xml # remove any bundled libs, but not test resources @@ -75,32 +72,39 @@ %pom_remove_plugin :maven-source-plugin . %pom_remove_plugin :maven-javadoc-plugin . -%pom_remove_parent . - sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.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 mkdir -p lib build-jar-repository -s lib ant/ant beust-jcommander bsh2/bsh google-guice jsr305 junit snakeyaml -%ant jar javadoc - -%mvn_artifact pom.xml target/%{name}-%{version}.jar +%{ant} jar javadoc %install -%mvn_install +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a org.testng:testng::jdk15: + +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles %doc CHANGES.txt README.md %license LICENSE.txt -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE.txt %changelog ++++++ 0001-Avoid-accidental-javascript-in-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.nYXtu2/_old 2022-04-27 21:42:23.241089636 +0200 +++ /var/tmp/diff_new_pack.nYXtu2/_new 2022-04-27 21:42:23.245089641 +0200 @@ -4,23 +4,25 @@ 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 <script> +- /** Parse <script> */ ++ /** + * Parse <script> - */ ++ */ 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 ++++++ --- /var/tmp/diff_new_pack.nYXtu2/_old 2022-04-27 21:42:23.257089655 +0200 +++ /var/tmp/diff_new_pack.nYXtu2/_new 2022-04-27 21:42:23.261089660 +0200 @@ -4,37 +4,36 @@ 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 efd6799..2d8b74e 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; - public class Main implements IReporter { +@@ -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", "testng-reports.css", "testng-reports.js", -+ "testng-reports.css", "testng-reports.js", - "passed.png", "failed.png", "skipped.png", "navigator-bullet.png", - "bullet_point.png", "collapseall.gif" - }; + private static final String[] RESOURCES = + new String[] { +- "jquery.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 -index 47f897b..a302d47 100644 +index f5abbc3..817badc 100644 --- a/src/main/resources/org/testng/header +++ b/src/main/resources/org/testng/header -@@ -6,7 +6,7 @@ - <title>TestNG reports</title> +@@ -7,7 +7,7 @@ - <link type="text/css" href="testng-reports.css" rel="stylesheet" /> -- <script type="text/javascript" src="jquery-1.7.1.min.js"></script> -+ <script type="text/javascript" src="https://code.jquery.com/jquery-1.7.1.min.js";></script> + <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.min.js"></script> ++ <script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.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.17.1 +2.31.1 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/cbeust/testng.git</param> <param name="revision">7.4.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="exclude">bin*</param> <param name="exclude">gradle*</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ pom.xml ++++++ --- /var/tmp/diff_new_pack.nYXtu2/_old 2022-04-27 21:42:23.305089714 +0200 +++ /var/tmp/diff_new_pack.nYXtu2/_new 2022-04-27 21:42:23.309089719 +0200 @@ -1,4 +1,3 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <!-- Refer to the file ./build-with-maven for instruction on how to use this pom.xml --> @@ -8,7 +7,7 @@ <artifactId>testng</artifactId> <packaging>jar</packaging> <name>TestNG</name> - <version>6.14.3</version> + <version>@VERSION@</version> <description>TestNG is a testing framework.</description> <url>http://testng.org</url> @@ -32,12 +31,6 @@ </developer> </developers> - <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>3</version> - </parent> - <distributionManagement> <repository> <id>bintray</id> @@ -137,8 +130,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.1</version> <configuration> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> ++++++ testng-6.14.3.tar.xz -> testng-7.4.0.tar.xz ++++++ ++++ 108075 lines of diff (skipped) ++++++ testng-build.xml ++++++ --- /var/tmp/diff_new_pack.nYXtu2/_old 2022-04-27 21:42:23.901090441 +0200 +++ /var/tmp/diff_new_pack.nYXtu2/_new 2022-04-27 21:42:23.905090446 +0200 @@ -11,10 +11,10 @@ <property name="project.groupId" value="org.testng"/> <property name="project.artifactId" value="testng"/> <property name="project.name" value="TestNG"/> - <property name="project.version" value="6.14.3"/> + <property name="project.version" value="7.4.0"/> <property name="project.description" value="TestNG is a testing framework."/> - <property name="compiler.source" value="1.7"/> + <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
