[Git][java-team/jline3][master] 4 commits: Fix the arch-only build: run Maven in the indep build only

[Simon Quigley (@tsimonq2)]

Simon Quigley pushed to branch master at Debian Java Maintainers / jline3


Commits:
f7e347ac by Juan Manuel Méndez Rey at 2026-11-05T03:41:52+01:00
Fix the arch-only build: run Maven in the indep build only

maven-debian-helper patches the poms of the first package dh hands it. In an
arch-only build that is libjline3-jni, which has no .poms file, so the poms
stay unpatched and Maven asks for maven-enforcer-plugin. The arch build only
needs the JNI library, which is built with cc.

Closes: #1153045

- - - - -
d471cd45 by Juan Manuel Méndez Rey at 2026-11-05T03:44:32+01:00
d/copyright: Levenshtein.java is adapted from Kevin L. Stern's code

35 of its 49 code lines and 28 doc comment lines are identical to
DamerauLevenshteinAlgorithm.java of
https://github.com/KevinStern/software-and-algorithms (MIT, 2012), and the
file keeps @author Kevin L. Stern.

- - - - -
8d934a83 by Juan Manuel Méndez Rey at 2026-11-05T03:52:19+01:00
d/maven.rules: drop the rules that only map the version to debian

That is the default rule of maven-repo-helper (TO_DEBIAN_VERSION_RULE).

- - - - -
97d8a347 by Juan Manuel Méndez Rey at 2026-11-05T04:14:07+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- debian/maven.rules
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jline3 (3.29.0+ds-3) unstable; urgency=medium
+
+  * Fix the arch-only build: run Maven in the indep build only, the arch
+    build only needs the JNI library (Closes: #1153045).
+  * d/copyright: Levenshtein.java is adapted from Kevin L. Stern's code
+    (Expat).
+  * d/maven.rules: drop the rules that only map the version to debian,
+    the default.
+
+ -- Juan Manuel Méndez Rey <juan.mendezr at proton.me>  Thu, 05 Nov 2026 04:14:07 +0100
+
 jline3 (3.29.0+ds-2) unstable; urgency=medium
 
   * Add myself to Uploaders.


=====================================
debian/copyright
=====================================
@@ -133,6 +133,14 @@ Comment:
  Adapted from java/io/InputStreamReader.java of Apache Harmony
  (Apache-2.0, ASF header), as its javadoc says.
 
+Files: terminal/src/main/java/org/jline/utils/Levenshtein.java
+Copyright: 2002-2016, the original author(s)
+           2012, Kevin L. Stern
+License: BSD-3-clause and Expat
+Comment:
+ Adapted from DamerauLevenshteinAlgorithm.java in Kevin L. Stern's
+ software-and-algorithms (MIT), the @author of the file.
+
 Files: terminal/src/main/java/org/jline/utils/WCWidth.java
 Copyright: 2002-2016, the original author(s)
            2007, Markus Kuhn


=====================================
debian/maven.rules
=====================================
@@ -1,7 +1,2 @@
 junit junit jar s/4\..*/4.x/ * *
-org.junit.jupiter * jar s/.*/debian/ * *
-org.easymock * jar s/.*/debian/ * *
-org.fusesource.jansi jansi jar s/.*/debian/ * *
-org.apache.sshd * jar s/.*/debian/ * *
-net.java.dev.jna jna jar s/.*/debian/ * *
 com.google.code.findbugs jsr305 jar s/.*/0.x/ * *


=====================================
debian/rules
=====================================
@@ -25,10 +25,15 @@ execute_before_dh_auto_build:
 # shades console/remote-ssh/remote-telnet/jansi-core, so they must build.
 JLINE_MODULES = native,terminal,terminal-ffm,terminal-jansi,terminal-jna,terminal-jni,reader,builtins,console,console-ui,remote-ssh,remote-telnet,style,jansi-core,jline
 
-override_dh_auto_build:
+# maven-debian-helper patches the poms listed for the first package it acts
+# on, which in an arch-only build is libjline3-jni, with no .poms file. That
+# build only needs the JNI library, so Maven runs in the indep build only.
+override_dh_auto_configure-arch override_dh_auto_build-arch override_dh_auto_test-arch:
+
+override_dh_auto_build-indep:
 	dh_auto_build -- -pl $(JLINE_MODULES) -am package
 
-override_dh_auto_test:
+override_dh_auto_test-indep:
 	# The loader needs the library we just built; /usr/lib/*/jni only holds
 	# it once the package is installed, and the pom overrides argLine.
 	# FfmTest needs a real pty, and JansiTerminalProviderTest needs the
@@ -37,9 +42,10 @@ override_dh_auto_test:
 	  -Dsurefire.failIfNoSpecifiedTests=false \
 	  -Dtest='!FfmTest,!JansiTerminalProviderTest#testIsSystemStream'
 
-override_dh_auto_install:
+override_dh_auto_install-indep:
 	dh_auto_install
-	# Install the JNI native library to the standard Debian JNI location.
+
+override_dh_auto_install-arch:
 	install -D -m644 debian/$(NATIVE_LIB) \
 	  debian/libjline3-jni/usr/lib/$(DEB_HOST_MULTIARCH)/jni/$(NATIVE_LIB)
 



View it on GitLab: https://salsa.debian.org/java-team/jline3/-/compare/2917d3d495633c43e3e92b599802e9d838f0fdb3...97d8a347ee535a2406423e53436fe1b8995f300d

-- 
View it on GitLab: https://salsa.debian.org/java-team/jline3/-/compare/2917d3d495633c43e3e92b599802e9d838f0fdb3...97d8a347ee535a2406423e53436fe1b8995f300d
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/2d2dd3e7/attachment.htm>