Tony Mancill pushed to branch master at Debian Java Maintainers / maven
Commits: c6751aed by tony mancill at 2024-01-07T21:11:45-08:00 Set -Djansi.mode to work with Debian jansi (see: #1039607) - - - - - 4501966b by tony mancill at 2024-01-07T21:16:11-08:00 Prepare changelog for upload to experimental - - - - - b6f107c2 by tony mancill at 2024-02-11T22:15:08-08:00 Prepare changelog for upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/03_jansi_behavior.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,21 @@ +maven (3.8.7-2) unstable; urgency=medium + + * Team upload to unstable + + -- tony mancill <tmanc...@debian.org> Sun, 11 Feb 2024 22:14:29 -0800 + +maven (3.8.7-2~exp1) experimental; urgency=medium + + * Team upload to experimental + * Patch mvn script to work around failure of Debian jansi to detect a + TTY when -Djansi.mode=default and thus behave more like upstream. + By default, -Djansi.mode=force so output is colorized. When -B or + --batch-mode is specified, the property is set to jansi.mode=strip. + This behavior can be overridden by setting MAVEN_JANSI_PROPERTY. + See Debian bug #1039607. + + -- tony mancill <tmanc...@debian.org> Sun, 07 Jan 2024 18:47:04 -0800 + maven (3.8.7-1) unstable; urgency=medium * New upstream release ===================================== debian/patches/03_jansi_behavior.patch ===================================== @@ -0,0 +1,32 @@ +Description: set -Djansi.mode=force unless --batch-mode/-B is specified. + This enables colorized output for Debian versions of jansi > 2.4.0-2. + This behavior can be overridden by setting MAVEN_JANSI_PROPERTY="", + or to any other valid jansi.mode property value. +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1039607 +Author: tony mancill <tmanc...@debian.org> +Forwarded: not-needed + +--- a/apache-maven/src/bin/mvn ++++ b/apache-maven/src/bin/mvn +@@ -174,8 +174,20 @@ + fi + } + ++jansi_mode_property() { ++ jansi_mode="-Djansi.mode=force" ++ for arg in "$@"; do ++ if [ "${arg}" = "--batch-mode" ] || [ "${arg}" = "-B" ]; then ++ jansi_mode="-Djansi.mode=strip" ++ break ++ fi ++ done ++ echo ${jansi_mode} ++} ++MAVEN_JANSI_PROPERTY="${MAVEN_JANSI_PROPERTY-$(jansi_mode_property "$@")}" ++ + MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir "$@"`}" +-MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS" ++MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS $MAVEN_JANSI_PROPERTY" + + # For Cygwin, switch project base directory path to Windows format before + # executing Maven otherwise this will cause Maven not to consider it. ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ reproducible-build-timestamp.patch slf4j-compatibility.patch +03_jansi_behavior.patch View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/f9ea6cc7d58a688dd4d757a9106c69f7e97a962a...b6f107c27679c249a519be11ee2eaf55fec2b806 -- View it on GitLab: https://salsa.debian.org/java-team/maven/-/compare/f9ea6cc7d58a688dd4d757a9106c69f7e97a962a...b6f107c27679c249a519be11ee2eaf55fec2b806 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits