[Git][java-team/jackson-dataformat-yaml][master] 5 commits: Raising Standards version to 4.7.2 (no change)

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / jackson-dataformat-yaml


Commits:
86e907e1 by Pierre Gruet at 2025-10-28T12:19:40+01:00
Raising Standards version to 4.7.2 (no change)

- - - - -
0b6b9a98 by Pierre Gruet at 2025-10-28T12:20:33+01:00
Rewriting d/watch with version 5, syntax changes

- - - - -
873e7571 by Pierre Gruet at 2025-10-28T12:35:08+01:00
Building against snakeyaml 2.x

- - - - -
7d812b16 by Pierre Gruet at 2025-10-28T12:35:16+01:00
Updating changelog

- - - - -
d741c2b2 by Pierre Gruet at 2025-10-28T12:35:29+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,12 @@
+jackson-dataformat-yaml (2.8.11-5) unstable; urgency=medium
+
+  * Team upload
+  * Building against snakeyaml 2.x (Closes: #1117948)
+  * Raising Standards version to 4.7.2 (no change)
+  * Rewriting d/watch with version 5, syntax changes
+
+ -- Pierre Gruet <pgt at debian.org>  Tue, 28 Oct 2025 12:35:19 +0100
+
 jackson-dataformat-yaml (2.8.11-4) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -16,10 +16,10 @@ Build-Depends:
  libmaven-enforcer-plugin-java,
  libmaven-shade-plugin-java,
  libreplacer-java,
- libyaml-snake-java,
+ libyaml-snake-java (>= 2.5+ds),
  maven-debian-helper,
  xmlstarlet
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/java-team/jackson-dataformat-yaml.git
 Vcs-Browser: https://salsa.debian.org/java-team/jackson-dataformat-yaml
 Homepage: https://github.com/FasterXML/jackson-dataformat-yaml


=====================================
debian/maven.rules
=====================================
@@ -7,6 +7,6 @@ com.fasterxml.jackson.core jackson-databind bundle s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/.*/2.x/ * *
 com.fasterxml.jackson.dataformat jackson-dataformat-yaml * s/.*/2.x/ * *
 junit junit jar s/.*/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/ * *
 com.fasterxml.jackson jackson-parent pom s/2.8/debian/ * *


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 0002-depend-on-junit.patch
 0003-ignore-integration-tests.patch
 snakeyaml-1.20.patch
+snakeyaml2.patch


=====================================
debian/patches/snakeyaml2.patch
=====================================
@@ -0,0 +1,32 @@
+Description: using ScannerImpl to provide ParserImpl with StreamReader after
+ changes in  the interface of snakeyaml
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2025-10-12
+
+--- a/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java
++++ b/src/main/java/com/fasterxml/jackson/dataformat/yaml/YAMLParser.java
+@@ -5,12 +5,14 @@
+ import java.math.BigInteger;
+ import java.util.regex.Pattern;
+ 
++import org.yaml.snakeyaml.LoaderOptions;
+ import org.yaml.snakeyaml.error.Mark;
+ import org.yaml.snakeyaml.events.*;
+ import org.yaml.snakeyaml.nodes.NodeId;
+ import org.yaml.snakeyaml.nodes.Tag;
+ import org.yaml.snakeyaml.parser.ParserImpl;
+ import org.yaml.snakeyaml.reader.StreamReader;
++import org.yaml.snakeyaml.scanner.ScannerImpl;
+ 
+ import com.fasterxml.jackson.core.*;
+ import com.fasterxml.jackson.core.base.ParserBase;
+@@ -149,7 +151,7 @@
+         _objectCodec = codec;
+         _formatFeatures = formatFeatures;
+         _reader = reader;
+-        _yamlParser = new ParserImpl(new StreamReader(reader));
++        _yamlParser = new ParserImpl(new ScannerImpl(new StreamReader(reader), new LoaderOptions()));
+     }
+ 
+ 


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
+Version: 5
 
-opts="filenamemangle=s%.*/jackson-dataformat-yaml-(\d[\d.]*@ARCHIVE_EXT@)%@PACKAGE at -$1%" \
- https://github.com/FasterXML/jackson-dataformat-yaml/tags .*/jackson-dataformat-yaml-(\d[\d\.]*)\.tar\.gz
+Source: https://github.com/FasterXML/jackson-dataformat-yaml/tags
+Matching-Pattern: .*/jackson-dataformat-yaml-(\d[\d\.]*)\.tar\.gz
+Filenamemangle: s%.*/jackson-dataformat-yaml-(\d[\d.]*@ARCHIVE_EXT@)%@PACKAGE at -$1%



View it on GitLab: https://salsa.debian.org/java-team/jackson-dataformat-yaml/-/compare/8ac6aa6bf9f8bc0700818dc1dc0c7360165a30e8...d741c2b2de377116cddeeed7d252537fdd58326f

-- 
View it on GitLab: https://salsa.debian.org/java-team/jackson-dataformat-yaml/-/compare/8ac6aa6bf9f8bc0700818dc1dc0c7360165a30e8...d741c2b2de377116cddeeed7d252537fdd58326f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20251028/2247af09/attachment.htm>