Pierre Gruet pushed to branch master at Debian Java Maintainers / testng
Commits: 836da111 by Pierre Gruet at 2025-10-28T18:17:39+01:00 Building against snakeyaml 2.x - - - - - bdbc6d2e by Pierre Gruet at 2025-10-28T18:19:59+01:00 Rewriting d/watch with version 5, syntax changes - - - - - 0ba9c337 by Pierre Gruet at 2025-10-28T18:20:43+01:00 Removing last human uploader, thanks Eugene for all the work! - - - - - 3bed99d8 by Pierre Gruet at 2025-10-28T18:24:20+01:00 Raising Standards version to 4.7.2 (no change) - - - - - 462c7822 by Pierre Gruet at 2025-10-28T18:25:12+01:00 Updating changelog - - - - - 26754c03 by Pierre Gruet at 2025-10-28T18:28:15+01:00 Upload to unstable - - - - - 6 changed files: - debian/changelog - debian/control - debian/maven.rules - debian/patches/series - + debian/patches/snakeyaml2.patch - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +testng (6.9.12-5) unstable; urgency=medium + + * Team upload + * Building against snakeyaml 2.x (Closes: #1117943) + * Raising Standards version to 4.7.2 (no change) + * Removing last human uploader, thanks Eugene for all the work! + (Closes: #987137) + * Rewriting d/watch with version 5, syntax changes + + -- Pierre Gruet <[email protected]> Tue, 28 Oct 2025 18:28:05 +0100 + testng (6.9.12-4) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -2,7 +2,6 @@ Source: testng Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Eugene Zhukov <[email protected]> Build-Depends: ant, debhelper (>= 11~), @@ -13,9 +12,9 @@ Build-Depends: libguice-java, libjcommander-java, libmaven-bundle-plugin-java, - libyaml-snake-java, + libyaml-snake-java (>= 2.5+ds), maven-debian-helper -Standards-Version: 4.1.5 +Standards-Version: 4.7.2 Vcs-Git: https://salsa.debian.org/java-team/testng.git Vcs-Browser: https://salsa.debian.org/java-team/testng Homepage: http://testng.org ===================================== debian/maven.rules ===================================== @@ -1,6 +1,6 @@ com.google.inject guice jar s/.*/debian/ s/no_aop// * junit junit jar s/4\..*/4.x/ * * -org.yaml snakeyaml bundle s/1\..*/1.x/ * * -org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * * +org.yaml snakeyaml bundle s/1\..*/2.x/ * * +org.yaml snakeyaml s/jar/bundle/ s/1\..*/2.x/ * * s/ant/org.apache.ant/ * * s/.*/debian/ * * ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ version_java.patch remove-guava-dependency-pr1086.patch +snakeyaml2.patch ===================================== debian/patches/snakeyaml2.patch ===================================== @@ -0,0 +1,25 @@ +Description: constructing Constructor with default LoaderOptions to comply + with the interface of snakeyaml 2.x +Author: Pierre Gruet <[email protected]> +Forwarded: no +Last-Update: 2025-10-10 + +--- a/src/main/java/org/testng/internal/Yaml.java ++++ b/src/main/java/org/testng/internal/Yaml.java +@@ -5,6 +5,7 @@ + import org.testng.xml.XmlPackage; + import org.testng.xml.XmlSuite; + import org.testng.xml.XmlTest; ++import org.yaml.snakeyaml.LoaderOptions; + import org.yaml.snakeyaml.TypeDescription; + import org.yaml.snakeyaml.constructor.Constructor; + import org.yaml.snakeyaml.nodes.Node; +@@ -261,7 +262,7 @@ + + private static class TestNGConstructor extends Constructor { + public TestNGConstructor(Class<? extends Object> theRoot) { +- super(theRoot); ++ super(theRoot, new LoaderOptions()); + yamlClassConstructors.put(NodeId.scalar, new ConstructParallelMode()); + } + ===================================== debian/watch ===================================== @@ -1,4 +1,6 @@ -version=3 -opts=dversionmangle=s/(\d)[\+\.](?:dfsg|debian|ds)\.?\d*$/$1/ \ -https://github.com/cbeust/testng/tags \ -.*/archive/(\d\S*)\.tar\.gz debian jh_repack +Version: 5 + +Source: https://github.com/cbeust/testng/tags +Matching-Pattern: .*/archive/(\d\S*)\.tar\.gz +Dversionmangle: s/(\d)[\+\.](?:dfsg|debian|ds)\.?\d*$/$1/ +Update-Script: jh_repack View it on GitLab: https://salsa.debian.org/java-team/testng/-/compare/74c20f27274893d72840dd74a4585d1bc743703a...26754c037787915c30ba4a4be9eacf3d5f885cdb -- View it on GitLab: https://salsa.debian.org/java-team/testng/-/compare/74c20f27274893d72840dd74a4585d1bc743703a...26754c037787915c30ba4a4be9eacf3d5f885cdb You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
