<86>May 20 06:35:59 userdel[3466094]: delete user 'rooter' <86>May 20 06:35:59 userdel[3466094]: removed group 'rooter' owned by 'rooter' <86>May 20 06:35:59 userdel[3466094]: removed shadow group 'rooter' owned by 'rooter' <86>May 20 06:35:59 groupadd[3466127]: group added to /etc/group: name=rooter, GID=1877 <86>May 20 06:35:59 groupadd[3466127]: group added to /etc/gshadow: name=rooter <86>May 20 06:35:59 groupadd[3466127]: new group: name=rooter, GID=1877 <86>May 20 06:35:59 useradd[3466142]: new user: name=rooter, UID=1877, GID=1877, home=/root, shell=/bin/bash, from=none <86>May 20 06:35:59 userdel[3466173]: delete user 'builder' <86>May 20 06:35:59 userdel[3466173]: removed group 'builder' owned by 'builder' <86>May 20 06:35:59 userdel[3466173]: removed shadow group 'builder' owned by 'builder' <86>May 20 06:35:59 groupadd[3466202]: group added to /etc/group: name=builder, GID=1878 <86>May 20 06:35:59 groupadd[3466202]: group added to /etc/gshadow: name=builder <86>May 20 06:35:59 groupadd[3466202]: new group: name=builder, GID=1878 <86>May 20 06:35:59 useradd[3466222]: new user: name=builder, UID=1878, GID=1878, home=/usr/src, shell=/bin/bash, from=none /usr/src/in/srpm/java-diff-utils-4.12-alt1_1jpp11.src.rpm: license not found in '/usr/share/license' directory: ASL /usr/src/in/srpm/java-diff-utils-4.12-alt1_1jpp11.src.rpm: license not found in '/usr/share/license' directory: 2.0 warning: Macro %pom_remove_plugin not found warning: Macro %pom_remove_plugin not found warning: Macro %pom_remove_plugin not found warning: Macro %mvn_build not found warning: Macro %mvn_install not found <13>May 20 06:36:02 rpmi: javapackages-filesystem-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:02 rpmi: plexus-utils-0:3.3.0-alt1_7jpp11 sisyphus+283216.100.1.3 1629255397 installed <13>May 20 06:36:02 rpmi: slf4j-0:1.7.32-alt1_3jpp11 sisyphus+303823.100.1.1 1657996897 installed <13>May 20 06:36:02 rpmi: apache-commons-io-1:2.11.0-alt1_2jpp11 sisyphus+318723.100.1.1 1681807648 installed <13>May 20 06:36:02 rpmi: maven-shared-utils-3.3.4-alt1_2jpp11 sisyphus+302881.100.1.1 1656671461 installed <13>May 20 06:36:02 rpmi: plexus-containers-component-annotations-0:2.1.1-alt1_2jpp11 sisyphus+318726.100.1.3 1681809130 installed <13>May 20 06:36:02 rpmi: javapackages-tools-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:02 rpmi: apache-commons-compress-0:1.21-alt1_1jpp11 sisyphus+282760.100.1.3 1629016378 installed <13>May 20 06:36:02 rpmi: apache-commons-lang3-3.12.0-alt1_7jpp11 sisyphus+317215.100.1.1 1679497472 installed <13>May 20 06:36:02 rpmi: atinject-0:1.0.5-alt1_3jpp11 sisyphus+303043.100.1.1 1656765531 installed <13>May 20 06:36:02 rpmi: httpcomponents-core-4.4.13-alt1_4jpp11 sisyphus+283282.100.1.3 1629308546 installed <13>May 20 06:36:02 rpmi: plexus-interpolation-0:1.26-alt1_12jpp11 sisyphus+317222.100.1.2 1679506704 installed <13>May 20 06:36:02 rpmi: apache-commons-codec-0:1.15-alt1_4jpp11 sisyphus+283206.100.1.2 1629250805 installed <13>May 20 06:36:02 rpmi: perl-HTTP-Date-6.05-alt1 sisyphus+258981.100.1.1 1601542386 installed <13>May 20 06:36:02 rpmi: libpng16-1.6.39-alt1 sisyphus+310490.100.1.1 1669195208 installed <13>May 20 06:36:02 rpmi: cdi-api-2.0.2-alt1_3jpp11 sisyphus+300684.100.1.1 1653577326 installed <13>May 20 06:36:02 rpmi: plexus-cipher-2.0-alt1_2jpp11 sisyphus+318725.100.1.2 1681808079 installed <13>May 20 06:36:02 rpmi: objectweb-asm-0:9.3-alt1_2jpp11 sisyphus+317150.100.1.2 1679414664 installed <13>May 20 06:36:02 rpmi: bouncycastle-0:1.70-alt1_4jpp11 sisyphus+303482.100.1.1 1657548471 installed <13>May 20 06:36:02 rpmi: jcl-over-slf4j-0:1.7.32-alt1_3jpp11 sisyphus+303823.100.1.1 1657996897 installed <13>May 20 06:36:02 rpmi: jakarta-annotations-1.3.5-alt1_11jpp11 sisyphus+300688.100.1.1 1653578883 installed <13>May 20 06:36:03 rpmi: jsoup-1.13.1-alt1_7jpp11 sisyphus+283208.100.1.3 1629252685 installed <13>May 20 06:36:03 rpmi: plexus-classworlds-0:2.6.0-alt1_12jpp11 sisyphus+317221.100.1.2 1679504163 installed <13>May 20 06:36:03 rpmi: sisu-2:0.3.5-alt1_2jpp11 sisyphus+318727.100.1.3 1681808440 installed <13>May 20 06:36:03 rpmi: libwayland-client-1.22.0-alt1.1 sisyphus+318010.100.1.1 1680606300 installed <13>May 20 06:36:03 rpmi: liblcms2-2.15-alt1 sisyphus+316039.100.1.1 1677666336 installed <13>May 20 06:36:03 rpmi: perl-XML-NamespaceSupport-1.12-alt1 1491296348 installed <13>May 20 06:36:03 rpmi: libjpeg-2:2.1.2-alt1.2 sisyphus+300827.100.2.1 1653916654 installed <13>May 20 06:36:03 rpmi: libexpat-2.5.0-alt1 sisyphus+309227.100.1.1 1667075766 installed <13>May 20 06:36:03 rpmi: plexus-sec-dispatcher-1.4-alt4_34jpp11 sisyphus+283215.100.1.3 1629255112 installed <13>May 20 06:36:03 rpmi: plexus-build-api-0:0.0.7-alt3_36jpp11 sisyphus+303029.100.1.3 1656759159 installed <13>May 20 06:36:03 rpmi: ant-lib-0:1.10.12-alt1_8jpp11 sisyphus+317214.100.1.1 1679497453 installed <13>May 20 06:36:03 rpmi: apache-commons-cli-0:1.5.0-alt1_3jpp11 sisyphus+303041.100.1.3 1656766127 installed <13>May 20 06:36:03 rpmi: jansi-0:2.4.0-alt1_7jpp11 sisyphus+317216.100.1.3 1679501797 installed <13>May 20 06:36:03 rpmi: xmvn-core-4.0.0-alt1_8jpp11 sisyphus+303446.100.1.1 1657533450 installed <13>May 20 06:36:03 rpmi: jetty-util-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:03 rpmi: jzlib-0:1.1.3-alt1_21jpp11 sisyphus+303014.100.1.3 1656755373 installed <13>May 20 06:36:03 rpmi: liblksctp-1.0.19-alt1 sisyphus+286802.100.2.1 1633967467 installed <13>May 20 06:36:03 rpmi: perl-LWP-MediaTypes-6.04-alt1 sisyphus+225468.100.1.1 1553186684 installed <13>May 20 06:36:03 rpmi: perl-Compress-Raw-Zlib-2.204-alt1 sisyphus+314931.100.1.1 1675930919 installed <13>May 20 06:36:03 rpmi: perl-libnet-1:3.15-alt1 sisyphus+317310.100.1.1 1679580208 installed <13>May 20 06:36:03 rpmi: perl-XML-SAX-Base-1.09-alt1 1494364363 installed <13>May 20 06:36:03 rpmi: libfribidi-1.0.13-alt1 sisyphus+320646.100.1.1 1684307083 installed <13>May 20 06:36:03 rpmi: libepoxy-1.5.10-alt1 sisyphus+296853.200.2.1 1647631868 installed <13>May 20 06:36:03 rpmi: libatk-2.48.2-alt1 sisyphus+320307.100.1.1 1683829431 installed <13>May 20 06:36:03 rpmi: lksctp-tools-1.0.19-alt1 sisyphus+286802.100.2.1 1633967467 installed <13>May 20 06:36:03 rpmi: jsch-0:0.1.55-alt1_7jpp11 sisyphus+303012.100.1.1 1656747318 installed <13>May 20 06:36:03 rpmi: jetty-io-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:03 rpmi: jetty-http-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:03 rpmi: jetty-util-ajax-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:03 rpmi: libwayland-cursor-1.22.0-alt1.1 sisyphus+318010.100.1.1 1680606300 installed <13>May 20 06:36:03 rpmi: libwayland-egl-4:18.1.0-alt1.1 sisyphus+318010.100.1.1 1680606300 installed <13>May 20 06:36:03 rpmi: google-gson-2.9.1-alt1_1jpp11 sisyphus+317105.100.1.3 1679403093 installed <13>May 20 06:36:03 rpmi: bouncycastle-pg-0:1.70-alt1_4jpp11 sisyphus+303482.100.1.1 1657548471 installed <13>May 20 06:36:03 rpmi: bouncycastle-util-0:1.70-alt1_4jpp11 sisyphus+303482.100.1.1 1657548471 installed <13>May 20 06:36:03 rpmi: bouncycastle-pkix-0:1.70-alt1_4jpp11 sisyphus+303482.100.1.1 1657548471 installed <13>May 20 06:36:03 rpmi: byte-buddy-1.12.0-alt1_3jpp11 sisyphus+303411.100.1.1 1657454125 installed <13>May 20 06:36:03 rpmi: assertj-core-3.19.0-alt1_3jpp11 sisyphus+301632.100.1.1 1654767506 installed <13>May 20 06:36:03 rpmi: perl-File-Listing-6.15-alt1 sisyphus+298606.100.1.1 1650203737 installed <13>May 20 06:36:03 rpmi: java-common-1.6.0-alt1 sisyphus+234020.100.1.1 1562437039 installed <13>May 20 06:36:03 rpmi: plexus-compiler-0:2.11.1-alt1_2jpp11 sisyphus+317154.100.1.3 1679416547 installed <13>May 20 06:36:03 rpmi: plexus-io-0:3.2.0-alt1_9jpp11 sisyphus+303270.100.1.1 1657178206 installed <13>May 20 06:36:03 rpmi: apache-sshd-1:2.6.0-alt1_2jpp11 sisyphus+274571.100.1.1 1623750849 installed <13>May 20 06:36:03 rpmi: osgi-annotation-8.0.1-alt1_4jpp11 sisyphus+303064.100.1.3 1656770624 installed <13>May 20 06:36:03 rpmi: osgi-compendium-7.0.0-alt1_9jpp11 sisyphus+276612.100.1.2 1625154231 installed <13>May 20 06:36:03 rpmi: osgi-core-8.0.0-alt1_3jpp11 sisyphus+283296.100.1.3 1629312763 installed <13>May 20 06:36:03 rpmi: aqute-bnd-0:6.2.0-alt1_2jpp11 sisyphus+317096.100.1.2 1679397087 installed <13>May 20 06:36:03 rpmi: aqute-bndlib-0:6.2.0-alt1_2jpp11 sisyphus+317096.100.1.2 1679397087 installed <13>May 20 06:36:03 rpmi: args4j-2.33-alt1_19jpp11 sisyphus+302986.100.1.1 1656746080 installed <13>May 20 06:36:03 rpmi: beust-jcommander-1.78-alt1_7jpp11 sisyphus+281813.100.1.1 1628094307 installed <13>May 20 06:36:03 rpmi: xmvn-tools-4.0.0-alt1_8jpp11 sisyphus+303446.100.1.1 1657533450 installed <13>May 20 06:36:03 rpmi: ed25519-java-0.3.0-alt1_14jpp11 sisyphus+302993.100.1.2 1656749981 installed <13>May 20 06:36:03 rpmi: felix-utils-1.11.8-alt1_2jpp11 sisyphus+317104.100.1.2 1679400597 installed <13>May 20 06:36:03 rpmi: jsr-305-1:3.0.2-alt1_3jpp11 sisyphus+283271.100.1.2 1629305577 installed <13>May 20 06:36:04 rpmi: guava-31.0.1-alt1_3jpp11 sisyphus+303575.100.1.1 1657650242 installed <13>May 20 06:36:04 rpmi: google-guice-0:4.2.3-alt1_6jpp11 sisyphus+300883.100.1.1 1653894654 installed <13>May 20 06:36:04 rpmi: hamcrest-0:2.2-alt1_5jpp11 sisyphus+301728.200.1.1 1654860789 installed <13>May 20 06:36:04 rpmi: junit-1:4.13.1-alt1_7jpp11 sisyphus+303013.100.1.2 1656753167 installed <13>May 20 06:36:04 rpmi: jakarta-servlet-5.0.0-alt1_8jpp11 sisyphus+282456.100.1.3 1628712458 installed <13>May 20 06:36:04 rpmi: jetty-server-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:04 rpmi: jetty-security-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:04 rpmi: jetty-servlet-9.4.40-alt1_2jpp11 sisyphus+295303.100.1.1 1644764356 installed <13>May 20 06:36:04 rpmi: javaewah-1.1.13-alt1_3jpp11 sisyphus+303048.100.1.3 1656767355 installed <13>May 20 06:36:04 rpmi: univocity-parsers-2.9.1-alt1_6jpp11 sisyphus+303035.100.1.2 1656759759 installed <13>May 20 06:36:04 rpmi: opentest4j-1.2.0-alt1_10jpp11 sisyphus+303026.100.1.2 1656757807 installed <13>May 20 06:36:04 rpmi: junit5-5.7.1-alt1_3jpp11 sisyphus+282473.100.1.2 1628714998 installed <13>May 20 06:36:04 rpmi: xz-java-1.9-alt1_3jpp11 sisyphus+303072.100.1.2 1656772105 installed <13>May 20 06:36:04 rpmi: plexus-archiver-0:4.2.7-alt1_2jpp11 sisyphus+317153.100.1.3 1679416196 installed <13>May 20 06:36:04 rpmi: qdox-1:2.0.0-alt1_9jpp11 sisyphus+303067.100.1.3 1656771548 installed <13>May 20 06:36:04 rpmi: plexus-languages-1.1.1-alt1_2jpp11 sisyphus+317156.100.1.3 1679417212 installed <13>May 20 06:36:04 rpmi: libxslt-1.1.37-alt1 sisyphus+307481.100.1.1 1664360525 installed <13>May 20 06:36:04 rpmi: rpm-macros-java-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:04 rpmi: libmpdec3-2.5.1-alt3 sisyphus+314490.500.5.1 1675432033 installed <13>May 20 06:36:04 rpmi: libgdbm-1.8.3-alt10 sisyphus+278100.1600.1.1 1626059138 installed <13>May 20 06:36:04 rpmi: xorg-proto-devel-2022.1-alt1 sisyphus+299488.100.1.1 1651731532 installed <13>May 20 06:36:04 rpmi: libpcsclite-1.9.9-alt1 sisyphus+306808.100.2.3 1663255857 installed <13>May 20 06:36:04 rpmi: javazi-2022g-alt1 sisyphus+310868.200.2.1 1669888495 installed <13>May 20 06:36:04 rpmi: libgif-4.1.6-alt3 sisyphus+276911.100.1.3 1625273983 installed <13>May 20 06:36:04 rpmi: xml-utils-1:2.10.4-alt1 sisyphus+319317.100.1.1 1682455136 installed <13>May 20 06:36:04 rpmi: publicsuffix-list-20230404-alt1 sisyphus+318117.100.1.1 1680769734 installed <13>May 20 06:36:04 rpmi: httpcomponents-client-4.5.13-alt1_2jpp11 sisyphus+283281.100.1.3 1629307126 installed <13>May 20 06:36:04 rpmi: maven-wagon-0:3.4.2-alt2_4jpp11 sisyphus+303427.100.1.1 1657474852 installed <13>May 20 06:36:04 rpmi: maven-resolver-1:1.6.1-alt2_5jpp11 sisyphus+303430.100.1.1 1657476066 installed <13>May 20 06:36:04 rpmi: xmvn-minimal-4.0.0-alt1_8jpp11 sisyphus+303446.100.1.1 1657533450 installed <13>May 20 06:36:04 rpmi: maven-lib-1:3.6.3-alt5_10jpp11 sisyphus+301864.100.1.1 1655039131 installed <13>May 20 06:36:04 rpmi: maven-1:3.6.3-alt5_10jpp11 sisyphus+301864.100.1.1 1655039131 installed <13>May 20 06:36:04 rpmi: maven-archiver-0:3.5.2-alt1_2jpp11 sisyphus+317140.100.1.2 1679410347 installed <13>May 20 06:36:04 rpmi: maven-common-artifact-filters-3.2.0-alt1_3jpp11 sisyphus+303056.100.1.2 1656767734 installed <13>May 20 06:36:04 rpmi: maven-artifact-transfer-1:0.13.1-alt1_3jpp11 sisyphus+282794.100.1.3 1629030246 installed <13>May 20 06:36:04 rpmi: maven-surefire-0:3.0.0_M4-alt1_6jpp11 sisyphus+303272.200.1.1 1657184780 installed <13>May 20 06:36:04 rpmi: maven-surefire-provider-junit-0:3.0.0_M4-alt1_6jpp11 sisyphus+303272.200.1.1 1657184780 installed <13>May 20 06:36:04 rpmi: maven-surefire-provider-junit5-0:3.0.0_M4-alt1_6jpp11 sisyphus+303272.200.1.1 1657184780 installed <13>May 20 06:36:04 rpmi: maven-surefire-provider-testng-0:3.0.0_M4-alt1_6jpp11 sisyphus+303272.200.1.1 1657184780 installed <13>May 20 06:36:04 rpmi: maven-surefire-plugin-0:3.0.0_M4-alt1_6jpp11 sisyphus+303272.200.1.1 1657184780 installed <13>May 20 06:36:04 rpmi: maven-shared-incremental-1.1-alt1_23jpp11 sisyphus+282537.100.1.1 1628793339 installed <13>May 20 06:36:04 rpmi: maven-compiler-plugin-3.8.1-alt1_10jpp11 sisyphus+282511.100.1.2 1628772929 installed <13>May 20 06:36:04 rpmi: maven-dependency-tree-3.1.0-alt1_2jpp11 sisyphus+317142.100.1.2 1679412375 installed <13>May 20 06:36:04 rpmi: maven-shared-io-1:3.0.0-alt1_17jpp11 sisyphus+303022.100.1.3 1656757260 installed <13>May 20 06:36:04 rpmi: maven-file-management-1:3.0.0-alt1_17jpp11 sisyphus+303020.100.1.3 1656756699 installed <13>May 20 06:36:04 rpmi: maven-jar-plugin-3.2.2-alt1_2jpp11 sisyphus+317144.100.1.3 1679413357 installed <13>May 20 06:36:04 rpmi: maven-filtering-3.2.0-alt1_3jpp11 sisyphus+301764.100.1.2 1654889715 installed <13>May 20 06:36:04 rpmi: maven-resources-plugin-3.2.0-alt1_4jpp11 sisyphus+282536.100.1.2 1628793650 installed <13>May 20 06:36:04 rpmi: xmvn-mojo-4.0.0-alt1_8jpp11 sisyphus+303446.100.1.1 1657533450 installed <13>May 20 06:36:04 rpmi: libxkbcommon-1.5.0-alt1 sisyphus+312911.100.1.1 1673035570 installed <13>May 20 06:36:04 rpmi: libverto-0.3.2-alt1_1 sisyphus+279289.100.1.3 1626493872 installed <13>May 20 06:36:04 rpmi: liblmdb-0.9.29-alt1.1 sisyphus+306630.100.1.1 1663072361 installed <13>May 20 06:36:04 rpmi: libkeyutils-1.6.3-alt1 sisyphus+266061.100.1.1 1612919567 installed <13>May 20 06:36:04 rpmi: libcom_err-1.46.4.0.5.4cda-alt1 sisyphus+283826.100.1.1 1629975361 installed <13>May 20 06:36:04 rpmi: libsqlite3-3.41.2-alt1 sisyphus+318245.100.1.1 1680943749 installed <13>May 20 06:36:04 rpmi: libusb-1.0.26-alt2 sisyphus+305525.100.1.1 1660924428 installed <13>May 20 06:36:04 rpmi: usbids-20230519-alt1 sisyphus+321221.100.1.1 1684538206 installed <13>May 20 06:36:04 rpmi: libgudev-1:237-alt1 sisyphus+282754.100.1.1 1629006690 installed <13>May 20 06:36:04 rpmi: perl-Try-Tiny-0.31-alt1 sisyphus+290597.100.1.1 1637915507 installed <13>May 20 06:36:04 rpmi: perl-IO-Socket-IP-0.41-alt1 sisyphus+259012.100.1.2 1601553446 installed <13>May 20 06:36:04 rpmi: perl-Compress-Raw-Bzip2-2.204-alt1 sisyphus+314930.100.1.1 1675930902 installed <13>May 20 06:36:04 rpmi: perl-IO-Compress-Brotli-2:0.004001-alt3 sisyphus+302124.100.1.1 1655283098 installed <13>May 20 06:36:04 rpmi: perl-Clone-0.46-alt1 sisyphus+308850.100.1.3 1666451819 installed <13>May 20 06:36:04 rpmi: perl-HTML-Tagset-3.20-alt2 1317725093 installed <13>May 20 06:36:04 rpmi: perl-Term-ANSIColor-5.01-alt1 sisyphus+244783.100.1.2 1579747505 installed <13>May 20 06:36:04 rpmi: perl-Data-Dump-1.25-alt1 sisyphus+276551.100.1.1 1625126880 installed <13>May 20 06:36:04 rpmi: perl-Filter-1.64-alt1 sisyphus+305464.100.1.1 1660815328 installed <13>May 20 06:36:04 rpmi: perl-Encode-3.19-alt1 sisyphus+304776.100.1.1 1659623414 installed <13>May 20 06:36:04 rpmi: perl-URI-5.17-alt1 sisyphus+310739.100.1.1 1669616836 installed <13>May 20 06:36:04 rpmi: perl-IO-Compress-2.204-alt1 sisyphus+315114.100.1.1 1676225908 installed <13>May 20 06:36:04 rpmi: perl-Net-HTTP-6.22-alt1 sisyphus+294185.100.1.1 1643275428 installed <13>May 20 06:36:04 rpmi: perl-HTML-Parser-3.81-alt1 sisyphus+314462.100.1.1 1675193797 installed <13>May 20 06:36:04 rpmi: perl-WWW-RobotRules-6.02-alt1 1329756211 installed <13>May 20 06:36:04 rpmi: perl-Encode-Locale-1.05-alt1 1444608613 installed <13>May 20 06:36:04 rpmi: perl-IO-HTML-1.004-alt1 sisyphus+258983.100.1.1 1601542619 installed <13>May 20 06:36:04 rpmi: perl-HTTP-Message-6.44-alt1 sisyphus+309106.100.1.1 1666913573 installed <13>May 20 06:36:04 rpmi: perl-HTTP-Cookies-6.10-alt1 sisyphus+264349.100.1.1 1609891183 installed <13>May 20 06:36:04 rpmi: perl-HTTP-Negotiate-6.01-alt1 1329760563 installed <13>May 20 06:36:04 rpmi: perl-libwww-6.68-alt1 sisyphus+316051.100.1.1 1677673156 installed <13>May 20 06:36:04 rpmi: perl-XML-LibXML-2.0208-alt3 sisyphus+319374.100.1.1 1682520584 installed <13>May 20 06:36:04 rpmi: perl-XML-SAX-1.02-alt1 sisyphus+232322.100.1.1 1560758406 installed <13>May 20 06:36:04 rpmi: perl-XML-Simple-2.25-alt2 sisyphus+257498.100.1.1 1599324034 installed <13>May 20 06:36:04 rpmi: icon-naming-utils-0.8.90-alt1 sisyphus+276851.100.1.1 1625243947 installed <13>May 20 06:36:04 rpmi: icon-theme-adwaita-44.0-alt1 sisyphus+317076.600.1.1 1679344664 installed <13>May 20 06:36:04 rpmi: libdatrie-0.2.13-alt1_2 sisyphus+285649.100.1.1 1632260805 installed <13>May 20 06:36:04 rpmi: libthai-0.1.29-alt1_1 sisyphus+292947.100.1.1 1641111918 installed <13>May 20 06:36:05 rpmi: libwebp7-1.3.0-alt1 sisyphus+313492.100.1.1 1673749692 installed <13>May 20 06:36:05 rpmi: libjbig-2.1-alt1 sisyphus+276068.100.1.1 1624815406 installed <13>May 20 06:36:05 rpmi: libdeflate-1.18-alt1 sisyphus+317484.100.1.1 1679768614 installed <13>May 20 06:36:05 rpmi: libtiff5-4.4.0-alt3 sisyphus+316986.100.1.1 1679241635 installed <13>May 20 06:36:05 rpmi: libgdk-pixbuf-locales-2.42.10-alt1 sisyphus+308991.100.1.1 1666721198 installed <13>May 20 06:36:05 rpmi: libpixman-3:0.42.2-alt1 sisyphus+309549.100.1.1 1667649379 installed <13>May 20 06:36:05 rpmi: libbrotlicommon-1.0.9-alt2 sisyphus+278430.100.1.2 1626213212 installed <13>May 20 06:36:05 rpmi: libbrotlidec-1.0.9-alt2 sisyphus+278430.100.1.2 1626213212 installed <13>May 20 06:36:05 rpmi: libgraphite2-1.3.14-alt2.1 sisyphus+279571.100.1.2 1626605157 installed <13>May 20 06:36:05 rpmi: libharfbuzz-7.0.1-alt1 sisyphus+318888.200.2.1 1682012447 installed <13>May 20 06:36:05 rpmi: libfreetype-2.13.0-alt1 sisyphus+315092.100.1.1 1676198645 installed <13>May 20 06:36:05 rpmi: libfontconfig1-2.14.2-alt7 sisyphus+319291.100.1.1 1682426301 installed <13>May 20 06:36:05 rpmi: fontconfig-2.14.2-alt7 sisyphus+319291.100.1.1 1682426301 installed Updating fonts cache: <29>May 20 06:36:06 fontconfig: Updating fonts cache: succeeded [ DONE ] <13>May 20 06:36:06 rpmi: fonts-type1-xorg-7.0.0-alt4 sisyphus+276845.100.1.1 1625243059 installed <13>May 20 06:36:06 rpmi: gtk+3-themes-incompatible-3.20-alt3 1461944560 installed <13>May 20 06:36:06 rpmi: libdevmapper-1.02.193-alt1 sisyphus+317421.100.1.1 1679684422 installed <13>May 20 06:36:06 rpmi: mount-2.38.1-alt1 sisyphus+308470.100.1.1 1665845352 installed <13>May 20 06:36:06 rpmi: losetup-2.38.1-alt1 sisyphus+308470.100.1.1 1665845352 installed <13>May 20 06:36:06 rpmi: lsblk-2.38.1-alt1 sisyphus+308470.100.1.1 1665845352 installed <13>May 20 06:36:06 rpmi: desktop-file-utils-0.26-alt3 sisyphus+297027.100.1.1 1648023316 installed <13>May 20 06:36:06 rpmi: shared-mime-info-2.2-alt1 sisyphus+297388.100.1.1 1648466617 installed <13>May 20 06:36:06 rpmi: gsettings-desktop-schemas-data-44.0-alt1 sisyphus+317076.300.1.1 1679344430 installed <13>May 20 06:36:06 rpmi: libgio-2.76.2-alt1 sisyphus+319162.100.1.1 1682278235 installed <13>May 20 06:36:06 rpmi: gsettings-desktop-schemas-44.0-alt1 sisyphus+317076.300.1.1 1679344454 installed <13>May 20 06:36:06 rpmi: libgdk-pixbuf-2.42.10-alt1 sisyphus+308991.100.1.1 1666721201 installed <13>May 20 06:36:06 rpmi: gtk4-update-icon-cache-4.10.3-alt2 sisyphus+319681.100.1.1 1683013414 installed <13>May 20 06:36:06 rpmi: libdconf-0.40.0-alt1 sisyphus+279299.100.1.2 1626495975 installed <13>May 20 06:36:06 rpmi: libjson-glib-1.6.6-alt1 sisyphus+299768.200.2.1 1652264095 installed <13>May 20 06:36:06 rpmi: libgusb-0.4.5-alt1 sisyphus+314918.100.1.1 1675925446 installed <13>May 20 06:36:06 rpmi: libcolord-1.4.6-alt1 sisyphus+296000.100.1.1 1646050423 installed <13>May 20 06:36:06 rpmi: libp11-kit-0.24.1-alt1 sisyphus+293720.100.1.1 1642535281 installed <13>May 20 06:36:06 rpmi: libtasn1-4.19.0-alt1 sisyphus+305700.100.1.1 1661359628 installed <13>May 20 06:36:06 rpmi: libX11-locales-3:1.8.4-alt1 sisyphus+314722.100.1.1 1675664300 installed <13>May 20 06:36:06 rpmi: libXdmcp-1.1.4-alt1 sisyphus+311188.1000.1.1 1670233860 installed <13>May 20 06:36:06 rpmi: libXau-1.0.11-alt1 sisyphus+311428.100.1.1 1670577440 installed <13>May 20 06:36:06 rpmi: libxcb-1.15-alt1 sisyphus+299436.300.1.1 1651655490 installed <13>May 20 06:36:06 rpmi: libX11-3:1.8.4-alt1 sisyphus+314722.100.1.1 1675664302 installed <13>May 20 06:36:06 rpmi: libXext-1.3.5-alt1 sisyphus+309285.100.1.1 1667212413 installed <13>May 20 06:36:06 rpmi: libXrender-0.9.11-alt1 sisyphus+308841.100.1.1 1666436131 installed <13>May 20 06:36:06 rpmi: libcairo-1:1.16.0-alt2 sisyphus+312186.100.1.1 1671693945 installed <13>May 20 06:36:06 rpmi: libXi-1.8-alt1 sisyphus+285490.200.1.1 1632124180 installed <13>May 20 06:36:06 rpmi: libXcomposite-0.4.6-alt1 sisyphus+311188.200.1.1 1670233684 installed <13>May 20 06:36:06 rpmi: libXfixes-6.0.0-alt1 sisyphus+284644.300.1.1 1630910333 installed <13>May 20 06:36:06 rpmi: libXcursor-1.2.1-alt1 sisyphus+297765.200.1.1 1649053934 installed <13>May 20 06:36:06 rpmi: libcairo-gobject-1:1.16.0-alt2 sisyphus+312186.100.1.1 1671693945 installed <13>May 20 06:36:06 rpmi: libXft-2.3.7-alt1 sisyphus+310164.100.1.1 1668680609 installed <13>May 20 06:36:06 rpmi: libpango-1.50.14-alt1 sisyphus+316117.100.1.1 1677780554 installed <13>May 20 06:36:06 rpmi: libXrandr-1.5.3-alt1 sisyphus+310375.100.1.1 1669010698 installed <13>May 20 06:36:06 rpmi: libXinerama-1.1.5-alt1 sisyphus+309287.100.1.1 1667213209 installed <13>May 20 06:36:06 rpmi: libXtst-1.2.4-alt1 sisyphus+308663.1300.1.1 1666168504 installed <13>May 20 06:36:06 rpmi: libXdamage-1.1.6-alt1 sisyphus+311188.300.1.1 1670233713 installed <13>May 20 06:36:07 rpmi: libxcb-devel-1.15-alt1 sisyphus+299436.300.1.1 1651655490 installed <13>May 20 06:36:07 rpmi: libX11-devel-3:1.8.4-alt1 sisyphus+314722.100.1.1 1675664302 installed <13>May 20 06:36:07 rpmi: liblz4-1:1.9.4-alt1 sisyphus+309416.100.1.1 1667413000 installed <13>May 20 06:36:07 rpmi: libsystemd-1:252.7-alt1 sisyphus+316321.100.1.1 1678130459 installed <13>May 20 06:36:07 rpmi: libdbus-1.14.6-alt2 sisyphus+321145.100.1.1 1684402689 installed <13>May 20 06:36:07 rpmi: libat-spi2-core-2.48.2-alt1 sisyphus+320307.100.1.1 1683829431 installed <13>May 20 06:36:08 rpmi: at-spi2-atk-2.48.2-alt1 sisyphus+320307.100.1.1 1683829431 installed <13>May 20 06:36:08 rpmi: dbus-tools-1.14.6-alt2 sisyphus+321145.100.1.1 1684402689 installed <86>May 20 06:36:08 groupadd[3497802]: group added to /etc/group: name=messagebus, GID=999 <86>May 20 06:36:08 groupadd[3497802]: group added to /etc/gshadow: name=messagebus <86>May 20 06:36:08 groupadd[3497802]: new group: name=messagebus, GID=999 <86>May 20 06:36:08 useradd[3497815]: new user: name=messagebus, UID=999, GID=999, home=/run/dbus, shell=/dev/null, from=none <13>May 20 06:36:08 rpmi: dbus-1.14.6-alt2 sisyphus+321145.100.1.1 1684402689 installed <13>May 20 06:36:08 rpmi: dconf-0.40.0-alt1 sisyphus+279299.100.1.2 1626495975 installed <13>May 20 06:36:08 rpmi: libgtk+3-schemas-3.24.37-alt1 sisyphus+316153.100.1.1 1677835525 installed <13>May 20 06:36:08 rpmi: libavahi-0.8-alt2 sisyphus+279391.100.1.2 1626530700 installed <13>May 20 06:36:08 rpmi: libpolkit-0.120-alt1.qa2 sisyphus+296007.100.1.1 1646053433 installed <13>May 20 06:36:08 rpmi: rpm-macros-alternatives-0.5.2-alt2 sisyphus+315270.200.2.1 1676457367 installed <13>May 20 06:36:08 rpmi: alternatives-0.5.2-alt2 sisyphus+315270.200.2.1 1676457367 installed <13>May 20 06:36:08 rpmi: ca-certificates-2022.12.14-alt1 sisyphus+311754.200.1.1 1671046143 installed <13>May 20 06:36:08 rpmi: ca-trust-0.1.4-alt1 sisyphus+308690.100.1.1 1666182992 installed <13>May 20 06:36:08 rpmi: p11-kit-trust-0.24.1-alt1 sisyphus+293720.100.1.1 1642535281 installed <13>May 20 06:36:08 rpmi: libcrypto1.1-1.1.1t-alt2 sisyphus+320549.100.1.1 1684166725 installed <13>May 20 06:36:08 rpmi: libssl1.1-1.1.1t-alt2 sisyphus+320549.100.1.1 1684166725 installed <13>May 20 06:36:08 rpmi: python3-3.10.8-alt1.1 sisyphus+311926.100.2.1 1671363746 installed <13>May 20 06:36:08 rpmi: python3-base-3.10.8-alt1.1 sisyphus+311926.100.2.1 1671363746 installed <13>May 20 06:36:08 rpmi: python3-module-six-1.16.0-alt1 sisyphus+283489.100.2.1 1629527308 installed <13>May 20 06:36:08 rpmi: libkmod-30-alt1 sisyphus+307195.200.2.1 1663842346 installed <13>May 20 06:36:08 rpmi: kmod-30-alt1 sisyphus+307195.200.2.1 1663842346 installed <13>May 20 06:36:08 rpmi: dmsetup-1.02.193-alt1 sisyphus+317421.100.1.1 1679684422 installed <86>May 20 06:36:08 groupadd[3499736]: group added to /etc/group: name=tape, GID=998 <86>May 20 06:36:08 groupadd[3499736]: group added to /etc/gshadow: name=tape <86>May 20 06:36:08 groupadd[3499736]: new group: name=tape, GID=998 <86>May 20 06:36:08 groupadd[3499744]: group added to /etc/group: name=dialout, GID=997 <86>May 20 06:36:08 groupadd[3499744]: group added to /etc/gshadow: name=dialout <86>May 20 06:36:08 groupadd[3499744]: new group: name=dialout, GID=997 <86>May 20 06:36:08 groupadd[3499753]: group added to /etc/group: name=input, GID=996 <86>May 20 06:36:08 groupadd[3499753]: group added to /etc/gshadow: name=input <86>May 20 06:36:08 groupadd[3499753]: new group: name=input, GID=996 <86>May 20 06:36:08 groupadd[3499768]: group added to /etc/group: name=video, GID=995 <86>May 20 06:36:08 groupadd[3499768]: group added to /etc/gshadow: name=video <86>May 20 06:36:08 groupadd[3499768]: new group: name=video, GID=995 <86>May 20 06:36:08 groupadd[3499779]: group added to /etc/group: name=render, GID=994 <86>May 20 06:36:08 groupadd[3499779]: group added to /etc/gshadow: name=render <86>May 20 06:36:08 groupadd[3499779]: new group: name=render, GID=994 <86>May 20 06:36:08 groupadd[3499788]: group added to /etc/group: name=sgx, GID=993 <86>May 20 06:36:08 groupadd[3499788]: group added to /etc/gshadow: name=sgx <86>May 20 06:36:08 groupadd[3499788]: new group: name=sgx, GID=993 <13>May 20 06:36:09 rpmi: udev-1:252.7-alt1 sisyphus+316321.100.1.1 1678130459 installed <86>May 20 06:36:09 groupadd[3501573]: group added to /etc/group: name=colord, GID=992 <86>May 20 06:36:09 groupadd[3501573]: group added to /etc/gshadow: name=colord <86>May 20 06:36:09 groupadd[3501573]: new group: name=colord, GID=992 <86>May 20 06:36:09 useradd[3501590]: new user: name=colord, UID=998, GID=992, home=/var/colord, shell=/dev/null, from=none <13>May 20 06:36:09 rpmi: colord-1.4.6-alt1 sisyphus+296000.100.1.1 1646050423 installed <13>May 20 06:36:09 rpmi: python3-module-genshi-0.7.7-alt1 sisyphus+299111.100.1.1 1651061011 installed <13>May 20 06:36:09 rpmi: python3-module-webencodings-0.5.1-alt2 sisyphus+276020.100.1.1 1624812421 installed <13>May 20 06:36:09 rpmi: python3-module-html5lib-1:1.1-alt1 sisyphus+278096.120.5.1 1626086978 installed <13>May 20 06:36:09 rpmi: python3-module-lxml-4.9.2-alt2 sisyphus+319423.100.1.1 1682592963 installed <13>May 20 06:36:09 rpmi: python3-module-javapackages-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:09 rpmi: rpm-build-java-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:09 rpmi: javapackages-local-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <86>May 20 06:36:09 groupadd[3502063]: group added to /etc/group: name=_keytab, GID=991 <86>May 20 06:36:09 groupadd[3502063]: group added to /etc/gshadow: name=_keytab <86>May 20 06:36:09 groupadd[3502063]: new group: name=_keytab, GID=991 <13>May 20 06:36:09 rpmi: libkrb5-1.20.1-alt1 sisyphus+306946.1000.5.2 1677793939 installed <13>May 20 06:36:09 rpmi: libcups-2.4.2-alt2 sisyphus+318635.100.1.1 1681738783 installed <13>May 20 06:36:10 rpmi: libgtk+3-3.24.37-alt1 sisyphus+316153.100.1.1 1677835558 installed <13>May 20 06:36:10 rpmi: gtk3-demo-3.24.37-alt1 sisyphus+316153.100.1.1 1677835558 installed <13>May 20 06:36:10 rpmi: libgail3-3.24.37-alt1 sisyphus+316153.100.1.1 1677835558 installed <13>May 20 06:36:10 rpmi: ca-trust-java-0.1.4-alt1 sisyphus+308690.100.1.1 1666182992 installed <13>May 20 06:36:10 rpmi: java-stub-javadoc-0.1-alt1 sisyphus+276859.100.1.1 1625245070 installed <13>May 20 06:36:10 rpmi: alsa-ucm-conf-1.2.8-alt5 sisyphus+316098.200.2.1 1677756308 installed <13>May 20 06:36:10 rpmi: alsa-topology-conf-1.2.5.1-alt1 sisyphus+274777.100.1.1 1624089141 installed <13>May 20 06:36:10 rpmi: libalsa-1:1.2.8-alt1 sisyphus+310349.200.1.1 1668964322 installed <13>May 20 06:36:12 rpmi: java-11-openjdk-headless-0:11.0.18.0.10-alt1_1jpp11 sisyphus+314871.1100.6.2 1676042637 installed <13>May 20 06:36:12 rpmi: java-11-openjdk-0:11.0.18.0.10-alt1_1jpp11 sisyphus+314871.1100.6.2 1676042637 installed <13>May 20 06:36:13 rpmi: java-11-openjdk-devel-0:11.0.18.0.10-alt1_1jpp11 sisyphus+314871.1100.6.2 1676042637 installed <13>May 20 06:36:13 rpmi: jpackage-11-compat-0.42-alt1 sisyphus+301866.100.1.1 1655041706 installed <13>May 20 06:36:13 rpmi: maven-local-1:6.0.0-alt2_7jpp11 sisyphus+318644.100.1.1 1681742255 installed <13>May 20 06:36:13 rpmi: maven-plugin-bundle-5.1.1-alt1_3jpp11 sisyphus+282795.100.1.1 1629029174 installed <13>May 20 06:36:13 rpmi: jgit-5.11.0-alt1_1jpp11 sisyphus+274417.100.1.2 1623484642 installed <13>May 20 06:36:13 rpmi: apiguardian-1.1.2-alt1_3jpp11 sisyphus+303042.100.1.1 1656765526 installed Building target platforms: i586 Building for target i586 Wrote: /usr/src/in/nosrpm/java-diff-utils-4.12-alt1_1jpp11.nosrc.rpm (w1.gzdio) Installing java-diff-utils-4.12-alt1_1jpp11.src.rpm Building target platforms: i586 Building for target i586 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.46580 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf java-diff-utils-java-diff-utils-parent-4.12 + echo 'Source #0 (java-diff-utils-parent-4.12.tar.gz):' Source #0 (java-diff-utils-parent-4.12.tar.gz): + /bin/gzip -dc /usr/src/RPM/SOURCES/java-diff-utils-parent-4.12.tar.gz + /bin/tar -xf - + cd java-diff-utils-java-diff-utils-parent-4.12 + /bin/chmod -c -Rf u+rwX,go-w . + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin -r :maven-checkstyle-plugin + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin -r :maven-javadoc-plugin + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin :maven-release-plugin + exit 0 Executing(%build): /bin/sh -e /usr/src/tmp/rpm-tmp.46580 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd java-diff-utils-java-diff-utils-parent-4.12 + /usr/bin/python3 /usr/share/java-utils/mvn_build.py --xmvn-javadoc -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dmaven.javadoc.source=1.8 -Dmaven.compiler.release=8 Executing: xmvn --batch-mode --offline -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 -Dmaven.javadoc.source=1.8 -Dmaven.compiler.release=8 verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:javadoc org.fedoraproject.xmvn:xmvn-mojo:builddep ['xmvn', '--batch-mode', '--offline', '-Dmaven.compiler.source=1.8', '-Dmaven.compiler.target=1.8', '-Dmaven.javadoc.source=1.8', '-Dmaven.compiler.release=8', 'verify', 'org.fedoraproject.xmvn:xmvn-mojo:install', 'org.fedoraproject.xmvn:xmvn-mojo:javadoc', 'org.fedoraproject.xmvn:xmvn-mojo:builddep'] [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] java-diff-utils-parent [pom] [INFO] java-diff-utils [jar] [INFO] java-diff-utils-jgit [jar] [INFO] [INFO] ----------< io.github.java-diff-utils:java-diff-utils-parent >---------- [INFO] Building java-diff-utils-parent 4.12 [1/3] [INFO] --------------------------------[ pom ]--------------------------------- [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils-parent --- [WARNING] Ignoring project type pom - supportedProjectTypes = [jar, bundle] [INFO] [INFO] -------------< io.github.java-diff-utils:java-diff-utils >-------------- [INFO] Building java-diff-utils 4.12 [2/3] [INFO] --------------------------------[ jar ]--------------------------------- [INFO] [INFO] --- maven-resources-plugin:3.2.0:resources (default-resources) @ java-diff-utils --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] skip non existing resourceDirectory /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/src/main/resources [INFO] [INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ java-diff-utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 30 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/target/classes [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils --- [INFO] [INFO] --- maven-resources-plugin:3.2.0:testResources (default-testResources) @ java-diff-utils --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] Copying 40 resources [INFO] [INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ java-diff-utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 18 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/target/test-classes [INFO] /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java: Some input files use unchecked or unsafe operations. [INFO] /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithMeyerDiffTest.java: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:3.0.0-M4:test (default-test) @ java-diff-utils --- [INFO] [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [INFO] Running com.github.difflib.GenerateUnifiedDiffTest --- 5A.txt +++ 5B.txt @@ -106,20 +106,28 @@ +++ b/x @@ -1,6 +1,6 @@ -whitespace at beginning + whitespace at beginning whitespace change -whitespace in the middle +white space in the middle whitespace at end unchanged line CR at endQ +git diff -b --ignore-space-at-eol > out +test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" > x && git diff --check | grep "space before tab in indent" @@ -363,10 +371,11 @@ git config core.autocrlf true && test_must_fail git merge master && git diff | sed -e "1,/^@@@/d" >actual && ! grep "^-" actual ' test_done + --- original.txt +++ revised.txt @@ -1,12 +1,12 @@ /* - * Copyright 2009-2017 java-diff-utils. + * Copyright 2009-2017 java-diff-utills. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,21 +24,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.BiPredicate; /** * Implements the difference and patching engine */ -public final class DiffUtils { +public final class DiffUtills { /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param types to be diffed * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param progress progress listener * @return The patch describing the difference between the original and revised sequences. Never @@ -102,39 +102,65 @@ * @param progress The diff algorithm listener. * @param includeEqualParts Include equal data parts into the patch. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress, boolean includeEqualParts) { Objects.requireNonNull(original, "original must not be null"); Objects.requireNonNull(revised, "revised must not be null"); - Objects.requireNonNull(algorithm, "algorithm must not be null"); + Objects.requireNonNull(algorithm, "algorithm must not be null"); /* BLA BLA BLA */ return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts); } /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param algorithm The diff algorithm. Must not be {@code null}. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm) { return diff(original, revised, algorithm, null); - } + } + /** + * Computes the difference between the given texts inline. This one uses the "trick" to make out + * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end + * together again. + * + * @param original + * @param revised + * @return + */ + public static Patch diffInline(String original, String revised) { + List origList = new ArrayList<>(); + List revList = new ArrayList<>(); + for (Character character : original.toCharArray()) { + origList.add(character.toString()); + } + for (Character character : revised.toCharArray()) { + revList.add(character.toString()); + } + Patch patch = DiffUtils.diff(origList, revList); + for (AbstractDelta delta : patch.getDeltas()) { + delta.getSource().setLines(compressLines(delta.getSource().getLines(), "")); + delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), "")); + } + return patch; + } + private static List compressLines(List lines, String delimiter) { if (lines.isEmpty()) { return Collections.emptyList(); } return Collections.singletonList(String.join(delimiter, lines)); } /** * Patch the original text with given patch * --- one_delta_test_original.txt +++ one_delta_test_revised.txt @@ -1,54 +1,11 @@ -

Esta é uma obra Online.

-

 

-

Este texto é negrito

-

Este texto é itálico

-

Este texto está sublinhado

-

Este texto está riscado

-

Este texto está centralizado

-

Este texto está alinhado a direita

-
    -
  1. Este texto está em uma lista numérica
      -
    1. Este texto está identado
    2. -
  2. -
-

Este -aqui é um link

-

 

-

 

-

 

, -

 

-

Página 1

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 2

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 3

-

 

+

Revisão 3

 

Esta é uma obra +Online.

 

Este texto é +negrit

Este texto é itálico/p>

Este texto está +sublinhado

Este texto está riscado agora não +está mais

p style="text-align: left;">Este texto está +centralizado nem este

Este texto +está alinhado a direita

  1. Este texto está em uma +lista numérica

Este aqui é um +link

[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.109 s - in com.github.difflib.GenerateUnifiedDiffTest [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.011 s - in com.github.difflib.DiffUtilsTest [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.002 s - in com.github.difflib.algorithm.myers.MyersDiffTest [INFO] Running com.github.difflib.algorithm.myers.WithMeyersDiffWithLinearSpacePatchTest [INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.032 s - in com.github.difflib.algorithm.myers.WithMeyersDiffWithLinearSpacePatchTest [INFO] Running com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpaceTest Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]} Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]} [start, 6 - 13, 2 - 13, 0 - 13, 0 - 13, 0 - 13, 0 - 13, 2 - 13, 0 - 13, 0 - 13, end] Finished in 8324ms and resulted 2 deltas [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.336 s - in com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpaceTest [INFO] Running com.github.difflib.patch.ChunkTest [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.patch.ChunkTest [INFO] Running com.github.difflib.patch.PatchWithAllDiffAlgorithmsTest [INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 s - in com.github.difflib.patch.PatchWithAllDiffAlgorithmsTest [INFO] Running com.github.difflib.patch.PatchWithMeyerDiffWithLinearSpaceTest [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s - in com.github.difflib.patch.PatchWithMeyerDiffWithLinearSpaceTest [INFO] Running com.github.difflib.patch.PatchWithMeyerDiffTest [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.patch.PatchWithMeyerDiffTest [INFO] Running com.github.difflib.text.DiffRowGeneratorTest [CHANGE,const world: string = ~'world',,const world: string = 'world';] [CHANGE, ~**'world';**,const p: number | undefined = 42;] [CHANGE,**const **p: number | undefined = 42;,] [[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] [CHANGE,~A~,**a**] [DELETE,~B~,] [EQUAL,C,C] [CHANGE,~D~,] [EQUAL,E,E] [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 ,] [DELETE, ,] [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.
]] [CHANGE,2020-04-~04T08:00:00~**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-02T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] [CHANGE,2020-04-~04T08:00:00~**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-02T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] [CHANGE,2020-~04~**04xs**-~04T13:49:18~**04T17dw:00:00**.~210Z~**000Z**,~T~**Sdwdw**,~HHD_MAY20~**HHD_MAY20dwdw**,**Closdwde**,~2.6~,~1~,~Screen~,~0~,,,,,,,,,,,,,,,,,,,,,2020-04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,] [INSERT,**2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,**,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,] ~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,A,a] [DELETE,B,] [EQUAL,C,C] [CHANGE,D,] [EQUAL,E,E] [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] [CHANGE,Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated,Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and] [CHANGE,to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether that nation, or,dedicated to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether] [CHANGE,any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to,that nation, or any nation so conceived and so dedicated, can long endure. We are met on a great battle-field of that] [CHANGE,dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live.,war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives] [CHANGE,It is altogether fitting and proper that we should do this. But, in a larger sense, we can not dedicate -- we can not,that that nation might live. It is altogether fitting and proper that we should do this. But, in a larger sense, we] [CHANGE,consecrate -- we can not hallow -- this ground. The brave men, living and dead, who struggled here, have consecrated it,,can not dedicate -- we can not consecrate -- we can not hallow -- this ground. The brave men, living and dead, who] [CHANGE,far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never,struggled here, have consecrated it, far above our poor power to add or detract. The world will little note, nor long] [CHANGE,forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought,remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated] [CHANGE,here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us -- that,here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here] [CHANGE,from these honored dead we take increased devotion to that cause for which they gave the last full measure of devotion -- that,dedicated to the great task remaining before us -- that from these honored dead we take increased devotion to that cause] [CHANGE,we here highly resolve that these dead shall not have died in vain -- that this nation, under God, shall have a new birth of,for which they gave the last full measure of devotion -- that we here highly resolve that these dead shall not have died] [CHANGE,freedom -- and that government of the people, by the==oldDELETE==> people, for the people, shall not perish from the earth.<==old==,in vain -- that this nation, under God, shall have a new birth of freedom -- and that government of the people, by the] [INSERT,==newINSERT==>people, for the people, shall not perish from the earth.<==new==,people, for the people, shall not perish from the earth.] [INFO] Tests run: 41, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.056 s - in com.github.difflib.text.DiffRowGeneratorTest [INFO] Running com.github.difflib.text.StringUtilsTest [INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.text.StringUtilsTest [INFO] Running com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest header -- tail header --- original +++ revised @@ -1,4 +1,5 @@ test line1 test line2 +@@ -2,6 +2,7 @@ test line 4 test line 5 -- tail header --- 5A.txt +++ 5B.txt @@ -106,20 +106,28 @@ +++ b/x @@ -1,6 +1,6 @@ -whitespace at beginning + whitespace at beginning whitespace change -whitespace in the middle +white space in the middle whitespace at end unchanged line CR at endQ +git diff -b --ignore-space-at-eol > out +test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" > x && git diff --check | grep "space before tab in indent" @@ -363,10 +371,11 @@ git config core.autocrlf true && test_must_fail git merge master && git diff | sed -e "1,/^@@@/d" >actual && ! grep "^-" actual ' test_done + -- tail header --- original.txt +++ revised.txt @@ -1,12 +1,12 @@ /* - * Copyright 2009-2017 java-diff-utils. + * Copyright 2009-2017 java-diff-utills. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,21 +24,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.BiPredicate; /** * Implements the difference and patching engine */ -public final class DiffUtils { +public final class DiffUtills { /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param types to be diffed * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param progress progress listener * @return The patch describing the difference between the original and revised sequences. Never @@ -102,39 +102,65 @@ * @param progress The diff algorithm listener. * @param includeEqualParts Include equal data parts into the patch. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress, boolean includeEqualParts) { Objects.requireNonNull(original, "original must not be null"); Objects.requireNonNull(revised, "revised must not be null"); - Objects.requireNonNull(algorithm, "algorithm must not be null"); + Objects.requireNonNull(algorithm, "algorithm must not be null"); /* BLA BLA BLA */ return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts); } /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param algorithm The diff algorithm. Must not be {@code null}. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm) { return diff(original, revised, algorithm, null); - } + } + /** + * Computes the difference between the given texts inline. This one uses the "trick" to make out + * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end + * together again. + * + * @param original + * @param revised + * @return + */ + public static Patch diffInline(String original, String revised) { + List origList = new ArrayList<>(); + List revList = new ArrayList<>(); + for (Character character : original.toCharArray()) { + origList.add(character.toString()); + } + for (Character character : revised.toCharArray()) { + revList.add(character.toString()); + } + Patch patch = DiffUtils.diff(origList, revList); + for (AbstractDelta delta : patch.getDeltas()) { + delta.getSource().setLines(compressLines(delta.getSource().getLines(), "")); + delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), "")); + } + return patch; + } + private static List compressLines(List lines, String delimiter) { if (lines.isEmpty()) { return Collections.emptyList(); } return Collections.singletonList(String.join(delimiter, lines)); } /** * Patch the original text with given patch * -- tail header --- one_delta_test_original.txt +++ one_delta_test_revised.txt @@ -1,54 +1,11 @@ -

Esta é uma obra Online.

-

 

-

Este texto é negrito

-

Este texto é itálico

-

Este texto está sublinhado

-

Este texto está riscado

-

Este texto está centralizado

-

Este texto está alinhado a direita

-
    -
  1. Este texto está em uma lista numérica
      -
    1. Este texto está identado
    2. -
  2. -
-

Este -aqui é um link

-

 

-

 

-

 

, -

 

-

Página 1

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 2

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 3

-

 

+

Revisão 3

 

Esta é uma obra +Online.

 

Este texto é +negrit

Este texto é itálico/p>

Este texto está +sublinhado

Este texto está riscado agora não +está mais

p style="text-align: left;">Este texto está +centralizado nem este

Este texto +está alinhado a direita

  1. Este texto está em uma +lista numérica

Este aqui é um +link

-- tail [WARNING] Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.013 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest [INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest com.github.difflib.unifieddiff.UnifiedDiff@535154 com.github.difflib.unifieddiff.UnifiedDiff@7933ad com.github.difflib.unifieddiff.UnifiedDiff@14c50bc com.github.difflib.unifieddiff.UnifiedDiff@84a914 [INFO] Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.123 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.002 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest [INFO] [INFO] Results: [INFO] [WARNING] Tests run: 130, Failures: 0, Errors: 0, Skipped: 2 [INFO] [INFO] [INFO] --- maven-jar-plugin:3.2.2:jar (default-jar) @ java-diff-utils --- [INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/target/java-diff-utils-4.12.jar [INFO] [INFO] -----------< io.github.java-diff-utils:java-diff-utils-jgit >----------- [INFO] Building java-diff-utils-jgit 4.12 [3/3] [INFO] --------------------------------[ jar ]--------------------------------- [INFO] [INFO] --- maven-resources-plugin:3.2.0:resources (default-resources) @ java-diff-utils-jgit --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] skip non existing resourceDirectory /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils-jgit/src/main/resources [INFO] [INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ java-diff-utils-jgit --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 1 source file to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils-jgit/target/classes [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils-jgit --- [INFO] [INFO] --- maven-resources-plugin:3.2.0:testResources (default-testResources) @ java-diff-utils-jgit --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ java-diff-utils-jgit --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 2 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils-jgit/target/test-classes [INFO] [INFO] --- maven-surefire-plugin:3.0.0-M4:test (default-test) @ java-diff-utils-jgit --- [INFO] [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [INFO] Running com.github.difflib.algorithm.jgit.HistogramDiffTest 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.034 s - in com.github.difflib.algorithm.jgit.HistogramDiffTest [INFO] [INFO] Results: [INFO] [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 [INFO] [INFO] [INFO] --- maven-jar-plugin:3.2.2:jar (default-jar) @ java-diff-utils-jgit --- [INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils-jgit/target/java-diff-utils-jgit-4.12.jar [INFO] [INFO] ----------< io.github.java-diff-utils:java-diff-utils-parent >---------- [INFO] Building java-diff-utils-parent 4.12 [4/3] [INFO] --------------------------------[ pom ]--------------------------------- [INFO] [INFO] --- xmvn-mojo:4.0.0:install (default-cli) @ java-diff-utils-parent --- [INFO] [INFO] --- xmvn-mojo:4.0.0:javadoc (default-cli) @ java-diff-utils-parent --- /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.12/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java:291: warning - @param argument "deltaList" is not a parameter name. [INFO] [INFO] --- xmvn-mojo:4.0.0:builddep (default-cli) @ java-diff-utils-parent --- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for java-diff-utils-parent 4.12: [INFO] [INFO] java-diff-utils-parent ............................. SUCCESS [ 1.344 s] [INFO] java-diff-utils .................................... SUCCESS [ 13.225 s] [INFO] java-diff-utils-jgit ............................... SUCCESS [ 10.344 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 26.024 s [INFO] Finished at: 2023-05-20T06:36:44Z [INFO] ------------------------------------------------------------------------ -----BEGIN MAVEN BUILD DEPENDENCIES----- H4sIAAAAAAAC/6WRu27DMAxF93wF6112uzsO2kweOgUFuioSo9JQKEEPI/n7yn26KKAlC4F77wHO wH53OVuYMURyvG0e2vsGkJXTxGbbvBzE42E/js1u2PR3QsBTJqtBo0fWBSOMYJAxyIQajld4fZ4Z hCj0mhk2AL/FdYmlMMFlP+rBBdNKL9Ubtie0dOm77+WTkyHRSapUirOckcUxs7YovM2GuO9W++Lp /orq3ikzpXI9JQwV8QcnfrhblDJGDGmqyL4IoVzA21yoLPmI7WQoVYT/0Zp0lZbfvgNJ+WkOQgIA AA== -----END MAVEN BUILD DEPENDENCIES----- + exit 0 Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.78562 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + /bin/chmod -Rf u+rwX -- /usr/src/tmp/java-diff-utils-buildroot + : + /bin/rm -rf -- /usr/src/tmp/java-diff-utils-buildroot + PATH=/usr/libexec/rpm-build:/usr/src/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games + cd java-diff-utils-java-diff-utils-parent-4.12 + xmvn-install -R .xmvn-reactor -n java-diff-utils -d /usr/src/tmp/java-diff-utils-buildroot [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-parent:pom:4.12 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:jar:4.12 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:pom:4.12 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:jar:4.12 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:pom:4.12 [INFO] Installation successful + jdir=target/site/apidocs + '[' -d .xmvn/apidocs ']' + jdir=.xmvn/apidocs + /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/license + '[' -d .xmvn/apidocs ']' + install -dm755 /usr/src/tmp/java-diff-utils-buildroot/usr/share/javadoc/java-diff-utils + cp -pr .xmvn/apidocs/allclasses-index.html .xmvn/apidocs/allclasses.html .xmvn/apidocs/allpackages-index.html .xmvn/apidocs/args .xmvn/apidocs/com .xmvn/apidocs/constant-values.html .xmvn/apidocs/deprecated-list.html .xmvn/apidocs/element-list .xmvn/apidocs/help-doc.html .xmvn/apidocs/index-all.html .xmvn/apidocs/index.html .xmvn/apidocs/jquery .xmvn/apidocs/jquery-ui.overrides.css .xmvn/apidocs/member-search-index.js .xmvn/apidocs/member-search-index.zip .xmvn/apidocs/overview-summary.html .xmvn/apidocs/overview-tree.html .xmvn/apidocs/package-search-index.js .xmvn/apidocs/package-search-index.zip .xmvn/apidocs/resources .xmvn/apidocs/script.js .xmvn/apidocs/search.js .xmvn/apidocs/serialized-form.html .xmvn/apidocs/stylesheet.css .xmvn/apidocs/type-search-index.js .xmvn/apidocs/type-search-index.zip /usr/src/tmp/java-diff-utils-buildroot/usr/share/javadoc/java-diff-utils + echo /usr/share/javadoc/java-diff-utils + /usr/lib/rpm/brp-alt Cleaning files in /usr/src/tmp/java-diff-utils-buildroot (auto) Verifying and fixing files in /usr/src/tmp/java-diff-utils-buildroot (binconfig,pkgconfig,libtool,desktop,gnuconfig) Checking contents of files in /usr/src/tmp/java-diff-utils-buildroot/ (default) Compressing files in /usr/src/tmp/java-diff-utils-buildroot (auto) Verifying ELF objects in /usr/src/tmp/java-diff-utils-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal) Processing files: java-diff-utils-4.12-alt1_1jpp11 Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.66018 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd java-diff-utils-java-diff-utils-parent-4.12 + DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + export DOCDIR + rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.12 + exit 0 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.TeH4gT find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell) [INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml'] [INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils) = 4.12, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.12 [INFO osgi.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils.jar'] [INFO osgi.prov] osgi(io.github.java-diff-utils) = 4.12.0 Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.4VerCe find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) [INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml'] [INFO maven.req] javapackages-filesystem [INFO osgi.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils.jar'] Provides: mvn(io.github.java-diff-utils:java-diff-utils) = 4.12, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.12, osgi(io.github.java-diff-utils) = 4.12.0 Requires: javapackages-filesystem Processing files: java-diff-utils-parent-4.12-alt1_1jpp11 Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.61540 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd java-diff-utils-java-diff-utils-parent-4.12 + DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + export DOCDIR + rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.12 + exit 0 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.TFSsnM find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell) [INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml'] [INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.12 Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.WaU2O4 find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) [INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml'] [INFO maven.req] javapackages-filesystem [INFO maven.req] from POM(s): mvn(org.apache.felix:maven-bundle-plugin), mvn(org.apache.maven.plugins:maven-surefire-plugin) Provides: mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.12 Requires: javapackages-filesystem, mvn(org.apache.felix:maven-bundle-plugin), mvn(org.apache.maven.plugins:maven-surefire-plugin) Processing files: java-diff-utils-jgit-4.12-alt1_1jpp11 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.mmRWCQ find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell) [INFO maven.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml'] [INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils-jgit) = 4.12, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.12 [INFO osgi.prov] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar'] Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.Q5c7Vt find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) [INFO maven.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml'] [INFO maven.req] mvn(org.eclipse.jgit:org.eclipse.jgit), mvn(io.github.java-diff-utils:java-diff-utils) = 4.12, javapackages-filesystem [INFO osgi.req] input: ['/usr/src/tmp/java-diff-utils-buildroot/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar'] Provides: mvn(io.github.java-diff-utils:java-diff-utils-jgit) = 4.12, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.12 Requires: java-diff-utils = 4.12-alt1_1jpp11, javapackages-filesystem, mvn(io.github.java-diff-utils:java-diff-utils) = 4.12, mvn(org.eclipse.jgit:org.eclipse.jgit) Processing files: java-diff-utils-javadoc-4.12-alt1_1jpp11 Finding Provides (using /usr/lib/rpm/find-provides) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.3mDhxT find-provides: running scripts (alternatives,debuginfo,lib,maven,osgi-fc,pam,perl,pkgconfig,python,python3,shell) Finding Requires (using /usr/lib/rpm/find-requires) Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.Cwcf18 find-requires: running scripts (cpp,debuginfo,files,javadoc,lib,maven,osgi-fc,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services) Requires: javapackages-filesystem Adding to java-diff-utils-jgit a strict dependency on java-diff-utils Removing 1 extra deps from java-diff-utils-jgit due to dependency on java-diff-utils Removing 1 extra deps from java-diff-utils-jgit due to repentancy on java-diff-utils Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-4.12-alt1_1jpp11.noarch.rpm (w2.lzdio) Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-parent-4.12-alt1_1jpp11.noarch.rpm (w2.lzdio) Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-jgit-4.12-alt1_1jpp11.noarch.rpm (w2.lzdio) Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-javadoc-4.12-alt1_1jpp11.noarch.rpm (w2.lzdio) 35.94user 3.21system 0:37.40elapsed 104%CPU (0avgtext+0avgdata 234972maxresident)k 0inputs+0outputs (0major+429358minor)pagefaults 0swaps /.out/java-diff-utils-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL /.out/java-diff-utils-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0 /.out/java-diff-utils-parent-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL /.out/java-diff-utils-parent-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0 /.out/java-diff-utils-jgit-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL /.out/java-diff-utils-jgit-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0 /.out/java-diff-utils-javadoc-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL /.out/java-diff-utils-javadoc-4.12-alt1_1jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0 3.40user 1.67system 0:57.63elapsed 8%CPU (0avgtext+0avgdata 109376maxresident)k 0inputs+0outputs (0major+333713minor)pagefaults 0swaps --- java-diff-utils-4.12-alt1_1jpp11.noarch.rpm.repo 2023-03-21 13:29:00.000000000 +0000 +++ java-diff-utils-4.12-alt1_1jpp11.noarch.rpm.hasher 2023-05-20 06:36:55.362770587 +0000 @@ -16,6 +16,6 @@ File: /usr/share/java/java-diff-utils 40755 root:root -File: /usr/share/java/java-diff-utils/java-diff-utils.jar 100644 root:root 985e6186aa01424da528e27bbc0d8c72 -File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml 100644 root:root bb4bfb75508a2e7fb8e5d58fd209b3b1 +File: /usr/share/java/java-diff-utils/java-diff-utils.jar 100644 root:root e041a7aaf8bfd1cbbd813650a3a0ad55 +File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml 100644 root:root f6ebca1c0650316ed9ccc7ff32136b81 File: /usr/share/maven-poms/java-diff-utils 40755 root:root File: /usr/share/maven-poms/java-diff-utils/java-diff-utils.pom 100644 root:root b865bd522fada6956b6a4c0009182c56 -RPMIdentity: db09f5a2aa717e6f5ccdb5065c220740d6daa644a5074527561e118e68d8ecc8b19069ace65226be943280e6af4bb4d99ecdce99723edcc6b50eea331b01cb81 +RPMIdentity: 344a769433b935f8db306711ec0051d6743f254250b5f1bdceced2115913bfa279076f4a90724470a024cb1ca753d076d12c37b6723f5e1513352ebb69f152ec --- java-diff-utils-javadoc-4.12-alt1_1jpp11.noarch.rpm.repo 2023-03-21 13:29:00.000000000 +0000 +++ java-diff-utils-javadoc-4.12-alt1_1jpp11.noarch.rpm.hasher 2023-05-20 06:36:55.455772425 +0000 @@ -163,5 +163,5 @@ File: /usr/share/javadoc/java-diff-utils 40755 root:root -File: /usr/share/javadoc/java-diff-utils/allclasses-index.html 100644 root:root d6256b30d933978dbead7c353ef5394b -File: /usr/share/javadoc/java-diff-utils/allclasses.html 100644 root:root 704df484e56b936652e9648857a5cc68 -File: /usr/share/javadoc/java-diff-utils/allpackages-index.html 100644 root:root a04e5a218ef1a9ac303cd054b1a8f853 +File: /usr/share/javadoc/java-diff-utils/allclasses-index.html 100644 root:root 8e051ab7775360413d1a68788d729a17 +File: /usr/share/javadoc/java-diff-utils/allclasses.html 100644 root:root 9d119f0889938f8f6fbbd4eb7f12c971 +File: /usr/share/javadoc/java-diff-utils/allpackages-index.html 100644 root:root 11d5e39bd574ab12c3e4d93aa7661a3d File: /usr/share/javadoc/java-diff-utils/args 100644 root:root c06bc7b04ad6d090312f33ca3d79f14e @@ -170,120 +170,120 @@ File: /usr/share/javadoc/java-diff-utils/com/github/difflib 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/DiffUtils.html 100644 root:root 876136b8158486e0c343654bf753cca2 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/UnifiedDiffUtils.html 100644 root:root 45c70fb04deddef3c22d1bea0d9e9529 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/DiffUtils.html 100644 root:root b64e38f50f0269c4e2ab8504fcae6cf2 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/UnifiedDiffUtils.html 100644 root:root 94c4442ad366f5a927ea0e446925fb5f File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/Change.html 100644 root:root 68499ef33b0d5c324eb34f026bb01382 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmFactory.html 100644 root:root dbafa9120cc1eef13fc4fd0cb995f6ca -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmI.html 100644 root:root 50536fcc937abc4923b431d1d1d348be -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmListener.html 100644 root:root 50439ff40395d050e2f3c32407a52b2e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/Change.html 100644 root:root c3ecf91e9bebffe4cc96f8f17dbe7a9d +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmFactory.html 100644 root:root c4ae4ac93e12981a3ea3344c57c8ac37 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmI.html 100644 root:root 02256fcd18a947a4a4fab476b13df9be +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmListener.html 100644 root:root 2f2af603e76b614f11da274ebc240b95 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/Change.html 100644 root:root 4bf8fa5ac4d911bce44e7dc6cbb562fe -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmFactory.html 100644 root:root 06b4f7deb5827809f23f3ac979d749ca -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmI.html 100644 root:root 172aaf7e0189470a80abd121b22eb5ee -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmListener.html 100644 root:root 58f78a45761642f2110271770648b10a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/Change.html 100644 root:root 06b605c0509d69ba5d7739666dc941bf +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmFactory.html 100644 root:root de37f51dafff81ea2a645e9538ddce6a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmI.html 100644 root:root 0f5820cde2c52686d13a242b27061fe5 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmListener.html 100644 root:root 83bb14a97efb0f433485cd841da9356b File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataList.html 100644 root:root 7003a88bdc8cea4c875e5e0ef62d9907 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataListComparator.html 100644 root:root 7d222651d08c63f4e9cfe70de66e076c -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/HistogramDiff.html 100644 root:root 7e7721623d845a24902a61dcccb80001 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataList.html 100644 root:root 7a6f24b4989f7cde769d44bc19b02a09 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataListComparator.html 100644 root:root d567fc2a2a87f2928f2d627546b315fe +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/HistogramDiff.html 100644 root:root bd47ca6cdd57282743cb6a91fba91ed4 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataList.html 100644 root:root 7d61400c218a5ad9f5ee62807bf1fafe -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataListComparator.html 100644 root:root b79a823d7ec5a1aee67ffde36eccdbde -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/HistogramDiff.html 100644 root:root d97dd8eb7876dfe65d62f8931a943e99 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-summary.html 100644 root:root cb470db9aa0d13ee21567b921afeca00 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-tree.html 100644 root:root 4405745a4f292385027caf885c3a8c2b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-use.html 100644 root:root 9090c673cf25793044cb464e9f6e2a38 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataList.html 100644 root:root 56581747b9b56d1f6823414991d08934 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataListComparator.html 100644 root:root df258db1b15f627c161fdfbeb7e6e7d2 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/HistogramDiff.html 100644 root:root 8bd2375238b1892b551c4b4e43d513d4 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-summary.html 100644 root:root 9a7c330d9e59557ad8edb5d6f7784858 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-tree.html 100644 root:root 65e2ef57e16408e66a86ed848ad8d89a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-use.html 100644 root:root 48ce217486140b1f045d4658dc2754dc File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiff.html 100644 root:root bb07227125fdbdf068fffb2974be2f57 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.DiffData.html 100644 root:root 8081c7cf6577d5d78144f5c6314336c5 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.Snake.html 100644 root:root 81ee2f93bb416849df70fa8f02225e6a -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.html 100644 root:root 3144bf232eb5c9a9de73ffc6ca95da3b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/PathNode.html 100644 root:root 85debe4ff519c3789ff4f9c854247fd7 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiff.html 100644 root:root b580a9840aad2c733a992691cd8bcaea +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.DiffData.html 100644 root:root b698995ad939436f533fa36cc7fadf6a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.Snake.html 100644 root:root c5973bdf6f0ab4e25d4c53607ee3fd9b +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.html 100644 root:root 0218d8dae7ab734cc2195448b709164c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/PathNode.html 100644 root:root 7a37918a7f100389d2475db45ec3c85e File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiff.html 100644 root:root 7ef041e72d08af6611b04e03b7a74e2b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.DiffData.html 100644 root:root dfbedfcee907ab6845ecb2eadeefa783 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.Snake.html 100644 root:root d6e06b8d37feee43ef8043a4fa79e39b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.html 100644 root:root 308565fa63f40e31d2e8f2448a593357 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/PathNode.html 100644 root:root 1b9b70325a7393d7928e94802ccd4f34 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-summary.html 100644 root:root 23dda85dbf46bb3f820f9ad822fe4017 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-tree.html 100644 root:root 184879e044490b3852142e633a2b22af -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-use.html 100644 root:root 673bd1be4eeb5bfb97395766369f9656 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-summary.html 100644 root:root 862c84322ab57f47cf81f615f95cde1f -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-tree.html 100644 root:root 87cb4eb1a193f23e670375a6d967c356 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-use.html 100644 root:root d7e14ae10f373984dae3c92174607a42 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiff.html 100644 root:root 7cf71bdd094f51fea753aad1385f534f +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.DiffData.html 100644 root:root f342917ca96f24d7cb435750f5142feb +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.Snake.html 100644 root:root c4b1c22813b703a529a0633bfd84ef18 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.html 100644 root:root 5ce423bd0daf395875b20aef619ec976 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/PathNode.html 100644 root:root d17eafa32d290c476b78822e76b5304c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-summary.html 100644 root:root e286deec50f6e4464c4924b4975dfcc1 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-tree.html 100644 root:root 36f38eef4baf1bce9e1cd827243fb56f +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-use.html 100644 root:root fb182a56f119aa384da49b16d8f80ce5 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-summary.html 100644 root:root 60bc74978289d02df823c9a7ffa1065b +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-tree.html 100644 root:root 2478716f05b73d1aa891e0db076a207c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-use.html 100644 root:root dc43d1423750b549cb874d0ff0d7f446 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/DiffUtils.html 100644 root:root 5aba9eade2ed6847b46a53da8bbe662e -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/UnifiedDiffUtils.html 100644 root:root 5c8b9f97b5433a0e367dfdb47a3ef1af -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-summary.html 100644 root:root 536ab4fa77c90d22096472567d3643e0 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-tree.html 100644 root:root 1c698f9c0cd73c5f31c4d1bba17d7682 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-use.html 100644 root:root c80bf903a09fb59a40f7fd27bb516b2d +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/DiffUtils.html 100644 root:root f42d6d16197ef3d2901a60d6853a05dd +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/UnifiedDiffUtils.html 100644 root:root cc007030b054881e163153ef2ebd889d +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-summary.html 100644 root:root 791c4cfb560cf84b4f7bac67eef5c43e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-tree.html 100644 root:root 8f304dd29e63df1b455ab4ba699f583a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-use.html 100644 root:root 4d8c7bb11d79776f6158e4f9bab58375 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/AbstractDelta.html 100644 root:root 38e9efd4f5c57cc608301cb709afad4b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ChangeDelta.html 100644 root:root 5bb17f092a87ab07057d2d5e9945e0bd -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Chunk.html 100644 root:root 63ef21be833ace42dd230531a205c0a4 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ConflictOutput.html 100644 root:root 5d1083d5e44ad0164ace22db622bfb35 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeleteDelta.html 100644 root:root 1c0345652ed95cbbd891d531ad1d087f -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeltaType.html 100644 root:root b919bea2bf409fd7f1b50400afb83ae3 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DiffException.html 100644 root:root 06ec5c5bbcb3d30a065ed294d3d476e8 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/EqualDelta.html 100644 root:root aa8c90878840ed360325fc0af665c351 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/InsertDelta.html 100644 root:root 48fc6ccf59fa03ef6575885fcfdc0962 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.PatchApplyingContext.html 100644 root:root 01eba0c29cdc30b5c99c19316bf23571 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.html 100644 root:root 270b0ea80eef03ddb92cf2935f091b22 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/PatchFailedException.html 100644 root:root 5697803bf2e2d7dc572f67dab899870c -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/VerifyChunk.html 100644 root:root e079c8db10a32e59e81782f99e1b202d +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/AbstractDelta.html 100644 root:root db80bba0ae65cadebbaa322814e34b23 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ChangeDelta.html 100644 root:root 5ed62396f40e8307b3a0c242c61a0152 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Chunk.html 100644 root:root ca24336f6386c38a5749385761488519 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ConflictOutput.html 100644 root:root 4a5b88466de3f0149c16714193db83ec +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeleteDelta.html 100644 root:root 689aee43e842b10cd16fd2a1562f9e0e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeltaType.html 100644 root:root d1f67fd1292af68ca4ac84624a6d7160 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DiffException.html 100644 root:root 43adb88f72a5e75e621e596c461d914e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/EqualDelta.html 100644 root:root f54a0540c059b2cc72ffac513642a9ba +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/InsertDelta.html 100644 root:root ab8eecd1423eb75e9f497888e3f45e7b +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.PatchApplyingContext.html 100644 root:root 38ebb70269c331e661546bddc4513a0e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.html 100644 root:root bf27d72977e98505d6eb7147a234d02c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/PatchFailedException.html 100644 root:root baaa99d266cd0434d60b8b035ddf77fc +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/VerifyChunk.html 100644 root:root dfbf6c455bf476d7d1469b3cbcacb649 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/AbstractDelta.html 100644 root:root 2d0d3d9a7d1f0a3c71f8377ae5d82f21 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ChangeDelta.html 100644 root:root dd2d76f0991dbfcda8fed356ab05c5e4 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Chunk.html 100644 root:root 4ce68b892da900b5a9d53510c980b2c3 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ConflictOutput.html 100644 root:root 12c09ad92c4cc21546a637e44c1b42ef -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeleteDelta.html 100644 root:root 5522be7a8175c57802e03a73b5440db9 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeltaType.html 100644 root:root 28cabd3c6b96031a0f872d2006c9f67a -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DiffException.html 100644 root:root b0d4e7408e01a88270c7f41698bc9198 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/EqualDelta.html 100644 root:root e343bccafef0740450ccee2f8a94a6d2 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/InsertDelta.html 100644 root:root 4975218068b7142a141b6ad912ce2ac2 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.PatchApplyingContext.html 100644 root:root 1d3a70f61c63d4b1dbc3c0fa0def2c32 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.html 100644 root:root e1f33d946d382536511a6696555368fc -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/PatchFailedException.html 100644 root:root 2ccdffeff49aafdeddd1cb5a83abf003 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/VerifyChunk.html 100644 root:root ac2d106d1e022153b5a1670879b214d6 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-summary.html 100644 root:root 53f5f327ff1cd5ebaa824ae5eb7b72e6 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-tree.html 100644 root:root 72487069755f34cf0d48a67fa8be3f09 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-use.html 100644 root:root 36011f395aa9295a6b5671a95bfabcd9 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/AbstractDelta.html 100644 root:root 10178c8ffb8c29a0322628d8997f621f +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ChangeDelta.html 100644 root:root fa2fa7c51a004c709fae69eba02649a7 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Chunk.html 100644 root:root 7b7d5a279da02579b658768a3efda3ae +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ConflictOutput.html 100644 root:root f62842f3706781963ca2386b861d67c7 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeleteDelta.html 100644 root:root d252dd97d0333b2de0ec3708391b676a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeltaType.html 100644 root:root 90a0595033911be3e5f3b8ccfc763f29 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DiffException.html 100644 root:root 0c1ba9e96930781aa549449f3dd13bed +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/EqualDelta.html 100644 root:root 30634b15fcfddbe051fc4b42d865d5e4 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/InsertDelta.html 100644 root:root 51f159c507d26093719c5817109d6355 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.PatchApplyingContext.html 100644 root:root b2786c1efdf2bdb1ff2ed3cc5972c6e8 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.html 100644 root:root fc4fd160bbddb704d485ff8c7a9b6efc +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/PatchFailedException.html 100644 root:root 14ed7fc92f3344fb9569eac031163acd +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/VerifyChunk.html 100644 root:root e6c6805fbac6f52c0d2e3433d594714b +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-summary.html 100644 root:root 087d3fe14b1fa578eaa490e0c894e362 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-tree.html 100644 root:root c260246956d07e18a2c8bd96a6ae1ccd +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-use.html 100644 root:root 8a4165cdf1fd418874030f4911506aef File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.Tag.html 100644 root:root e828568e3a5be664ff15f340e47cf786 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.html 100644 root:root d0262ad9af15d548c325906b8ea7d103 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.Builder.html 100644 root:root 7e13d4ed08efb407d173d4ae0be569ed -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.html 100644 root:root fe17b0b9d78aaa344716427b8d41b351 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/StringUtils.html 100644 root:root f9043b3b8d42e6cb0ab15898e4dac121 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.Tag.html 100644 root:root 1f0e371617ccde769e997cb73a8a4321 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.html 100644 root:root 352edd2220e0b98b08a3105f82a333c8 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.Builder.html 100644 root:root b1cd86d4445413b047227ce48cdb466d +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.html 100644 root:root a631439d10316aab100b37606ce44948 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/StringUtils.html 100644 root:root 560a7c7c6b750a90d4dca0d3e965d321 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.Tag.html 100644 root:root c30b9b0e7e7e522c1efa6602fc667020 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.html 100644 root:root cba32de7a7617ce03370f23b01840d0a -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.Builder.html 100644 root:root 4b4c225773ff087b2865fd85d0a9f711 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.html 100644 root:root 73b01139d83bb2c98706fc57a2f1f43c -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/StringUtils.html 100644 root:root 5dfa688e1698b9c0c574404b073654f8 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-summary.html 100644 root:root fb873f43e06d8fd7e029a8d9f47eb2a9 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-tree.html 100644 root:root 14619fd0e662f45df8488d03b17fcc08 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-use.html 100644 root:root 7f1f6512ad7d05944c0151b77bb62100 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.Tag.html 100644 root:root fb96893c59842edbbcd70f29bf8f82e1 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.html 100644 root:root 6de9e7863b728c04ee58fbaa3262bf47 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.Builder.html 100644 root:root 86d95f674acac6ccfb04dfdde5932764 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.html 100644 root:root 3f3ef4075b802e8dc49e5f1bd2c638e8 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/StringUtils.html 100644 root:root 1c3ebd3a419b262ecec3916a3f7ff398 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-summary.html 100644 root:root c062bc4273bf1e00a547dc75b1bc5a1a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-tree.html 100644 root:root c9ff10a17f03944434de02212203d4f1 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-use.html 100644 root:root 688e4a3ef79e68aec3fbf3e0a0ab2709 File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/InternalUnifiedDiffReader.html 100644 root:root 388666d8a6456f0c64e527b1734623fa -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiff.html 100644 root:root 2086cffcb3a6e5c5d981f186ca8424ba -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffFile.html 100644 root:root 1575d2cf2f56261e5d86f1f1d3868297 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffParserException.html 100644 root:root 3ffaf30e983118fd3eedf6d23d56ddc4 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root a03cf7938eb8a79c20440a1ad1cbb7ff -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.html 100644 root:root 7780afc940551502630db9b8d635869d -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffWriter.html 100644 root:root 6fa769f1dd62aeca6b73a9cab6d3a1aa +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/InternalUnifiedDiffReader.html 100644 root:root 91dcd87b581b2ad94294282e3fa5f35a +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiff.html 100644 root:root e89f931e2d08c021c9945db36305c579 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffFile.html 100644 root:root 93118b0a30ac14643665a5221436d699 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffParserException.html 100644 root:root e23c523624b8866f9200f2a38ac7481c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root 5d43eb5a8b18491b9b406b2b483a97a9 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.html 100644 root:root 7e1119c6c953c40e782df469bb685eac +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffWriter.html 100644 root:root d72cb8ed58aa6be3c4e9443a652f471d File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use 40755 root:root -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/InternalUnifiedDiffReader.html 100644 root:root bf7a04b59ab0baba8ae63320e2bcc698 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiff.html 100644 root:root 7b8e47f990c9884b0faaa728d0d7d69b -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffFile.html 100644 root:root c68f7099dab7f3e4699e3472d1b78d41 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffParserException.html 100644 root:root 8a62618b835e12802b37921579b7b7c4 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root 241fb81fc01883bbf1d42d923f061625 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.html 100644 root:root 386fb356a0c4b24736a7b116e6eb8911 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffWriter.html 100644 root:root b38a911e4734fdac92cf42baa23083f5 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-summary.html 100644 root:root 648f61e8fb2a9411df6912240b23d92d -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-tree.html 100644 root:root 59ae91c66e6afb0d0fea4d1a7fb49fb7 -File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-use.html 100644 root:root 2d013c56a167a2f9cd83d0b65fdef01e -File: /usr/share/javadoc/java-diff-utils/constant-values.html 100644 root:root 49dd3b8484c4a0019da0bd94fbbb2634 -File: /usr/share/javadoc/java-diff-utils/deprecated-list.html 100644 root:root b0bfa845a960ae5e1e4dc19400928924 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/InternalUnifiedDiffReader.html 100644 root:root fc5d9526b25d33eaa820103cd6c536b0 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiff.html 100644 root:root ed1e5f2bb62f51f075d4c0064ec00cee +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffFile.html 100644 root:root 074db41519d677eae5d1e4ae03f31de0 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffParserException.html 100644 root:root 48f1f3cb981632bb1d59611e0b75487c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root aa98ef70c746abfecdb331b79e403bd1 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.html 100644 root:root 89bf1ff23376537d7bcc12683a91993e +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffWriter.html 100644 root:root 84b84d916082ccbed6dd48db8d1e140c +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-summary.html 100644 root:root 59289ce6a3b915356cbb9adb7b7ab275 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-tree.html 100644 root:root 0a052b2e8eed3f990243038dc4e80685 +File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-use.html 100644 root:root 794f75ae55f206d10a696c109be86033 +File: /usr/share/javadoc/java-diff-utils/constant-values.html 100644 root:root 9a6eee9a11ae89a990f46ea409f20030 +File: /usr/share/javadoc/java-diff-utils/deprecated-list.html 100644 root:root 890f97a9bea0cc80a6a7b472eea38efd File: /usr/share/javadoc/java-diff-utils/element-list 100644 root:root 7ae44a28918b95f046370f344bf16e4c -File: /usr/share/javadoc/java-diff-utils/help-doc.html 100644 root:root dd280c8b58b3ae1a78825e51ce4db619 -File: /usr/share/javadoc/java-diff-utils/index-all.html 100644 root:root 0eef66bf4e76f1db4d3576444a74393a -File: /usr/share/javadoc/java-diff-utils/index.html 100644 root:root 10050c4d5dadfb4287a7189474176386 +File: /usr/share/javadoc/java-diff-utils/help-doc.html 100644 root:root 23915f0c7da7daba76ddf60a7f4186a6 +File: /usr/share/javadoc/java-diff-utils/index-all.html 100644 root:root 9d5752e26746984dd3cd99f819d5d674 +File: /usr/share/javadoc/java-diff-utils/index.html 100644 root:root 93d2ea9899614ba2d133c45e211ef627 File: /usr/share/javadoc/java-diff-utils/jquery 40755 root:root @@ -307,7 +307,7 @@ File: /usr/share/javadoc/java-diff-utils/member-search-index.js 100644 root:root fd9bbba8c2a10c4260d79674a8eba2b8 -File: /usr/share/javadoc/java-diff-utils/member-search-index.zip 100644 root:root 88d9d2522cfbfc3022ed9c935d3ffe2e -File: /usr/share/javadoc/java-diff-utils/overview-summary.html 100644 root:root c92ca64a2aae15038ce94262cd9b43d4 -File: /usr/share/javadoc/java-diff-utils/overview-tree.html 100644 root:root 1aca437e113c1dd253daf55ebb7656cc +File: /usr/share/javadoc/java-diff-utils/member-search-index.zip 100644 root:root f680ac809d7fd1271de145e07845ea52 +File: /usr/share/javadoc/java-diff-utils/overview-summary.html 100644 root:root 2cc4226b77238cd33a244e503ba8ff71 +File: /usr/share/javadoc/java-diff-utils/overview-tree.html 100644 root:root 9b4b422a2d78e6538e5bbc5616c7a80b File: /usr/share/javadoc/java-diff-utils/package-search-index.js 100644 root:root 17b0f832db67da990545f0a4d7a681e4 -File: /usr/share/javadoc/java-diff-utils/package-search-index.zip 100644 root:root e65ed87a212dd18fdb7a0b1062a7dbe4 +File: /usr/share/javadoc/java-diff-utils/package-search-index.zip 100644 root:root 9c33696b57f95b5888806de2bdea3b55 File: /usr/share/javadoc/java-diff-utils/resources 40755 root:root @@ -317,6 +317,6 @@ File: /usr/share/javadoc/java-diff-utils/search.js 100644 root:root b5586bfb406fe790d27a4e3d42c4462c -File: /usr/share/javadoc/java-diff-utils/serialized-form.html 100644 root:root 122ef1b4ecc84740c2d75f3ced206e3a +File: /usr/share/javadoc/java-diff-utils/serialized-form.html 100644 root:root 7adf5413f6eea3fbdd07628965b279d2 File: /usr/share/javadoc/java-diff-utils/stylesheet.css 100644 root:root 0f00f4821485addbc1a2ca2f10508857 File: /usr/share/javadoc/java-diff-utils/type-search-index.js 100644 root:root d7d12cab493fbb5e278c430b9e5fd6d9 -File: /usr/share/javadoc/java-diff-utils/type-search-index.zip 100644 root:root 5925d29b5708c2dae77a0f2b2fa24ec3 -RPMIdentity: d6b236d26acffa11dcedc6bfdbdc942eea0bb172e58837c7614b47f3a0efb0697299e9722e086eb658af2adb65b7d07735713fe58a0db659e20d0a95f51bb7d2 +File: /usr/share/javadoc/java-diff-utils/type-search-index.zip 100644 root:root c3d3184ce7ee7283126ef7aeeba8153c +RPMIdentity: 685069d0b18a1ee8b2c09013d0b7cb98b21828959a774657abc81e0ec9312ee543677b5822c5d6c9996e7196ad26759aa3b22c51ded7f1fc3aff11711918a01e --- java-diff-utils-jgit-4.12-alt1_1jpp11.noarch.rpm.repo 2023-03-21 13:29:00.000000000 +0000 +++ java-diff-utils-jgit-4.12-alt1_1jpp11.noarch.rpm.hasher 2023-05-20 06:36:55.520773709 +0000 @@ -12,6 +12,6 @@ File: /usr/share/java/java-diff-utils 40755 root:root -File: /usr/share/java/java-diff-utils/java-diff-utils-jgit.jar 100644 root:root 65682b771dd542b5e7f4c487ed7b9eb0 -File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml 100644 root:root 64c602aa1774f13128b6a1aa6ad96ad3 +File: /usr/share/java/java-diff-utils/java-diff-utils-jgit.jar 100644 root:root 76270ca8a2dd2d52369091e3d705d127 +File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml 100644 root:root 1aea533d800c989f4a065d8474c2a540 File: /usr/share/maven-poms/java-diff-utils 40755 root:root File: /usr/share/maven-poms/java-diff-utils/java-diff-utils-jgit.pom 100644 root:root 7727d15c2c641300d993cfd329990032 -RPMIdentity: 4b5b97710fbcc19f7c0d59d4b131e619ea49d41f1638969c18cf42f943c071482125e06e455d4a16c2cce0f956890d59f5a6641d04874406bba1f006ff11ebaf +RPMIdentity: fa11628f571ee2563294aeec532a0aeda7f1bb7f7fb9d2cd2fa855c964fb5b5380dbaf8a41b9f85c961a1461094e54ce68b2483d0e7a24dc26ac8a8570944e31 --- java-diff-utils-parent-4.12-alt1_1jpp11.noarch.rpm.repo 2023-03-21 13:29:00.000000000 +0000 +++ java-diff-utils-parent-4.12-alt1_1jpp11.noarch.rpm.hasher 2023-05-20 06:36:55.593775152 +0000 @@ -13,5 +13,5 @@ File: /usr/share/doc/java-diff-utils-parent-4.12/LICENSE 100644 root:root 86d3f3a95c324c9479bd8986968f4327 -File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml 100644 root:root 3d55cc815c06defd16b8f88561faf6e9 +File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml 100644 root:root b25ccd33c7c481d45dcc59674a5ee334 File: /usr/share/maven-poms/java-diff-utils 40755 root:root File: /usr/share/maven-poms/java-diff-utils/java-diff-utils-parent.pom 100644 root:root cd9f86c21706a4d80818a95c0029ef98 -RPMIdentity: d5a8f18d80dec617dbb0c56d802615aa34637c2a48a3b0021631b90b64583ac24bc9fae6ecc9029075032bf8ca069d76fb9cf25288bc50cd3175713a86ec6d60 +RPMIdentity: ec6da5ddbd106359d7e79f13ef335368270e669277c6d3cc198ef1df46aaca7fbf46587e32a2fca91373d37aae714965206c9f3c65874c3ac39b40c2cced9054