Source: jtreg7 Version: 7.5.2+1+ds1-2 Severity: important Tags: ftbfs patch User: [email protected] Usertags: ftbfs-snakeyaml2
Dear Maintainer, jtreg7 7.5.2+1+ds1-2 FTBFS against snakeyaml/2.5+ds-1 currently in experimental. I solved this with the enclosed patch.I am planning to upload snakeyaml/2.5+ds-2 to unstable on the 27th of October or a bit later.
Best regards, -- Pierre
diff -Nru jtreg7-7.5.2+1+ds1/debian/changelog jtreg7-7.5.2+1+ds1/debian/changelog --- jtreg7-7.5.2+1+ds1/debian/changelog 2025-08-20 22:17:51.000000000 +0200 +++ jtreg7-7.5.2+1+ds1/debian/changelog 2025-10-10 07:00:23.000000000 +0200 @@ -1,3 +1,9 @@ +jtreg7 (7.5.2+1+ds1-3) UNRELEASED; urgency=medium + + * Building against snakeyaml 2.x + + -- Pierre Gruet <[email protected]> Fri, 10 Oct 2025 07:00:23 +0200 + jtreg7 (7.5.2+1+ds1-2) unstable; urgency=medium * d/copyright: revert FSF address change. diff -Nru jtreg7-7.5.2+1+ds1/debian/control jtreg7-7.5.2+1+ds1/debian/control --- jtreg7-7.5.2+1+ds1/debian/control 2025-08-20 22:17:51.000000000 +0200 +++ jtreg7-7.5.2+1+ds1/debian/control 2025-10-10 07:00:23.000000000 +0200 @@ -34,7 +34,7 @@ libmaven-shade-plugin-java, libassertj-core-java, libjtharness-java (>= 6.0), - libyaml-snake-java, + libyaml-snake-java (>= 2.5+ds), libfindbugs-java, libbsh-java, libasm-java, diff -Nru jtreg7-7.5.2+1+ds1/debian/patches/series jtreg7-7.5.2+1+ds1/debian/patches/series --- jtreg7-7.5.2+1+ds1/debian/patches/series 2025-08-20 22:17:51.000000000 +0200 +++ jtreg7-7.5.2+1+ds1/debian/patches/series 2025-10-10 06:59:25.000000000 +0200 @@ -28,3 +28,4 @@ java21-codetools-7903646.patch preview-test.patch flush-alarm.patch +snakeyaml2.patch diff -Nru jtreg7-7.5.2+1+ds1/debian/patches/snakeyaml2.patch jtreg7-7.5.2+1+ds1/debian/patches/snakeyaml2.patch --- jtreg7-7.5.2+1+ds1/debian/patches/snakeyaml2.patch 1970-01-01 01:00:00.000000000 +0100 +++ jtreg7-7.5.2+1+ds1/debian/patches/snakeyaml2.patch 2025-10-10 07:00:23.000000000 +0200 @@ -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-08 + +--- a/testng/testng-core/src/main/java/org/testng/internal/Yaml.java ++++ b/testng/testng-core/src/main/java/org/testng/internal/Yaml.java +@@ -16,6 +16,7 @@ + import org.testng.xml.XmlScript; + 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.MappingNode; +@@ -301,7 +302,7 @@ + private static class TestNGConstructor extends Constructor { + + public TestNGConstructor(Class<?> theRoot) { +- super(theRoot); ++ super(theRoot, new LoaderOptions()); + yamlClassConstructors.put(NodeId.scalar, new ConstructParallelMode()); + yamlClassConstructors.put(NodeId.mapping, new ConstructXmlScript()); + } diff -Nru jtreg7-7.5.2+1+ds1/debian/testng/maven.rules jtreg7-7.5.2+1+ds1/debian/testng/maven.rules --- jtreg7-7.5.2+1+ds1/debian/testng/maven.rules 2025-08-20 22:17:51.000000000 +0200 +++ jtreg7-7.5.2+1+ds1/debian/testng/maven.rules 2025-10-10 07:00:04.000000000 +0200 @@ -1,7 +1,7 @@ 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/ * * org.assertj assertj-core jar s/.*/debian/ * *
OpenPGP_signature.asc
Description: OpenPGP digital signature
