[Git][java-team/tiles-request][master] 6 commits: Fixed the build failure with Velocity 2.x

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tiles-request


Commits:
4fd53151 by Emmanuel Bourg at 2026-11-05T16:08:58+01:00
Fixed the build failure with Velocity 2.x

- - - - -
8a96e688 by Emmanuel Bourg at 2026-11-05T16:09:39+01:00
Standards-Version updated to 4.7.4

- - - - -
a544dc0e by Emmanuel Bourg at 2026-11-05T16:09:39+01:00
Removed the Priority field

- - - - -
7a34c8ad by Emmanuel Bourg at 2026-11-05T16:09:39+01:00
Removed the Rules-Requires-Root field

- - - - -
bb2b9def by Emmanuel Bourg at 2026-11-05T16:09:39+01:00
Converted debian/watch to the version 5 format

- - - - -
906a633b by Emmanuel Bourg at 2026-11-05T16:09:39+01:00
Upload to unstable

- - - - -


5 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+tiles-request (1.0.7-3) unstable; urgency=medium
+
+  * Fixed the build failure with Velocity 2.x
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Removed the Rules-Requires-Root field
+  * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 05 Nov 2026 16:09:39 +0100
+
 tiles-request (1.0.7-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: tiles-request
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
@@ -16,11 +15,10 @@ Build-Depends:
  libvelocity-tools-java,
  maven-debian-helper (>= 2.0),
  velocity
-Standards-Version: 4.6.0
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/tiles-request.git
 Vcs-Browser: https://salsa.debian.org/java-team/tiles-request
 Homepage: https://tiles.apache.org/tiles-request/
-Rules-Requires-Root: no
 
 Package: libtiles-request-java
 Architecture: all


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+velocity-2.patch


=====================================
debian/patches/velocity-2.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Fix the compilation with Velocity 2.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java
++++ b/tiles-request-velocity/src/main/java/org/apache/tiles/request/velocity/VelocityScopeMap.java
+@@ -53,7 +53,7 @@
+ 
+     @Override
+     public Object remove(Object key) {
+-        return request.remove(key);
++        return request.remove((String) key);
+     }
+ 
+     @Override
+@@ -63,7 +63,7 @@
+ 
+     /** {@inheritDoc} */
+     public boolean containsKey(Object key) {
+-        return request.containsKey(key);
++        return request.containsKey((String) key);
+     }
+ 
+ 


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=3
-opts="uversionmangle=s/-(alpha|beta|rc)(-)?/~$1$2/" \
-  http://svn.apache.org/repos/asf/tiles/request/tags/ \
-  tiles-request-(\d.*)/ debian debian/orig-tar.sh
+Version: 5
+Mode: svn
+Source: https://svn.apache.org/repos/asf/tiles/request/tags/
+Matching-Pattern: tiles-request-([\d.]+)/
+Compression: xz



View it on GitLab: https://salsa.debian.org/java-team/tiles-request/-/compare/40d70c3144d0b737587a8a0977f5bf7a8df6453a...906a633b5065a591a0981af99bd1ed06da5af796

-- 
View it on GitLab: https://salsa.debian.org/java-team/tiles-request/-/compare/40d70c3144d0b737587a8a0977f5bf7a8df6453a...906a633b5065a591a0981af99bd1ed06da5af796
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/e40fe720/attachment.htm>