Pierre Gruet pushed to branch master at Debian Java Maintainers / resteasy
Commits: 25855aab by Pierre Gruet at 2025-10-28T18:32:45+01:00 Building against snakeyaml 2.x - - - - - dfddcda0 by Pierre Gruet at 2025-10-28T18:33:40+01:00 Rewriting d/watch with version 5, syntax changes - - - - - 184f6072 by Pierre Gruet at 2025-10-28T18:34:06+01:00 Raising Standards version to 4.7.2 (no change) - - - - - cd9829a2 by Pierre Gruet at 2025-10-28T18:34:48+01:00 Removing unneeded versioned B-D - - - - - 8ad37e58 by Pierre Gruet at 2025-10-28T18:35:29+01:00 B-D on debhelper-compat 13, dropping old d/compat file - - - - - 8a4c7f0b by Pierre Gruet at 2025-10-28T18:36:58+01:00 Updating changelog - - - - - 3f2f9897 by Pierre Gruet at 2025-10-28T18:41:19+01:00 Upload to unstable - - - - - 7 changed files: - debian/changelog - − debian/compat - debian/control - debian/maven.rules - debian/patches/series - + debian/patches/snakeyaml2.patch - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +resteasy (3.6.2-4) unstable; urgency=medium + + * Team upload. + * Building against snakeyaml 2.x (Closes: #1117945) + * Raising Standards version to 4.7.2 (no change) + * B-D on debhelper-compat 13, dropping old d/compat file + * Removing unneeded versioned B-D + * Rewriting d/watch with version 5, syntax changes + + -- Pierre Gruet <[email protected]> Tue, 28 Oct 2025 18:41:11 +0100 + resteasy (3.6.2-3) unstable; urgency=medium * Team upload. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -10 ===================================== debian/control ===================================== @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Timo Aaltonen <[email protected]> Build-Depends: - debhelper (>= 10), + debhelper-compat (= 13), default-jdk, javahelper, junit4, @@ -21,15 +21,15 @@ Build-Depends: libjboss-logging-tools-java, libjettison-java, libjsonp-java, - liblog4j1.2-java (>= 1.2.17), + liblog4j1.2-java, libmaven-install-plugin-java, libreactive-streams-java, libscannotation-java, libservlet-api-java, libslf4j-java, - libyaml-snake-java, - maven-debian-helper (>= 1.5) -Standards-Version: 4.7.0 + libyaml-snake-java (>= 2.5+ds), + maven-debian-helper +Standards-Version: 4.7.2 Vcs-Git: https://salsa.debian.org/java-team/resteasy.git Vcs-Browser: https://salsa.debian.org/java-team/resteasy Homepage: http://rest-easy.org ===================================== debian/maven.rules ===================================== @@ -5,7 +5,7 @@ com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * * com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * * junit junit jar s/.*/4.x/ * * org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * * -org.yaml snakeyaml * s/.*/1.x/ * * +org.yaml snakeyaml * s/.*/2.x/ * * com.sun.istack istack-commons-runtime * s/debian/2.17/ * * s/jboss/javassist/ javassist * s/.*/debian/ * * log4j log4j * s/.*/1.2.x/ * * ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 01-ignore-tjws.patch jaxb-api-compatibility.diff +snakeyaml2.patch ===================================== debian/patches/snakeyaml2.patch ===================================== @@ -0,0 +1,25 @@ +Description: constructing CustomClassLoaderConstructor 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/providers/yaml/src/main/java/org/jboss/resteasy/plugins/providers/YamlProvider.java ++++ b/providers/yaml/src/main/java/org/jboss/resteasy/plugins/providers/YamlProvider.java +@@ -5,6 +5,7 @@ + import org.jboss.resteasy.plugins.providers.yaml.i18n.Messages; + import org.jboss.resteasy.spi.ReaderException; + import org.jboss.resteasy.spi.WriterException; ++import org.yaml.snakeyaml.LoaderOptions; + import org.yaml.snakeyaml.Yaml; + import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor; + +@@ -54,7 +55,7 @@ + if (isValidInternalType(type)) { + return new Yaml().load(entityStream); + } else { +- CustomClassLoaderConstructor customClassLoaderConstructor = new CustomClassLoaderConstructor(type.getClassLoader()); ++ CustomClassLoaderConstructor customClassLoaderConstructor = new CustomClassLoaderConstructor(type.getClassLoader(), new LoaderOptions()); + return new Yaml(customClassLoaderConstructor).loadAs(entityStream, type); + } + } catch (Exception e) { ===================================== debian/watch ===================================== @@ -1,3 +1,5 @@ +Version: 5 + #git=git://github.com/resteasy/Resteasy.git -version=3 -https://github.com/resteasy/Resteasy/tags/ .*/(\d[\d\.]*)(?:\.Final)?\.tar\.gz +Source: https://github.com/resteasy/Resteasy/tags/ +Matching-Pattern: .*/(\d[\d\.]*)(?:\.Final)?\.tar\.gz View it on GitLab: https://salsa.debian.org/java-team/resteasy/-/compare/58c90ee76aa111936bbff0d8779a45fe6975ef82...3f2f989754f1ecf84f95cfd5a30ba67ecd38ea3f -- View it on GitLab: https://salsa.debian.org/java-team/resteasy/-/compare/58c90ee76aa111936bbff0d8779a45fe6975ef82...3f2f989754f1ecf84f95cfd5a30ba67ecd38ea3f 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
