[Git][java-team/jruby-maven-plugins][master] 6 commits: Rewriting d/watch with version 5, syntax changes

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / jruby-maven-plugins


Commits:
d1a68338 by Pierre Gruet at 2025-10-28T11:16:57+01:00
Rewriting d/watch with version 5, syntax changes

- - - - -
fe1b753a by Pierre Gruet at 2025-10-28T11:17:11+01:00
Raising Standards version to 4.7.2 (no change)

- - - - -
a5de3357 by Pierre Gruet at 2025-10-28T11:17:33+01:00
Removing unnecessary versioned B-D

- - - - -
6b22cb76 by Pierre Gruet at 2025-10-28T11:24:19+01:00
Building against snakeyaml2.x

- - - - -
79e5126e by Pierre Gruet at 2025-10-28T11:24:24+01:00
Updating changelog

- - - - -
aca94794 by Pierre Gruet at 2025-10-28T11:24:40+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,13 @@
+jruby-maven-plugins (3.0.1-3) unstable; urgency=medium
+
+  * Team upload
+  * Building against snakeyaml 2.x (Closes: #1117947)
+  * Raising Standards version to 4.7.2 (no change)
+  * Rewriting d/watch with version 5, syntax changes
+  * Removing unnecessary versioned B-D
+
+ -- Pierre Gruet <pgt at debian.org>  Tue, 28 Oct 2025 11:24:28 +0100
+
 jruby-maven-plugins (3.0.1-2) unstable; urgency=medium
 
   * d/copyright: update source url


=====================================
debian/control
=====================================
@@ -8,15 +8,15 @@ Uploaders:
 Build-Depends:
  debhelper-compat (= 13),
  default-jdk-headless,
- jruby (>= 9.3.9.0),
+ jruby,
  libbuild-helper-maven-plugin-java,
  libmaven-install-plugin-java,
  libmaven-source-plugin-java,
- libplexus-archiver-java (>= 3.5),
- libyaml-snake-java,
- maven-debian-helper (>= 2.0~),
- maven-repo-helper (>= 1.5),
-Standards-Version: 4.6.2
+ libplexus-archiver-java,
+ libyaml-snake-java (>= 2.5+ds),
+ maven-debian-helper,
+ maven-repo-helper,
+Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/java-team/jruby-maven-plugins.git
 Vcs-Browser: https://salsa.debian.org/java-team/jruby-maven-plugins
 Homepage: https://github.com/jruby/jruby-maven-plugins


=====================================
debian/maven.rules
=====================================
@@ -22,7 +22,7 @@ org.apache.maven maven-artifact jar s/.*/3.x/ * *
 org.apache.maven maven-core jar s/.*/3.x/ * *
 org.apache.maven maven-model jar s/.*/3.x/ * *
 org.apache.maven maven-plugin-api jar s/.*/3.x/ * *
-org.yaml snakeyaml jar s/.*/1.x/ * *
+org.yaml snakeyaml jar s/.*/2.x/ * *
 junit junit jar s/4\..*/4.x/ * *
 org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
 org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 disable-rubygems-repo.diff
 fix-assertion.patch
 fix-jruby-execution.patch
+snakeyaml2.patch


=====================================
debian/patches/snakeyaml2.patch
=====================================
@@ -0,0 +1,42 @@
+Description: constructing Constructor and Representer derivatives with default
+ LoaderOptions and DumperOptions to comply with the interface of snakeyaml 2.x
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2025-10-12
+
+--- a/ruby-tools/src/main/java/de/saumya/mojo/gems/spec/yaml/MappingConstructor.java
++++ b/ruby-tools/src/main/java/de/saumya/mojo/gems/spec/yaml/MappingConstructor.java
+@@ -1,5 +1,6 @@
+ package de.saumya.mojo.gems.spec.yaml;
+ 
++import org.yaml.snakeyaml.LoaderOptions;
+ import org.yaml.snakeyaml.TypeDescription;
+ import org.yaml.snakeyaml.constructor.Constructor;
+ import org.yaml.snakeyaml.nodes.Tag;
+@@ -16,7 +17,7 @@
+  */
+ public class MappingConstructor extends Constructor {
+     public MappingConstructor() {
+-        super();
++        super(new LoaderOptions());
+ 
+         this.addTypeDescription(new TypeDescription(GemSpecification.class,
+                 new Tag("!ruby/object:Gem::Specification")));
+--- a/ruby-tools/src/main/java/de/saumya/mojo/gems/spec/yaml/MappingRepresenter.java
++++ b/ruby-tools/src/main/java/de/saumya/mojo/gems/spec/yaml/MappingRepresenter.java
+@@ -1,5 +1,6 @@
+ package de.saumya.mojo.gems.spec.yaml;
+ 
++import org.yaml.snakeyaml.DumperOptions;
+ import org.yaml.snakeyaml.nodes.Node;
+ import org.yaml.snakeyaml.nodes.Tag;
+ import org.yaml.snakeyaml.representer.Represent;
+@@ -17,7 +18,7 @@
+  */
+ public class MappingRepresenter extends Representer {
+     public MappingRepresenter() {
+-        super();
++        super(new DumperOptions());
+ 
+         this.nullRepresenter = new RepresentNull();
+ 


=====================================
debian/watch
=====================================
@@ -1,3 +1,6 @@
-version=4
-opts=repack,compression=xz \
-https://github.com/jruby/jruby-maven-plugins/tags .*/jruby-maven-plugins- at ANY_VERSION@.tar.gz
+Version: 5
+
+Source: https://github.com/jruby/jruby-maven-plugins/tags
+Matching-Pattern: .*/jruby-maven-plugins- at ANY_VERSION@.tar.gz
+Compression: xz
+Repack: yes



View it on GitLab: https://salsa.debian.org/java-team/jruby-maven-plugins/-/compare/61306527efdeb16526173b725d53fd8bddcf41a5...aca94794c040961b07a252781e770babf804d5d3

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby-maven-plugins/-/compare/61306527efdeb16526173b725d53fd8bddcf41a5...aca94794c040961b07a252781e770babf804d5d3
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/d8907ae0/attachment.htm>