Diff of the two buildlogs: -- --- b1/build.log 2023-06-07 23:11:04.199763588 +0000 +++ b2/build.log 2023-06-07 23:21:11.797178769 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Wed Jun 7 10:59:38 -12 2023 -I: pbuilder-time-stamp: 1686178778 +I: Current time: Thu Jun 8 13:11:34 +14 2023 +I: pbuilder-time-stamp: 1686179494 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz] I: copying local configuration @@ -16,7 +16,7 @@ I: copying [./java-diff-utils_4.9.orig.tar.xz] I: copying [./java-diff-utils_4.9-1.debian.tar.xz] I: Extracting source -gpgv: Signature made Wed Feb 3 11:40:59 2021 -12 +gpgv: Signature made Thu Feb 4 13:40:59 2021 +14 gpgv: using RSA key B8CE4DE21080DCF903E16C40F513C419E4B9D0AC gpgv: issuer "ebourg@apache.org" gpgv: Can't check signature: No public key @@ -26,135 +26,167 @@ dpkg-source: info: unpacking java-diff-utils_4.9-1.debian.tar.xz I: using fakeroot in build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/19899/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/D01_modify_environment starting +debug: Running on virt32b. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Jun 8 13:12 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='bookworm' - HOME='/root' - HOST_ARCH='armhf' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.15(1)-release' + BUILDDIR=/build + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 ' + DIRSTACK=() + DISTRIBUTION=bookworm + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='21fe5564a0d740f7b005c94977d61809' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='19899' - PS1='# ' - PS2='> ' + INVOCATION_ID=f603dba8da394654aa5e486f64427b3a + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=10495 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.h1YYDW44/pbuilderrc_E6L8 --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.h1YYDW44/b1 --logfile b1/build.log java-diff-utils_4.9-1.dsc' - SUDO_GID='113' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.h1YYDW44/pbuilderrc_xwKo --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.h1YYDW44/b2 --logfile b2/build.log --extrapackages usrmerge java-diff-utils_4.9-1.dsc' + SUDO_GID=112 + SUDO_UID=106 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux virt64b 5.10.0-23-arm64 #1 SMP Debian 5.10.179-1 (2023-05-12) aarch64 GNU/Linux + Linux i-capture-the-hostname 5.10.0-23-armmp-lpae #1 SMP Debian 5.10.179-1 (2023-05-12) armv7l GNU/Linux I: ls -l /bin - total 5080 - -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bunzip2 - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzcat - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzcmp -> bzdiff - -rwxr-xr-x 1 root root 2225 Sep 18 2022 bzdiff - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzegrep -> bzgrep - -rwxr-xr-x 1 root root 4893 Nov 27 2021 bzexe - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzfgrep -> bzgrep - -rwxr-xr-x 1 root root 3775 Sep 18 2022 bzgrep - -rwxr-xr-x 3 root root 67144 Sep 18 2022 bzip2 - -rwxr-xr-x 1 root root 67112 Sep 18 2022 bzip2recover - lrwxrwxrwx 1 root root 6 Sep 18 2022 bzless -> bzmore - -rwxr-xr-x 1 root root 1297 Sep 18 2022 bzmore - -rwxr-xr-x 1 root root 67632 Sep 20 2022 cat - -rwxr-xr-x 1 root root 67676 Sep 20 2022 chgrp - -rwxr-xr-x 1 root root 67644 Sep 20 2022 chmod - -rwxr-xr-x 1 root root 67684 Sep 20 2022 chown - -rwxr-xr-x 1 root root 133532 Sep 20 2022 cp - -rwxr-xr-x 1 root root 132868 Jan 5 01:20 dash - -rwxr-xr-x 1 root root 133220 Sep 20 2022 date - -rwxr-xr-x 1 root root 67732 Sep 20 2022 dd - -rwxr-xr-x 1 root root 68104 Sep 20 2022 df - -rwxr-xr-x 1 root root 133632 Sep 20 2022 dir - -rwxr-xr-x 1 root root 59128 Mar 22 21:02 dmesg - lrwxrwxrwx 1 root root 8 Dec 19 01:33 dnsdomainname -> hostname - lrwxrwxrwx 1 root root 8 Dec 19 01:33 domainname -> hostname - -rwxr-xr-x 1 root root 67560 Sep 20 2022 echo - -rwxr-xr-x 1 root root 41 Jan 24 02:43 egrep - -rwxr-xr-x 1 root root 67548 Sep 20 2022 false - -rwxr-xr-x 1 root root 41 Jan 24 02:43 fgrep - -rwxr-xr-x 1 root root 55748 Mar 22 21:02 findmnt - -rwsr-xr-x 1 root root 26208 Mar 22 20:15 fusermount - -rwxr-xr-x 1 root root 128608 Jan 24 02:43 grep - -rwxr-xr-x 2 root root 2346 Apr 9 2022 gunzip - -rwxr-xr-x 1 root root 6447 Apr 9 2022 gzexe - -rwxr-xr-x 1 root root 64220 Apr 9 2022 gzip - -rwxr-xr-x 1 root root 67032 Dec 19 01:33 hostname - -rwxr-xr-x 1 root root 67720 Sep 20 2022 ln - -rwxr-xr-x 1 root root 35132 Mar 22 21:51 login - -rwxr-xr-x 1 root root 133632 Sep 20 2022 ls - -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk - -rwxr-xr-x 1 root root 67800 Sep 20 2022 mkdir - -rwxr-xr-x 1 root root 67764 Sep 20 2022 mknod - -rwxr-xr-x 1 root root 67596 Sep 20 2022 mktemp - -rwxr-xr-x 1 root root 38504 Mar 22 21:02 more - -rwsr-xr-x 1 root root 38496 Mar 22 21:02 mount - -rwxr-xr-x 1 root root 9824 Mar 22 21:02 mountpoint - -rwxr-xr-x 1 root root 133532 Sep 20 2022 mv - lrwxrwxrwx 1 root root 8 Dec 19 01:33 nisdomainname -> hostname - lrwxrwxrwx 1 root root 14 Apr 2 18:25 pidof -> /sbin/killall5 - -rwxr-xr-x 1 root root 67608 Sep 20 2022 pwd - lrwxrwxrwx 1 root root 4 Apr 23 09:24 rbash -> bash - -rwxr-xr-x 1 root root 67600 Sep 20 2022 readlink - -rwxr-xr-x 1 root root 67672 Sep 20 2022 rm - -rwxr-xr-x 1 root root 67600 Sep 20 2022 rmdir - -rwxr-xr-x 1 root root 67400 Nov 2 2022 run-parts - -rwxr-xr-x 1 root root 133372 Jan 5 07:55 sed - lrwxrwxrwx 1 root root 4 Jan 5 01:20 sh -> dash - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sleep - -rwxr-xr-x 1 root root 67644 Sep 20 2022 stty - -rwsr-xr-x 1 root root 50800 Mar 22 21:02 su - -rwxr-xr-x 1 root root 67584 Sep 20 2022 sync - -rwxr-xr-x 1 root root 336764 Apr 6 02:25 tar - -rwxr-xr-x 1 root root 67144 Nov 2 2022 tempfile - -rwxr-xr-x 1 root root 133224 Sep 20 2022 touch - -rwxr-xr-x 1 root root 67548 Sep 20 2022 true - -rwxr-xr-x 1 root root 9768 Mar 22 20:15 ulockmgr_server - -rwsr-xr-x 1 root root 22108 Mar 22 21:02 umount - -rwxr-xr-x 1 root root 67572 Sep 20 2022 uname - -rwxr-xr-x 2 root root 2346 Apr 9 2022 uncompress - -rwxr-xr-x 1 root root 133632 Sep 20 2022 vdir - -rwxr-xr-x 1 root root 42608 Mar 22 21:02 wdctl - lrwxrwxrwx 1 root root 8 Dec 19 01:33 ypdomainname -> hostname - -rwxr-xr-x 1 root root 1984 Apr 9 2022 zcat - -rwxr-xr-x 1 root root 1678 Apr 9 2022 zcmp - -rwxr-xr-x 1 root root 6460 Apr 9 2022 zdiff - -rwxr-xr-x 1 root root 29 Apr 9 2022 zegrep - -rwxr-xr-x 1 root root 29 Apr 9 2022 zfgrep - -rwxr-xr-x 1 root root 2081 Apr 9 2022 zforce - -rwxr-xr-x 1 root root 8103 Apr 9 2022 zgrep - -rwxr-xr-x 1 root root 2206 Apr 9 2022 zless - -rwxr-xr-x 1 root root 1842 Apr 9 2022 zmore - -rwxr-xr-x 1 root root 4577 Apr 9 2022 znew -I: user script /srv/workspace/pbuilder/19899/tmp/hooks/D02_print_environment finished + total 5072 + -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bunzip2 + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzcat + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzcmp -> bzdiff + -rwxr-xr-x 1 root root 2225 Sep 19 2022 bzdiff + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzegrep -> bzgrep + -rwxr-xr-x 1 root root 4893 Nov 28 2021 bzexe + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzfgrep -> bzgrep + -rwxr-xr-x 1 root root 3775 Sep 19 2022 bzgrep + -rwxr-xr-x 3 root root 67144 Sep 19 2022 bzip2 + -rwxr-xr-x 1 root root 67112 Sep 19 2022 bzip2recover + lrwxrwxrwx 1 root root 6 Sep 19 2022 bzless -> bzmore + -rwxr-xr-x 1 root root 1297 Sep 19 2022 bzmore + -rwxr-xr-x 1 root root 67632 Sep 21 2022 cat + -rwxr-xr-x 1 root root 67676 Sep 21 2022 chgrp + -rwxr-xr-x 1 root root 67644 Sep 21 2022 chmod + -rwxr-xr-x 1 root root 67684 Sep 21 2022 chown + -rwxr-xr-x 1 root root 133532 Sep 21 2022 cp + -rwxr-xr-x 1 root root 132868 Jan 6 03:20 dash + -rwxr-xr-x 1 root root 133220 Sep 21 2022 date + -rwxr-xr-x 1 root root 67732 Sep 21 2022 dd + -rwxr-xr-x 1 root root 68104 Sep 21 2022 df + -rwxr-xr-x 1 root root 133632 Sep 21 2022 dir + -rwxr-xr-x 1 root root 59128 Mar 23 23:02 dmesg + lrwxrwxrwx 1 root root 8 Dec 20 03:33 dnsdomainname -> hostname + lrwxrwxrwx 1 root root 8 Dec 20 03:33 domainname -> hostname + -rwxr-xr-x 1 root root 67560 Sep 21 2022 echo + -rwxr-xr-x 1 root root 41 Jan 25 04:43 egrep + -rwxr-xr-x 1 root root 67548 Sep 21 2022 false + -rwxr-xr-x 1 root root 41 Jan 25 04:43 fgrep + -rwxr-xr-x 1 root root 55748 Mar 23 23:02 findmnt + -rwsr-xr-x 1 root root 26208 Mar 23 22:15 fusermount + -rwxr-xr-x 1 root root 128608 Jan 25 04:43 grep + -rwxr-xr-x 2 root root 2346 Apr 10 2022 gunzip + -rwxr-xr-x 1 root root 6447 Apr 10 2022 gzexe + -rwxr-xr-x 1 root root 64220 Apr 10 2022 gzip + -rwxr-xr-x 1 root root 67032 Dec 20 03:33 hostname + -rwxr-xr-x 1 root root 67720 Sep 21 2022 ln + -rwxr-xr-x 1 root root 35132 Mar 23 23:51 login + -rwxr-xr-x 1 root root 133632 Sep 21 2022 ls + -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk + -rwxr-xr-x 1 root root 67800 Sep 21 2022 mkdir + -rwxr-xr-x 1 root root 67764 Sep 21 2022 mknod + -rwxr-xr-x 1 root root 67596 Sep 21 2022 mktemp + -rwxr-xr-x 1 root root 38504 Mar 23 23:02 more + -rwsr-xr-x 1 root root 38496 Mar 23 23:02 mount + -rwxr-xr-x 1 root root 9824 Mar 23 23:02 mountpoint + -rwxr-xr-x 1 root root 133532 Sep 21 2022 mv + lrwxrwxrwx 1 root root 8 Dec 20 03:33 nisdomainname -> hostname + lrwxrwxrwx 1 root root 14 Apr 3 20:25 pidof -> /sbin/killall5 + -rwxr-xr-x 1 root root 67608 Sep 21 2022 pwd + lrwxrwxrwx 1 root root 4 Apr 24 11:24 rbash -> bash + -rwxr-xr-x 1 root root 67600 Sep 21 2022 readlink + -rwxr-xr-x 1 root root 67672 Sep 21 2022 rm + -rwxr-xr-x 1 root root 67600 Sep 21 2022 rmdir + -rwxr-xr-x 1 root root 67400 Nov 3 2022 run-parts + -rwxr-xr-x 1 root root 133372 Jan 6 09:55 sed + lrwxrwxrwx 1 root root 9 Jun 8 13:12 sh -> /bin/bash + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sleep + -rwxr-xr-x 1 root root 67644 Sep 21 2022 stty + -rwsr-xr-x 1 root root 50800 Mar 23 23:02 su + -rwxr-xr-x 1 root root 67584 Sep 21 2022 sync + -rwxr-xr-x 1 root root 336764 Apr 7 04:25 tar + -rwxr-xr-x 1 root root 67144 Nov 3 2022 tempfile + -rwxr-xr-x 1 root root 133224 Sep 21 2022 touch + -rwxr-xr-x 1 root root 67548 Sep 21 2022 true + -rwxr-xr-x 1 root root 9768 Mar 23 22:15 ulockmgr_server + -rwsr-xr-x 1 root root 22108 Mar 23 23:02 umount + -rwxr-xr-x 1 root root 67572 Sep 21 2022 uname + -rwxr-xr-x 2 root root 2346 Apr 10 2022 uncompress + -rwxr-xr-x 1 root root 133632 Sep 21 2022 vdir + -rwxr-xr-x 1 root root 42608 Mar 23 23:02 wdctl + lrwxrwxrwx 1 root root 8 Dec 20 03:33 ypdomainname -> hostname + -rwxr-xr-x 1 root root 1984 Apr 10 2022 zcat + -rwxr-xr-x 1 root root 1678 Apr 10 2022 zcmp + -rwxr-xr-x 1 root root 6460 Apr 10 2022 zdiff + -rwxr-xr-x 1 root root 29 Apr 10 2022 zegrep + -rwxr-xr-x 1 root root 29 Apr 10 2022 zfgrep + -rwxr-xr-x 1 root root 2081 Apr 10 2022 zforce + -rwxr-xr-x 1 root root 8103 Apr 10 2022 zgrep + -rwxr-xr-x 1 root root 2206 Apr 10 2022 zless + -rwxr-xr-x 1 root root 1842 Apr 10 2022 zmore + -rwxr-xr-x 1 root root 4577 Apr 10 2022 znew +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -490,7 +522,7 @@ Get: 282 http://deb.debian.org/debian bookworm/main armhf maven all 3.8.7-1 [18.9 kB] Get: 283 http://deb.debian.org/debian bookworm/main armhf maven-repo-helper all 1.11 [142 kB] Get: 284 http://deb.debian.org/debian bookworm/main armhf maven-debian-helper all 2.6.3 [108 kB] -Fetched 376 MB in 1min 1s (6179 kB/s) +Fetched 376 MB in 35s (10.6 MB/s) debconf: delaying package configuration, since apt-utils is not installed Selecting previously unselected package sgml-base. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19324 files and directories currently installed.) @@ -1829,10 +1861,17 @@ Reading package lists... Building dependency tree... Reading state information... +usrmerge is already the newest version (35). fakeroot is already the newest version (1.31-1.2). 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. I: Building the package -I: Running cd /build/java-diff-utils-4.9/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../java-diff-utils_4.9-1_source.changes +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/A99_set_merged_usr starting +Re-configuring usrmerge... +removed '/etc/unsupported-skip-usrmerge-conversion' +The system has been successfully converted. +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/java-diff-utils-4.9/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../java-diff-utils_4.9-1_source.changes dpkg-buildpackage: info: source package java-diff-utils dpkg-buildpackage: info: source version 4.9-1 dpkg-buildpackage: info: source distribution unstable @@ -1932,14 +1971,14 @@ [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for java-diff-utils-parent 4.9: [INFO] -[INFO] java-diff-utils-parent ............................. SUCCESS [ 3.688 s] -[INFO] java-diff-utils .................................... SUCCESS [ 36.191 s] -[INFO] java-diff-utils-jgit ............................... SUCCESS [ 3.897 s] +[INFO] java-diff-utils-parent ............................. SUCCESS [ 2.567 s] +[INFO] java-diff-utils .................................... SUCCESS [ 18.120 s] +[INFO] java-diff-utils-jgit ............................... SUCCESS [ 2.305 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 44.554 s -[INFO] Finished at: 2023-06-07T11:09:09-12:00 +[INFO] Total time: 23.429 s +[INFO] Finished at: 2023-06-08T13:19:50+14:00 [INFO] ------------------------------------------------------------------------  dh_auto_test /usr/lib/jvm/default-java/bin/java -noverify -cp /usr/share/maven/boot/plexus-classworlds-2.x.jar -Dmaven.home=/usr/share/maven -Dmaven.multiModuleProjectDirectory=/build/java-diff-utils-4.9 -Dclassworlds.conf=/etc/maven/m2-debian.conf org.codehaus.plexus.classworlds.launcher.Launcher -s/etc/maven/settings-debian.xml -Ddebian.dir=/build/java-diff-utils-4.9/debian -Dmaven.repo.local=/build/java-diff-utils-4.9/debian/maven-repo --batch-mode test @@ -1983,109 +2022,77 @@ [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- -[INFO] Running com.github.difflib.patch.PatchTest -[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.567 s - in com.github.difflib.patch.PatchTest -[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest -com.github.difflib.unifieddiff.UnifiedDiff@fcf7ab -com.github.difflib.unifieddiff.UnifiedDiff@f5090e -com.github.difflib.unifieddiff.UnifiedDiff@1e5415e -com.github.difflib.unifieddiff.UnifiedDiff@2431d0 -[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.556 s - in com.github.difflib.unifieddiff.UnifiedDiffReaderTest -[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffWriterTest -From 3209a16c55c1976d5b772c607fd4b9d5fb9f9483 Mon Sep 17 00:00:00 2001 -From: wumpz -Date: Tue, 19 Feb 2019 01:35:14 +0100 -Subject: [PATCH] fixes #753 - ---- - src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt | 5 +++-- - .../net/sf/jsqlparser/statement/select/SelectTest.java | 7 +++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - - -diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt -index cd9bcd1..5f4b2b7 100644 ---- src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt -+++ src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt -@@ -184,6 +184,7 @@ --| --| --| --| --| --| -+| -+| -+| -+| -+| -+| -+| -@@ -1034,7 +1035,7 @@ -- | tk= | tk= | tk= | tk= -- | tk= -- | tk= | tk= | tk= | tk= -- | tk= | tk= | tk= --/* | tk= | tk= | tk= | tk= */ -- ) -- -+ | tk= | tk= | tk= | tk= -+ | tk= -+ | tk= | tk= | tk= | tk= -+ | tk= | tk= | tk= | tk= -+/* | tk= | tk= | tk= | tk= */ -+ ) -+ -@@ -3113,7 +3114,7 @@ -- Expression expr1 = null; --} --{ -- ["{fn" { retval.setEscaped(true); } ] -- -- funcName=RelObjectNameExt() -- -+ Expression expr1 = null; -+} -+{ -+ ["{" { retval.setEscaped(true); } ] -+ -+ funcName=RelObjectNameExt() -+ -diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java -index 7ee9b38..d39bfd3 100644 ---- src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java -+++ src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java -@@ -1058,6 +1058,13 @@ -- assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL"); -- } -- -- @Test -- public void testNamedParametersPR702() throws JSQLParserException { -- assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table"); -+ assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL"); -+ } -+ -+ @Test -+ public void testEscapedFunctionsIssue753() throws JSQLParserException { -+ Statement stmt = CCJSqlParserUtil.parse("SELECT { fn test(0)} AS COL"); -+ assertEquals("SELECT {fn test(0)} AS COL", stmt.toString()); -+ assertSqlCanBeParsedAndDeparsed("SELECT fn FROM fn"); -+ } -+ -+ @Test -+ public void testNamedParametersPR702() throws JSQLParserException { -+ assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table"); --- -2.17.1.windows.2 - - ---- /dev/null -+++ revised -@@ -0,0 +1,2 @@ -+line1 -+line2 - -[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest +[INFO] Running com.github.difflib.text.StringUtilsTest +[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.136 s - in com.github.difflib.text.StringUtilsTest +[INFO] Running com.github.difflib.text.DiffRowGeneratorTest +[[CHANGE,Ich m?chte nicht **mehr **mit ~einem~**dir** ~Bot ~sprechen.** Leite mich weiter.**,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,~Ich~**Kannst** ~soll~**du** ~das~**mich** ~schon~**zum** ~wieder~**Kundendienst** ~wiederholen?~**weiterleiten?**,Kannst du mich zum Kundendienst weiterleiten?]] +This is a test ~senctence~**for diffutils**. +|original|new| +|--------|---| +|This is a test ~senctence~.|This is a test **for diffutils**.| +|This is the second line.|This is the second line.| +|~And here is the finish.~|| +[CHANGE,anything ,anything] +[CHANGE, ,] +[EQUAL,other,other] +[test, , ,, , test2] +[test, ,, test2, ,] +[CHANGE,Testester,ester] +[CHANGE,Testester
feature best,ester feature best] +[[CHANGE,Ich m?chte nicht mit ~e~i~nem~ ~Bot ~sprechen.,Ich m?chte nicht m**ehr m**it **d**i**r** sprechen.** Leite mi**ch **weiter.**], [CHANGE,~I~ch s~oll~ d~as~ ~s~ch~on~ ~wi~ede~r~ wie~de~r~ho~len?,**Kann**s**t** d**u** **mi**ch **zum Kund**e**n**d**i**e**nst** w**e**i**t**erle**ite**n?]] +[CHANGE,Tester,ester] +[CHANGE,test,anything] +[CHANGE,anything ,] +[CHANGE, ,] +[EQUAL,other,other] +[INSERT,test,test] +[INSERT,test2,test2] +[CHANGE,anything ,anything] +[CHANGE, ,] +[EQUAL,other,other] +[CHANGE,anything ,anything] +[CHANGE, ,] +[EQUAL,other,other] +[EQUAL,anything ,anything ] +[EQUAL, , ] +[EQUAL,other,other] +[CHANGE,more lines,some more lines] +[[CHANGE,American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.,bobtail jaguar. American bobtail turkish angora and tomcat.], [CHANGE,Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singa
pura, cheetah.,Russian blue leopard. Lion. Tabby scottish folded for russian blu
e, so savannah yettie? lynx. Tomcat singapura, cheetah.], [CHANGE,Bengal tiger panther but singapura but bombay munchkin for cougar.,Bengal tiger panther but singapura but bombay munchkin for cougar. And m
ore.]] +[EQUAL,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5] +[CHANGE,2020-04-~04T08:00:00~.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] +[CHANGE,2020-04-~04T08:00:00~.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] +[EQUAL,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,] +[CHANGE,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,~1~,Screen,0,,,,,,,,,,,,,,,,,,,,,2020-**04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,**] +[CHANGE,,**2020-**04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,**2**,Screen,0,,,,,,,,,,,,,,,,,,,,] +[EQUAL,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,] +[EQUAL,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,] +~J. G. Feldstein~**T. P. Pastor**, Chair +|TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE,| TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE, | +|~ACTIONS_C17005~, ID, NUMBER, 22, 19, N,| **ACTIONS_C16913**, ID, NUMBER, 22, 19, N, | +|~ACTIONS_C17005~, ISSUEID, NUMBER, 22, 19, Y,| **ACTIONS_C16913**, ISSUEID, NUMBER, 22, 19, Y, | +|~ACTIONS_C17005~, MODIFIED, NUMBER, 22, 10, Y,| **ACTIONS_C16913**, MODIFIED, NUMBER, 22, 10, Y, | +|~ACTIONS_C17005~, ~TABLE~, ~VARCHAR2~, ~1020~, ~null~, Y,| **ACTIONS_C16913**, **VRS**, **NUMBER**, **22**, **1**, Y, | +|~ACTIONS_C17005~, ~S_NAME~, ~CLOB~, ~4000~, null, Y,| **ACTIONS_C16913**, **ZTABS**, **VARCHAR2**, **255**, null, Y, | +|~ACTIONS_C17008~, ~ID~, ~NUMBER~, ~22~, ~19~, ~N~,| **ACTIONS_C16913**, **ZTABS_S**, **VARCHAR2**, **255**, **null**, **Y**, | +|~ACTIONS_C17008~, ~ISSUEID~, ~NUMBER~, ~22~, ~19~, Y,| **ACTIONS_C16913**, **TASK**, **VARCHAR2**, **255**, **null**, Y, | +|~ACTIONS_C17008~, ~MODIFIED~, ~NUMBER~, ~22~, ~10~, Y,| **ACTIONS_C16913**, **HOURS_SPENT**, **VARCHAR2**, **255**, **null**, Y, | +|original|new| +|--------|---| +|This is a test ~senctence~.|This is a test **for diffutils**.| +||**This is the second line.**| +[CHANGE,Ich m?chte nicht m**ehr m**it ~e~**d**i~nem~**r** ~Bot ~sprechen.~ I~** Leite mi**ch **weiter.**,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.] +[CHANGE,**Kann**s~oll~**t** d~as~**u** ~s~**mi**ch~on~ ~wi~**zum Kund**e**n**d**i**e~r~**nst** w**e**i**t**e~de~r~ho~le**ite**n?,Kannst du mich zum Kundendienst weiterleiten?] +[CHANGE,anyth
ing ,anyth
ing] +[CHANGE, ,] +[EQUAL,other,other] +[[CHANGE,Ich m?chte nicht mit einem Bot sprechen.,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,Ich soll das schon wieder wiederholen?,Kannst du mich zum Kundendienst weiterleiten?]] +[CHANGE,anything ,anything] +[CHANGE, ,] +[EQUAL,other,other] +[CHANGE,anything ,anything] +[CHANGE, ,] +[EQUAL,other,other] +[INFO] Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.501 s - in com.github.difflib.text.DiffRowGeneratorTest [INFO] Running com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest header -- @@ -2451,78 +2458,115 @@ -- tail -[WARNING] Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.104 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest -[INFO] Running com.github.difflib.text.StringUtilsTest -[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s - in com.github.difflib.text.StringUtilsTest -[INFO] Running com.github.difflib.text.DiffRowGeneratorTest -[[CHANGE,Ich m?chte nicht **mehr **mit ~einem~**dir** ~Bot ~sprechen.** Leite mich weiter.**,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,~Ich~**Kannst** ~soll~**du** ~das~**mich** ~schon~**zum** ~wieder~**Kundendienst** ~wiederholen?~**weiterleiten?**,Kannst du mich zum Kundendienst weiterleiten?]] -This is a test ~senctence~**for diffutils**. -|original|new| -|--------|---| -|This is a test ~senctence~.|This is a test **for diffutils**.| -|This is the second line.|This is the second line.| -|~And here is the finish.~|| -[CHANGE,anything ,anything] -[CHANGE, ,] -[EQUAL,other,other] -[test, , ,, , test2] -[test, ,, test2, ,] -[CHANGE,Testester,ester] -[CHANGE,Testester
feature best,ester feature best] -[[CHANGE,Ich m?chte nicht mit ~e~i~nem~ ~Bot ~sprechen.,Ich m?chte nicht m**ehr m**it **d**i**r** sprechen.** Leite mi**ch **weiter.**], [CHANGE,~I~ch s~oll~ d~as~ ~s~ch~on~ ~wi~ede~r~ wie~de~r~ho~len?,**Kann**s**t** d**u** **mi**ch **zum Kund**e**n**d**i**e**nst** w**e**i**t**erle**ite**n?]] -[CHANGE,Tester,ester] -[CHANGE,test,anything] -[CHANGE,anything ,] -[CHANGE, ,] -[EQUAL,other,other] -[INSERT,test,test] -[INSERT,test2,test2] -[CHANGE,anything ,anything] -[CHANGE, ,] -[EQUAL,other,other] -[CHANGE,anything ,anything] -[CHANGE, ,] -[EQUAL,other,other] -[EQUAL,anything ,anything ] -[EQUAL, , ] -[EQUAL,other,other] -[CHANGE,more lines,some more lines] -[[CHANGE,American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.,bobtail jaguar. American bobtail turkish angora and tomcat.], [CHANGE,Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singa
pura, cheetah.,Russian blue leopard. Lion. Tabby scottish folded for russian blu
e, so savannah yettie? lynx. Tomcat singapura, cheetah.], [CHANGE,Bengal tiger panther but singapura but bombay munchkin for cougar.,Bengal tiger panther but singapura but bombay munchkin for cougar. And m
ore.]] -[EQUAL,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5] -[CHANGE,2020-04-~04T08:00:00~.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] -[CHANGE,2020-04-~04T08:00:00~.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] -[EQUAL,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,] -[CHANGE,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,~1~,Screen,0,,,,,,,,,,,,,,,,,,,,,2020-**04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,**] -[CHANGE,,**2020-**04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,**2**,Screen,0,,,,,,,,,,,,,,,,,,,,] -[EQUAL,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,] -[EQUAL,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,] -~J. G. Feldstein~**T. P. Pastor**, Chair -|TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE,| TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE, | -|~ACTIONS_C17005~, ID, NUMBER, 22, 19, N,| **ACTIONS_C16913**, ID, NUMBER, 22, 19, N, | -|~ACTIONS_C17005~, ISSUEID, NUMBER, 22, 19, Y,| **ACTIONS_C16913**, ISSUEID, NUMBER, 22, 19, Y, | -|~ACTIONS_C17005~, MODIFIED, NUMBER, 22, 10, Y,| **ACTIONS_C16913**, MODIFIED, NUMBER, 22, 10, Y, | -|~ACTIONS_C17005~, ~TABLE~, ~VARCHAR2~, ~1020~, ~null~, Y,| **ACTIONS_C16913**, **VRS**, **NUMBER**, **22**, **1**, Y, | -|~ACTIONS_C17005~, ~S_NAME~, ~CLOB~, ~4000~, null, Y,| **ACTIONS_C16913**, **ZTABS**, **VARCHAR2**, **255**, null, Y, | -|~ACTIONS_C17008~, ~ID~, ~NUMBER~, ~22~, ~19~, ~N~,| **ACTIONS_C16913**, **ZTABS_S**, **VARCHAR2**, **255**, **null**, **Y**, | -|~ACTIONS_C17008~, ~ISSUEID~, ~NUMBER~, ~22~, ~19~, Y,| **ACTIONS_C16913**, **TASK**, **VARCHAR2**, **255**, **null**, Y, | -|~ACTIONS_C17008~, ~MODIFIED~, ~NUMBER~, ~22~, ~10~, Y,| **ACTIONS_C16913**, **HOURS_SPENT**, **VARCHAR2**, **255**, **null**, Y, | -|original|new| -|--------|---| -|This is a test ~senctence~.|This is a test **for diffutils**.| -||**This is the second line.**| -[CHANGE,Ich m?chte nicht m**ehr m**it ~e~**d**i~nem~**r** ~Bot ~sprechen.~ I~** Leite mi**ch **weiter.**,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.] -[CHANGE,**Kann**s~oll~**t** d~as~**u** ~s~**mi**ch~on~ ~wi~**zum Kund**e**n**d**i**e~r~**nst** w**e**i**t**e~de~r~ho~le**ite**n?,Kannst du mich zum Kundendienst weiterleiten?] -[CHANGE,anyth
ing ,anyth
ing] -[CHANGE, ,] -[EQUAL,other,other] -[[CHANGE,Ich m?chte nicht mit einem Bot sprechen.,Ich m?chte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,Ich soll das schon wieder wiederholen?,Kannst du mich zum Kundendienst weiterleiten?]] -[CHANGE,anything ,anything] -[CHANGE, ,] -[EQUAL,other,other] -[CHANGE,anything ,anything] -[CHANGE, ,] -[EQUAL,other,other] -[INFO] Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.436 s - in com.github.difflib.text.DiffRowGeneratorTest +[WARNING] Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.058 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest +[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest +com.github.difflib.unifieddiff.UnifiedDiff@c8eb05 +com.github.difflib.unifieddiff.UnifiedDiff@11cfad4 +com.github.difflib.unifieddiff.UnifiedDiff@230c58 +com.github.difflib.unifieddiff.UnifiedDiff@d2a21f +[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.222 s - in com.github.difflib.unifieddiff.UnifiedDiffReaderTest +[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffWriterTest +From 3209a16c55c1976d5b772c607fd4b9d5fb9f9483 Mon Sep 17 00:00:00 2001 +From: wumpz +Date: Tue, 19 Feb 2019 01:35:14 +0100 +Subject: [PATCH] fixes #753 + +--- + src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt | 5 +++-- + .../net/sf/jsqlparser/statement/select/SelectTest.java | 7 +++++++ + 2 files changed, 10 insertions(+), 2 deletions(-) + + +diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +index cd9bcd1..5f4b2b7 100644 +--- src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt ++++ src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +@@ -184,6 +184,7 @@ +-| +-| +-| +-| +-| +-| ++| ++| ++| ++| ++| ++| ++| +@@ -1034,7 +1035,7 @@ +- | tk= | tk= | tk= | tk= +- | tk= +- | tk= | tk= | tk= | tk= +- | tk= | tk= | tk= +-/* | tk= | tk= | tk= | tk= */ +- ) +- ++ | tk= | tk= | tk= | tk= ++ | tk= ++ | tk= | tk= | tk= | tk= ++ | tk= | tk= | tk= | tk= ++/* | tk= | tk= | tk= | tk= */ ++ ) ++ +@@ -3113,7 +3114,7 @@ +- Expression expr1 = null; +-} +-{ +- ["{fn" { retval.setEscaped(true); } ] +- +- funcName=RelObjectNameExt() +- ++ Expression expr1 = null; ++} ++{ ++ ["{" { retval.setEscaped(true); } ] ++ ++ funcName=RelObjectNameExt() ++ +diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +index 7ee9b38..d39bfd3 100644 +--- src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java ++++ src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +@@ -1058,6 +1058,13 @@ +- assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL"); +- } +- +- @Test +- public void testNamedParametersPR702() throws JSQLParserException { +- assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table"); ++ assertSqlCanBeParsedAndDeparsed("SELECT {fn concat(a, b)} AS COL"); ++ } ++ ++ @Test ++ public void testEscapedFunctionsIssue753() throws JSQLParserException { ++ Statement stmt = CCJSqlParserUtil.parse("SELECT { fn test(0)} AS COL"); ++ assertEquals("SELECT {fn test(0)} AS COL", stmt.toString()); ++ assertSqlCanBeParsedAndDeparsed("SELECT fn FROM fn"); ++ } ++ ++ @Test ++ public void testNamedParametersPR702() throws JSQLParserException { ++ assertSqlCanBeParsedAndDeparsed("SELECT substring(id, 2, 3), substring(id from 2 for 3), substring(id from 2), trim(BOTH ' ' from 'foo bar '), trim(LEADING ' ' from 'foo bar '), trim(TRAILING ' ' from 'foo bar '), trim(' ' from 'foo bar '), position('foo' in 'bar'), overlay('foo' placing 'bar' from 1), overlay('foo' placing 'bar' from 1 for 2) FROM my table"); +-- +2.17.1.windows.2 + + +--- /dev/null ++++ revised +@@ -0,0 +1,2 @@ ++line1 ++line2 + +[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest +[INFO] Running com.github.difflib.patch.PatchTest +[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.124 s - in com.github.difflib.patch.PatchTest +[INFO] Running com.github.difflib.DiffUtilsTest +Patch{deltas=[[EqualDelta, position: 0, lines: [The]], [ChangeDelta, position: 1, lines: [dog] to [fox]], [EqualDelta, position: 2, lines: [is]], [ChangeDelta, position: 3, lines: [brown] to [down]]]} +[DeleteDelta, position: 0, lines: [1]] +[ChangeDelta, position: 4, lines: [5] to [6]] +[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.055 s - in com.github.difflib.DiffUtilsTest [INFO] Running com.github.difflib.GenerateUnifiedDiffTest --- 5A.txt +++ 5B.txt @@ -2861,15 +2905,10 @@ +lista numérica

Este aqui é um +link

-[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 s - in com.github.difflib.GenerateUnifiedDiffTest +[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.1 s - in com.github.difflib.GenerateUnifiedDiffTest [INFO] Running com.github.difflib.algorithm.myers.MyersDiffTest [start, 0 - 14, 1 - 14, 2 - 14, 3 - 14, 4 - 14, 5 - 14, end] -[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.algorithm.myers.MyersDiffTest -[INFO] Running com.github.difflib.DiffUtilsTest -Patch{deltas=[[EqualDelta, position: 0, lines: [The]], [ChangeDelta, position: 1, lines: [dog] to [fox]], [EqualDelta, position: 2, lines: [is]], [ChangeDelta, position: 3, lines: [brown] to [down]]]} -[DeleteDelta, position: 0, lines: [1]] -[ChangeDelta, position: 4, lines: [5] to [6]] -[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 s - in com.github.difflib.DiffUtilsTest +[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 s - in com.github.difflib.algorithm.myers.MyersDiffTest [INFO] [INFO] Results: [INFO] @@ -2904,7 +2943,7 @@ Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]} [start, 0 - 13, 11 - 13, 9 - 14, 9 - 14, 5 - 14, 3 - 14, 2 - 13, 7 - 13, 9 - 14, 9 - 14, 5 - 13, 8 - 13, 7 - 13, 5 - 13, 10 - 13, 8 - 14, 2 - 14, end] Patch{deltas=[[DeleteDelta, position: 0, lines: [A, B]], [DeleteDelta, position: 3, lines: [A, B]], [InsertDelta, position: 7, lines: [B, A, C]]]} -[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.216 s - in com.github.difflib.algorithm.jgit.HistogramDiffTest +[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.179 s - in com.github.difflib.algorithm.jgit.HistogramDiffTest [INFO] [INFO] Results: [INFO] @@ -2913,14 +2952,14 @@ [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for java-diff-utils-parent 4.9: [INFO] -[INFO] java-diff-utils-parent ............................. SUCCESS [ 5.037 s] -[INFO] java-diff-utils .................................... SUCCESS [ 26.896 s] -[INFO] java-diff-utils-jgit ............................... SUCCESS [ 11.515 s] +[INFO] java-diff-utils-parent ............................. SUCCESS [ 3.321 s] +[INFO] java-diff-utils .................................... SUCCESS [ 14.113 s] +[INFO] java-diff-utils-jgit ............................... SUCCESS [ 10.685 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 44.283 s -[INFO] Finished at: 2023-06-07T11:10:00-12:00 +[INFO] Total time: 28.761 s +[INFO] Finished at: 2023-06-08T13:20:24+14:00 [INFO] ------------------------------------------------------------------------  create-stamp debian/debhelper-build-stamp fakeroot debian/rules binary @@ -2975,14 +3014,14 @@ [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for java-diff-utils-parent 4.9: [INFO] -[INFO] java-diff-utils-parent ............................. SUCCESS [ 3.116 s] -[INFO] java-diff-utils .................................... SUCCESS [ 0.315 s] -[INFO] java-diff-utils-jgit ............................... SUCCESS [ 0.675 s] +[INFO] java-diff-utils-parent ............................. SUCCESS [ 1.345 s] +[INFO] java-diff-utils .................................... SUCCESS [ 0.146 s] +[INFO] java-diff-utils-jgit ............................... SUCCESS [ 0.127 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 4.861 s -[INFO] Finished at: 2023-06-07T11:10:13-12:00 +[INFO] Total time: 2.148 s +[INFO] Finished at: 2023-06-08T13:20:31+14:00 [INFO] ------------------------------------------------------------------------  mh_resolve_dependencies --non-interactive --offline --build -plibdiffutils-java --base-directory=/build/java-diff-utils-4.9 --non-explore Analysing pom.xml... @@ -3012,12 +3051,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/10495/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/19899 and its subdirectories -I: Current time: Wed Jun 7 11:10:53 -12 2023 -I: pbuilder-time-stamp: 1686179453 +I: removing directory /srv/workspace/pbuilder/10495 and its subdirectories +I: Current time: Thu Jun 8 13:21:06 +14 2023 +I: pbuilder-time-stamp: 1686180066