[Git][java-team/jruby-maven-plugins][master] 6 commits: Fixed the compatibility with plexus-velocity 2.x

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jruby-maven-plugins


Commits:
c4fc938f by Emmanuel Bourg at 2026-11-05T17:53:58+01:00
Fixed the compatibility with plexus-velocity 2.x

- - - - -
3ef1822f by Emmanuel Bourg at 2026-11-05T17:53:58+01:00
Standards-Version updated to 4.7.4

- - - - -
051dc4d0 by Emmanuel Bourg at 2026-11-05T17:53:58+01:00
Removed the Priority field

- - - - -
4d1e17b2 by Emmanuel Bourg at 2026-11-05T17:53:58+01:00
Removed the Rules-Requires-Root field

- - - - -
5042d268 by Emmanuel Bourg at 2026-11-05T17:53:59+01:00
Removed the blank line in debian/watch

- - - - -
8290384f by Emmanuel Bourg at 2026-11-05T17:53:59+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/plexus-velocity-2.patch
- debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+jruby-maven-plugins (3.0.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the compatibility with plexus-velocity 2.x
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Removed the Rules-Requires-Root field
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Nov 2026 17:53:59 +0100
+
 jruby-maven-plugins (3.0.1-3) unstable; urgency=medium
 
   * Team upload


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: jruby-maven-plugins
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Miguel Landaeta <nomadium at debian.org>,
@@ -16,11 +15,10 @@ Build-Depends:
  libyaml-snake-java (>= 2.5+ds),
  maven-debian-helper,
  maven-repo-helper,
-Standards-Version: 4.7.2
+Standards-Version: 4.7.4
 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
-Rules-Requires-Root: no
 
 Package: libjruby-maven-plugin-java
 Architecture: all


=====================================
debian/patches/plexus-velocity-2.patch
=====================================
@@ -0,0 +1,38 @@
+Description: Remove the declaration of the Velocity component,
+ plexus-velocity 2.x provides it through its Sisu index
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/ruby-tools/src/main/resources/META-INF/plexus/components.xml
++++ b/ruby-tools/src/main/resources/META-INF/plexus/components.xml
+@@ -95,31 +95,5 @@
+ 	</requirement>
+       </requirements>
+     </component>
+-    <component>
+-      <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+-      <implementation>
+-	org.codehaus.plexus.velocity.DefaultVelocityComponent
+-      </implementation>
+-      <configuration>
+-	<properties>
+-	  <property>
+-	    <name>runtime.log.logsystem.class</name>
+-	    <value>org.codehaus.plexus.velocity.Log4JLoggingSystem</value>
+-	  </property>
+-	  <property>
+-	    <name>runtime.log.logsystem.log4j.category</name>
+-	    <value>org.codehaus.plexus.velocity.DefaultVelocityComponent</value>
+-	  </property>
+-	  <property>
+-	    <name>resource.loader</name>
+-	    <value>classpath</value>
+-	  </property>
+-	  <property>
+-	    <name>classpath.resource.loader.class</name>
+-	    <value>org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader</value>
+-	  </property>
+-	</properties>
+-      </configuration>
+-    </component>
+   </components>
+ </component-set>


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


=====================================
debian/watch
=====================================
@@ -1,5 +1,4 @@
 Version: 5
-
 Source: https://github.com/jruby/jruby-maven-plugins/tags
 Matching-Pattern: .*/jruby-maven-plugins- at ANY_VERSION@.tar.gz
 Compression: xz



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

-- 
View it on GitLab: https://salsa.debian.org/java-team/jruby-maven-plugins/-/compare/aca94794c040961b07a252781e770babf804d5d3...8290384f135dd7847f9802717c4375afa6af32a0
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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