86>Jul 17 15:38:13 userdel[2458152]: delete user 'rooter'
<86>Jul 17 15:38:13 userdel[2458152]: removed group 'rooter' owned by 'rooter'
<86>Jul 17 15:38:13 userdel[2458152]: removed shadow group 'rooter' owned by 'rooter'
<86>Jul 17 15:38:13 groupadd[2458157]: group added to /etc/group: name=rooter, GID=657
<86>Jul 17 15:38:13 groupadd[2458157]: group added to /etc/gshadow: name=rooter
<86>Jul 17 15:38:13 groupadd[2458157]: new group: name=rooter, GID=657
<86>Jul 17 15:38:13 useradd[2458161]: new user: name=rooter, UID=657, GID=657, home=/root, shell=/bin/bash
<86>Jul 17 15:38:13 userdel[2458168]: delete user 'builder'
<86>Jul 17 15:38:13 userdel[2458168]: removed group 'builder' owned by 'builder'
<86>Jul 17 15:38:13 userdel[2458168]: removed shadow group 'builder' owned by 'builder'
<86>Jul 17 15:38:13 groupadd[2458173]: group added to /etc/group: name=builder, GID=658
<86>Jul 17 15:38:13 groupadd[2458173]: group added to /etc/gshadow: name=builder
<86>Jul 17 15:38:13 groupadd[2458173]: new group: name=builder, GID=658
<86>Jul 17 15:38:13 useradd[2458178]: new user: name=builder, UID=658, GID=658, home=/usr/src, shell=/bin/bash
/usr/src/in/srpm/java-diff-utils-4.9-alt1_2jpp11.src.rpm: license not found in '/usr/share/license' directory: ASL
/usr/src/in/srpm/java-diff-utils-4.9-alt1_2jpp11.src.rpm: license not found in '/usr/share/license' directory: 2.0
warning: user igor does not exist - using root
warning: group igor does not exist - using root
warning: user igor does not exist - using root
warning: group igor does not exist - using root
warning: user igor does not exist - using root
warning: group igor does not exist - using root
warning: user igor does not exist - using root
warning: group igor does not exist - using root
warning: user igor does not exist - using root
warning: group igor does not exist - using root
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>Jul 17 15:38:20 rpmi: javapackages-filesystem-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:20 rpmi: plexus-utils-0:3.3.0-alt1_2jpp11 sisyphus+271480.100.1.1 1620781572 installed
<13>Jul 17 15:38:20 rpmi: slf4j-0:1.7.30-alt1_6jpp11 sisyphus+272762.100.1.1 1622205309 installed
<13>Jul 17 15:38:20 rpmi: apache-commons-io-1:2.8.0-alt1_3jpp11 sisyphus+274226.100.1.2 1623349764 installed
<13>Jul 17 15:38:20 rpmi: maven-shared-utils-3.2.1-alt1_0.5jpp8 sisyphus+246399.100.1.3 1581811963 installed
<13>Jul 17 15:38:20 rpmi: plexus-containers-component-annotations-0:2.1.0-alt1_2jpp8 sisyphus+271667.100.1.2 1620842998 installed
<13>Jul 17 15:38:20 rpmi: javapackages-tools-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:20 rpmi: apache-commons-lang3-3.11-alt1_1jpp11 sisyphus+273230.100.1.3 1622536747 installed
<13>Jul 17 15:38:20 rpmi: maven-wagon-provider-api-0:3.4.2-alt1_1jpp11 sisyphus+274301.100.1.2 1623411458 installed
<13>Jul 17 15:38:20 rpmi: httpcomponents-core-4.4.12-alt2_4jpp11 sisyphus+272755.100.1.3 1622203893 installed
<13>Jul 17 15:38:20 rpmi: plexus-interpolation-0:1.26-alt1_2jpp8 sisyphus+259688.100.1.3 1602429799 installed
<13>Jul 17 15:38:20 rpmi: apache-commons-codec-0:1.15-alt1_2jpp11 sisyphus+274224.100.1.1 1623349252 installed
<13>Jul 17 15:38:20 rpmi: atinject-0:1-alt7_35.20100611svn86jpp11 sisyphus+273127.100.1.1 1622505755 installed
<13>Jul 17 15:38:20 rpmi: hawtjni-runtime-0:1.17-alt2_6jpp11 sisyphus+272754.100.1.1 1622202678 installed
<13>Jul 17 15:38:20 rpmi: xmvn-api-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:20 rpmi: xmvn-core-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:20 rpmi: maven-resolver-api-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:20 rpmi: maven-resolver-util-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:20 rpmi: maven-resolver-spi-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:20 rpmi: plexus-classworlds-0:2.6.0-alt1_2jpp8 sisyphus+277235.100.1.1 1625418667 installed
<13>Jul 17 15:38:21 rpmi: libpng16-1.6.37-alt1 sisyphus+275734.100.2.1 1624788812 installed
<13>Jul 17 15:38:21 rpmi: libexpat-2.2.10-alt1 sisyphus+276608.100.1.2 1625153360 installed
<13>Jul 17 15:38:21 rpmi: jansi-native-0:1.8-alt1_5jpp11 sisyphus+272805.100.1.1 1622235798 installed
<13>Jul 17 15:38:21 rpmi: objectweb-asm-0:8.0.1-alt1_1jpp8 sisyphus+273552.100.1.3 1622775772 installed
<13>Jul 17 15:38:21 rpmi: jcl-over-slf4j-0:1.7.30-alt1_6jpp11 sisyphus+272762.100.1.1 1622205309 installed
<13>Jul 17 15:38:21 rpmi: apache-commons-compress-0:1.20-alt1_4jpp11 sisyphus+273229.100.1.3 1622536418 installed
<13>Jul 17 15:38:21 rpmi: plexus-cipher-1.7-alt3_21jpp11 sisyphus+273202.100.1.3 1622529034 installed
<13>Jul 17 15:38:21 rpmi: xorg-proto-devel-2021.4-alt1 sisyphus+272146.100.1.1 1621424691 installed
<13>Jul 17 15:38:21 rpmi: perl-HTTP-Date-6.05-alt1 sisyphus+258981.100.1.1 1601542386 installed
<13>Jul 17 15:38:21 rpmi: libwayland-client-1.19.0-alt1 sisyphus+279023.100.1.1 1626353903 installed
<13>Jul 17 15:38:21 rpmi: libjpeg-2:2.0.6-alt3 sisyphus+276287.100.3.1 1625270467 installed
<13>Jul 17 15:38:21 rpmi: plexus-sec-dispatcher-1.4-alt4_29jpp8 sisyphus+246341.100.1.3 1581794923 installed
<13>Jul 17 15:38:21 rpmi: maven-resolver-impl-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:21 rpmi: maven-resolver-connector-basic-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:21 rpmi: maven-resolver-transport-wagon-1:1.4.2-alt1_5jpp11 sisyphus+274352.100.1.3 1623439213 installed
<13>Jul 17 15:38:21 rpmi: maven-wagon-file-0:3.4.2-alt1_1jpp11 sisyphus+274301.100.1.2 1623411458 installed
<13>Jul 17 15:38:21 rpmi: bouncycastle-0:1.67-alt1_2jpp11 sisyphus+274456.100.1.1 1623507400 installed
<13>Jul 17 15:38:21 rpmi: aopalliance-0:1.0-alt6_24jpp11 sisyphus+273120.100.1.1 1622505147 installed
<13>Jul 17 15:38:21 rpmi: apache-commons-cli-0:1.4-alt1_11jpp11 sisyphus+273121.100.1.2 1622505516 installed
<13>Jul 17 15:38:21 rpmi: apache-commons-collections-0:3.2.2-alt1_20jpp11 sisyphus+273122.100.1.2 1622506495 installed
<13>Jul 17 15:38:21 rpmi: apache-commons-logging-0:1.2-alt1_25jpp11 sisyphus+274279.100.1.1 1623401862 installed
<13>Jul 17 15:38:21 rpmi: beust-jcommander-1.78-alt1_2jpp11 sisyphus+271664.100.1.1 1620841453 installed
<13>Jul 17 15:38:21 rpmi: jakarta-annotations-1.3.5-alt1_6jpp11 sisyphus+273447.100.1.1 1622660923 installed
<13>Jul 17 15:38:21 rpmi: jsoup-1.13.1-alt1_4jpp11 sisyphus+273241.100.1.2 1622538491 installed
<13>Jul 17 15:38:21 rpmi: xml-commons-apis-1.4.01-alt3_32jpp11 sisyphus+273221.100.1.2 1622533297 installed
<13>Jul 17 15:38:21 rpmi: libICE-1.0.10-alt1 sisyphus+278827.100.1.1 1626220281 installed
<13>Jul 17 15:38:21 rpmi: liblksctp-1.0.17-alt2 sisyphus+278225.100.1.1 1626079186 installed
<13>Jul 17 15:38:22 rpmi: liblcms2-2.12-alt1 sisyphus+279091.100.1.1 1626376967 installed
<13>Jul 17 15:38:22 rpmi: perl-XML-NamespaceSupport-1.12-alt1 1491296348 installed
<13>Jul 17 15:38:22 rpmi: lksctp-tools-1.0.17-alt2 sisyphus+278225.100.1.1 1626079186 installed
<13>Jul 17 15:38:22 rpmi: libSM-1.2.3-alt1 sisyphus+278820.100.1.1 1626219266 installed
<13>Jul 17 15:38:22 rpmi: velocity-1:1.7-alt3_34jpp11 sisyphus+274345.100.1.1 1623428648 installed
<13>Jul 17 15:38:22 rpmi: jansi1-1.18-alt1_7jpp11 sisyphus+273628.100.1.1 1622833059 installed
<13>Jul 17 15:38:22 rpmi: xmvn-connector-aether-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:22 rpmi: java-common-1.6.0-alt1 sisyphus+234020.100.1.1 1562437039 installed
<13>Jul 17 15:38:22 rpmi: maven-artifact-1:2.2.1-alt6_66jpp11 sisyphus+273191.100.1.3 1622524930 installed
<13>Jul 17 15:38:22 rpmi: plexus-build-api-0:0.0.7-alt3_30jpp11 sisyphus+273406.100.1.2 1622642004 installed
<13>Jul 17 15:38:22 rpmi: osgi-core-7.0.0-alt2_3jpp8 sisyphus+276700.100.1.3 1625194607 installed
<13>Jul 17 15:38:22 rpmi: jsr-305-1:0-alt4_0.30.20130910svnjpp11 sisyphus+272808.100.1.1 1622236481 installed
<13>Jul 17 15:38:22 rpmi: guava-25.0-alt1_9jpp8 sisyphus+273532.100.1.2 1622748943 installed
<13>Jul 17 15:38:22 rpmi: google-guice-0:4.2.3-alt1_3jpp11 sisyphus+273238.100.1.2 1622537473 installed
<13>Jul 17 15:38:22 rpmi: jackson-annotations-2.11.4-alt1_2jpp11 sisyphus+274233.100.1.1 1623354463 installed
<13>Jul 17 15:38:22 rpmi: jackson-core-2.11.4-alt1_2jpp11 sisyphus+274413.100.1.1 1623482838 installed
<13>Jul 17 15:38:22 rpmi: jetty-util-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:22 rpmi: jzlib-0:1.1.3-alt1_15jpp11 sisyphus+273183.100.1.2 1622521960 installed
<13>Jul 17 15:38:22 rpmi: libpcsclite-1.9.1-alt1 sisyphus+272153.100.1.1 1621432421 installed
<13>Jul 17 15:38:22 rpmi: javazi-2021a-alt1 sisyphus+265526.200.1.1 1612068684 installed
<13>Jul 17 15:38:22 rpmi: libgif-4.1.6-alt3 sisyphus+276911.100.1.3 1625273983 installed
<13>Jul 17 15:38:22 rpmi: libnettle8-3.7.3-alt1 sisyphus+276723.100.1.2 1625211849 installed
<13>Jul 17 15:38:22 rpmi: perl-LWP-MediaTypes-6.04-alt1 sisyphus+225468.100.1.1 1553186684 installed
<13>Jul 17 15:38:22 rpmi: perl-Compress-Raw-Zlib-2.101-alt1 sisyphus+274516.500.1.1 1623612570 installed
<13>Jul 17 15:38:22 rpmi: perl-libnet-1:3.13-alt1 sisyphus+266120.100.1.1 1612961310 installed
<13>Jul 17 15:38:22 rpmi: perl-XML-SAX-Base-1.09-alt1 1494364363 installed
<13>Jul 17 15:38:22 rpmi: libfribidi-1.0.10-alt1 sisyphus+277991.100.1.1 1625932304 installed
<13>Jul 17 15:38:22 rpmi: libepoxy-1.5.8-alt1 sisyphus+272329.100.1.1 1621614013 installed
<13>Jul 17 15:38:22 rpmi: libglvnd-7:1.3.3-alt1 sisyphus+271643.100.1.1 1620829930 installed
<13>Jul 17 15:38:22 rpmi: libwayland-server-1.19.0-alt1 sisyphus+279023.100.1.1 1626353903 installed
<13>Jul 17 15:38:22 rpmi: libdevmapper-1.02.177-alt1 sisyphus+271927.100.1.1 1621108961 installed
<13>Jul 17 15:38:22 rpmi: msulogin-1.0-alt1 sisyphus+278100.4500.1.1 1626060393 installed
<13>Jul 17 15:38:22 rpmi: mount-2.36.1-alt2 sisyphus+278158.1600.1.1 1626051520 installed
<13>Jul 17 15:38:22 rpmi: libp11-kit-0.23.15-alt2 sisyphus+278382.100.1.2 1626190687 installed
<13>Jul 17 15:38:22 rpmi: libtasn1-4.17.0-alt1 sisyphus+276722.100.1.1 1625211286 installed
<13>Jul 17 15:38:22 rpmi: liblz4-1:1.9.3-alt1 sisyphus+278100.4000.1.1 1626060252 installed
<13>Jul 17 15:38:22 rpmi: sysvinit-2.88-alt6 sisyphus+278158.1500.1.1 1626051212 installed
<13>Jul 17 15:38:22 rpmi: libhogweed6-3.7.3-alt1 sisyphus+276723.100.1.2 1625211849 installed
<13>Jul 17 15:38:23 rpmi: jsch-0:0.1.55-alt1_2jpp11 sisyphus+274235.100.1.1 1623354458 installed
<13>Jul 17 15:38:23 rpmi: jetty-io-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:23 rpmi: jetty-http-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:23 rpmi: jetty-util-ajax-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:23 rpmi: jackson-databind-2.11.4-alt1_2jpp11 sisyphus+274416.100.1.1 1623483500 installed
<13>Jul 17 15:38:23 rpmi: plexus-velocity-0:1.2-alt1_11jpp11 sisyphus+273203.100.1.2 1622529304 installed
<13>Jul 17 15:38:23 rpmi: libICE-devel-1.0.10-alt1 sisyphus+278827.100.1.1 1626220281 installed
<13>Jul 17 15:38:23 rpmi: libSM-devel-1.2.3-alt1 sisyphus+278820.100.1.1 1626219266 installed
<13>Jul 17 15:38:23 rpmi: jakarta-interceptors-2.0.0-alt1_2jpp11 sisyphus+273641.100.1.1 1622842827 installed
<13>Jul 17 15:38:23 rpmi: xmvn-install-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:23 rpmi: xmvn-subst-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:23 rpmi: xmvn-resolve-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:23 rpmi: bouncycastle-pg-0:1.67-alt1_2jpp11 sisyphus+274456.100.1.1 1623507400 installed
<13>Jul 17 15:38:23 rpmi: bouncycastle-pkix-0:1.67-alt1_2jpp11 sisyphus+274456.100.1.1 1623507400 installed
<13>Jul 17 15:38:23 rpmi: libwayland-cursor-1.19.0-alt1 sisyphus+279023.100.1.1 1626353903 installed
<13>Jul 17 15:38:23 rpmi: libwayland-egl-4:18.1.0-alt1 sisyphus+279023.100.1.1 1626353903 installed
<13>Jul 17 15:38:23 rpmi: perl-File-Listing-6.14-alt1 sisyphus+262735.100.1.1 1606813544 installed
<13>Jul 17 15:38:23 rpmi: byte-buddy-1.10.14-alt1_1jpp11 sisyphus+273574.100.1.1 1622798750 installed
<13>Jul 17 15:38:23 rpmi: assertj-core-3.17.2-alt1_2jpp11 sisyphus+274229.100.1.2 1623350479 installed
<13>Jul 17 15:38:23 rpmi: maven-dependency-tree-3.0.1-alt1_2jpp8 sisyphus+259678.100.1.2 1602424481 installed
<13>Jul 17 15:38:23 rpmi: xmvn-mojo-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:23 rpmi: xml-commons-resolver-0:1.2-alt1_32jpp11 sisyphus+273222.100.1.2 1622533290 installed
<13>Jul 17 15:38:23 rpmi: xerces-j2-0:2.12.1-alt1_3jpp11 sisyphus+274489.100.1.1 1623586393 installed
<13>Jul 17 15:38:24 rpmi: xalan-j2-0:2.7.2-alt1_6jpp8 sisyphus+273510.100.1.2 1622734263 installed
<13>Jul 17 15:38:24 rpmi: plexus-compiler-0:2.8.8-alt1_1jpp11 sisyphus+273250.100.1.3 1622545628 installed
<13>Jul 17 15:38:24 rpmi: plexus-io-0:3.2.0-alt1_2jpp11 sisyphus+271692.100.1.1 1620847533 installed
<13>Jul 17 15:38:24 rpmi: apache-sshd-1:2.6.0-alt1_2jpp11 sisyphus+274571.100.1.1 1623750849 installed
<13>Jul 17 15:38:24 rpmi: maven-model-1:2.2.1-alt6_66jpp11 sisyphus+273191.100.1.3 1622524930 installed
<13>Jul 17 15:38:24 rpmi: ant-lib-0:1.10.9-alt1_2jpp11 sisyphus+274424.100.1.1 1623486674 installed
<13>Jul 17 15:38:24 rpmi: osgi-annotation-7.0.0-alt2_4jpp8 sisyphus+276699.100.1.2 1625193395 installed
<13>Jul 17 15:38:24 rpmi: osgi-compendium-7.0.0-alt1_9jpp11 sisyphus+276612.100.1.2 1625154231 installed
<13>Jul 17 15:38:24 rpmi: aqute-bndlib-0:4.3.1-alt1_4jpp11 sisyphus+274304.100.1.3 1623416095 installed
<13>Jul 17 15:38:24 rpmi: args4j-2.33-alt1_14jpp11 sisyphus+274481.100.1.1 1623570332 installed
<13>Jul 17 15:38:24 rpmi: jakarta-el-api-4.0.0-alt1_3jpp11 sisyphus+273640.100.1.1 1622842593 installed
<13>Jul 17 15:38:25 rpmi: cdi-api-2.0-alt1_2jpp11 sisyphus+274412.100.1.1 1623481660 installed
<13>Jul 17 15:38:25 rpmi: sisu-inject-2:0.3.4-alt1_3jpp11 sisyphus+273253.100.1.2 1622546747 installed
<13>Jul 17 15:38:25 rpmi: sisu-plexus-2:0.3.4-alt1_3jpp11 sisyphus+273253.100.1.2 1622546747 installed
<13>Jul 17 15:38:25 rpmi: dain-snappy-0.4-alt1_9jpp8 sisyphus+246459.100.1.2 1581844027 installed
<13>Jul 17 15:38:25 rpmi: ed25519-java-0.3.0-alt1_8jpp8 sisyphus+273535.100.1.2 1622749210 installed
<13>Jul 17 15:38:25 rpmi: felix-utils-1.11.6-alt1_1jpp11 sisyphus+274298.100.1.1 1623410432 installed
<13>Jul 17 15:38:25 rpmi: geronimo-annotation-1.0-alt4_28jpp11 sisyphus+273589.100.1.1 1622805200 installed
<13>Jul 17 15:38:25 rpmi: google-gson-2.8.6-alt1_7jpp11 sisyphus+273150.100.1.2 1622512245 installed
<13>Jul 17 15:38:25 rpmi: hamcrest-core-0:1.3-alt3_30jpp11 sisyphus+273151.100.1.2 1622513108 installed
<13>Jul 17 15:38:25 rpmi: junit-1:4.13-alt1_2jpp11 sisyphus+273410.100.1.2 1622643091 installed
<13>Jul 17 15:38:25 rpmi: jakarta-activation-1.2.2-alt1_1jpp11 sisyphus+273597.100.1.1 1622818209 installed
<13>Jul 17 15:38:25 rpmi: log4j-0:2.13.3-alt1_3jpp11 sisyphus+274350.100.1.2 1623438514 installed
<13>Jul 17 15:38:25 rpmi: xbean-0:4.15-alt2_7jpp11 sisyphus+274346.100.1.2 1623437581 installed
<13>Jul 17 15:38:25 rpmi: plexus-containers-container-default-0:2.1.0-alt1_2jpp8 sisyphus+271667.100.1.2 1620842998 installed
<13>Jul 17 15:38:25 rpmi: maven-doxia-logging-api-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:25 rpmi: maven-doxia-sink-api-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:25 rpmi: maven-reporting-api-1:3.0-alt3_18jpp8 sisyphus+246392.100.1.2 1581808388 installed
<13>Jul 17 15:38:25 rpmi: plexus-i18n-0:1.0-alt7_0.15.b10.4jpp8 sisyphus+246340.100.1.2 1581794394 installed
<13>Jul 17 15:38:25 rpmi: jakarta-servlet-5.0.0-alt1_5jpp11 sisyphus+273696.100.1.1 1622898704 installed
<13>Jul 17 15:38:25 rpmi: jetty-server-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:25 rpmi: jetty-security-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:25 rpmi: jetty-servlet-9.4.40-alt1_1jpp11 sisyphus+274581.100.1.1 1623753665 installed
<13>Jul 17 15:38:25 rpmi: jansi-0:2.1.1-alt1_3jpp11 sisyphus+274547.100.1.1 1623702784 installed
<13>Jul 17 15:38:25 rpmi: javaewah-1.1.6-alt1_11jpp11 sisyphus+274325.100.1.2 1623422510 installed
<13>Jul 17 15:38:25 rpmi: univocity-parsers-2.9.1-alt1_1jpp11 sisyphus+274272.100.1.1 1623399005 installed
<13>Jul 17 15:38:25 rpmi: opentest4j-1.2.0-alt1_5jpp11 sisyphus+274354.100.1.2 1623440310 installed
<13>Jul 17 15:38:25 rpmi: junit5-5.7.1-alt1_1jpp11 sisyphus+274236.100.1.1 1623354831 installed
<13>Jul 17 15:38:25 rpmi: maven-filesystem-0.01-alt2.1 1460115697 installed
<13>Jul 17 15:38:25 rpmi: xz-java-1.8-alt1_9jpp11 sisyphus+273227.100.1.3 1622535646 installed
<13>Jul 17 15:38:25 rpmi: plexus-archiver-0:4.2.4-alt1_1jpp11 sisyphus+274251.100.1.2 1623366271 installed
<13>Jul 17 15:38:25 rpmi: qdox-1:2.0-alt1_8.M9jpp11 sisyphus+271044.100.1.2 1619790963 installed
<13>Jul 17 15:38:25 rpmi: plexus-languages-1.0.6-alt1_1jpp11 sisyphus+274246.100.1.3 1623365314 installed
<13>Jul 17 15:38:25 rpmi: rpm-macros-java-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:25 rpmi: libxslt-1.1.34-alt3 sisyphus+275636.100.1.1 1624616871 installed
<13>Jul 17 15:38:25 rpmi: libgdbm-1.8.3-alt10 sisyphus+278100.1600.1.1 1626059138 installed
<13>Jul 17 15:38:26 rpmi: libgtk+2-locales-2.24.33-alt1 sisyphus+278555.100.1.2 1626252653 installed
<13>Jul 17 15:38:26 rpmi: icon-theme-hicolor-0.17-alt2 sisyphus+248343.100.1.1 1584979043 installed
<13>Jul 17 15:38:26 rpmi: publicsuffix-list-20210419-alt1 sisyphus+270358.100.1.1 1618924010 installed
<13>Jul 17 15:38:26 rpmi: httpcomponents-client-4.5.10-alt2_6jpp11 sisyphus+274321.100.1.1 1623418886 installed
<13>Jul 17 15:38:26 rpmi: maven-doxia-core-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:26 rpmi: maven-wagon-http-shared-0:3.4.2-alt1_1jpp11 sisyphus+274301.100.1.2 1623411458 installed
<13>Jul 17 15:38:26 rpmi: maven-wagon-http-0:3.4.2-alt1_1jpp11 sisyphus+274301.100.1.2 1623411458 installed
<13>Jul 17 15:38:26 rpmi: xmvn-minimal-3.1.0-alt1_7jpp11 sisyphus+273225.100.1.2 1622534854 installed
<13>Jul 17 15:38:26 rpmi: maven-1:3.6.3-alt2_8jpp11 sisyphus+274415.100.1.2 1623484034 installed
<13>Jul 17 15:38:26 rpmi: maven-lib-1:3.6.3-alt2_8jpp11 sisyphus+274415.100.1.2 1623484034 installed
<13>Jul 17 15:38:26 rpmi: maven-archiver-0:3.5.1-alt1_1jpp11 sisyphus+274299.100.1.3 1623411167 installed
<13>Jul 17 15:38:26 rpmi: maven-common-artifact-filters-3.1.1-alt1_1jpp11 sisyphus+274300.100.1.1 1623410639 installed
<13>Jul 17 15:38:26 rpmi: maven-artifact-transfer-1:0.11.0-alt1_2jpp11 sisyphus+272708.100.1.1 1622187498 installed
<13>Jul 17 15:38:26 rpmi: maven-shared-incremental-1.1-alt1_18jpp8 sisyphus+246396.100.1.2 1581810480 installed
<13>Jul 17 15:38:26 rpmi: maven-compiler-plugin-3.8.1-alt1_7jpp11 sisyphus+273193.100.1.3 1622525668 installed
<13>Jul 17 15:38:26 rpmi: maven-shared-io-1:3.0.0-alt1_9jpp8 sisyphus+246397.100.1.3 1581811452 installed
<13>Jul 17 15:38:26 rpmi: maven-file-management-1:3.0.0-alt1_9jpp8 sisyphus+246379.100.1.2 1581805203 installed
<13>Jul 17 15:38:26 rpmi: maven-jar-plugin-3.2.0-alt1_2jpp11 sisyphus+271804.100.1.1 1620931252 installed
<13>Jul 17 15:38:26 rpmi: maven-filtering-3.2.0-alt1_1jpp11 sisyphus+273246.100.1.3 1622540283 installed
<13>Jul 17 15:38:26 rpmi: maven-resources-plugin-3.2.0-alt1_1jpp11 sisyphus+273394.100.1.1 1622636638 installed
<13>Jul 17 15:38:26 rpmi: maven-toolchain-1:2.2.1-alt6_66jpp11 sisyphus+273191.100.1.3 1622524930 installed
<13>Jul 17 15:38:27 rpmi: maven-surefire-0:3.0.0_M4-alt1_1jpp11 sisyphus+274450.100.1.1 1623506012 installed
<13>Jul 17 15:38:27 rpmi: maven-surefire-provider-junit-0:3.0.0_M4-alt1_1jpp11 sisyphus+274450.100.1.1 1623506012 installed
<13>Jul 17 15:38:27 rpmi: maven-surefire-provider-testng-0:3.0.0_M4-alt1_1jpp11 sisyphus+274450.100.1.1 1623506012 installed
<13>Jul 17 15:38:27 rpmi: maven-surefire-provider-junit5-0:3.0.0_M4-alt1_1jpp11 sisyphus+274450.100.1.1 1623506012 installed
<13>Jul 17 15:38:27 rpmi: maven-surefire-plugin-0:3.0.0_M4-alt1_1jpp11 sisyphus+274450.100.1.1 1623506012 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-module-apt-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-module-fml-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-module-xdoc-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-module-xhtml-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-module-xhtml5-0:1.9.1-alt1_3jpp11 sisyphus+273319.100.1.1 1622570581 installed
<13>Jul 17 15:38:27 rpmi: maven-doxia-sitetools-0:1.9.2-alt1_3jpp8 sisyphus+273550.100.1.2 1622752170 installed
<13>Jul 17 15:38:27 rpmi: libxkbcommon-1.3.0-alt1 sisyphus+271208.160.6.1 1620770422 installed
<13>Jul 17 15:38:27 rpmi: libidn2-2.3.1-alt1 sisyphus+272590.100.1.1 1622036905 installed
<13>Jul 17 15:38:27 rpmi: libgnutls30-3.6.16-alt1 sisyphus+273086.100.1.1 1622478374 installed
<13>Jul 17 15:38:27 rpmi: libsqlite3-3.35.5-alt1 sisyphus+270436.100.1.1 1619019903 installed
<13>Jul 17 15:38:27 rpmi: libusb-1.0.24-alt1 sisyphus+271858.200.2.1 1621003094 installed
<13>Jul 17 15:38:27 rpmi: libgudev-1:236-alt1 sisyphus+279257.100.1.1 1626461217 installed
<13>Jul 17 15:38:27 rpmi: perl-Try-Tiny-0.30-alt1 1514318058 installed
<13>Jul 17 15:38:27 rpmi: perl-IO-Socket-IP-0.41-alt1 sisyphus+259012.100.1.2 1601553446 installed
<13>Jul 17 15:38:27 rpmi: perl-Compress-Raw-Bzip2-2.101-alt1 sisyphus+274516.600.1.1 1623612595 installed
<13>Jul 17 15:38:27 rpmi: perl-HTML-Tagset-3.20-alt2 1317725093 installed
<13>Jul 17 15:38:27 rpmi: perl-Term-ANSIColor-5.01-alt1 sisyphus+244783.100.1.2 1579747505 installed
<13>Jul 17 15:38:27 rpmi: perl-Data-Dump-1.25-alt1 sisyphus+276551.100.1.1 1625126880 installed
<13>Jul 17 15:38:27 rpmi: perl-Filter-1.60-alt1 sisyphus+274516.300.1.1 1623612456 installed
<13>Jul 17 15:38:27 rpmi: perl-Encode-3.10-alt1 sisyphus+274516.400.1.1 1623612533 installed
<13>Jul 17 15:38:27 rpmi: perl-URI-5.09-alt1 sisyphus+267398.100.1.1 1614944505 installed
<13>Jul 17 15:38:27 rpmi: perl-IO-Compress-2.102-alt1 sisyphus+278038.1500.1.2 1625983088 installed
<13>Jul 17 15:38:27 rpmi: perl-Net-HTTP-6.21-alt1 sisyphus+268278.100.1.1 1616563972 installed
<13>Jul 17 15:38:27 rpmi: perl-HTML-Parser-3.76-alt1 sisyphus+274516.700.1.1 1623612625 installed
<13>Jul 17 15:38:27 rpmi: perl-WWW-RobotRules-6.02-alt1 1329756211 installed
<13>Jul 17 15:38:27 rpmi: perl-Encode-Locale-1.05-alt1 1444608613 installed
<13>Jul 17 15:38:27 rpmi: perl-IO-HTML-1.004-alt1 sisyphus+258983.100.1.1 1601542619 installed
<13>Jul 17 15:38:27 rpmi: perl-HTTP-Message-6.33-alt1 sisyphus+276556.100.1.1 1625127547 installed
<13>Jul 17 15:38:27 rpmi: perl-HTTP-Cookies-6.10-alt1 sisyphus+264349.100.1.1 1609891183 installed
<13>Jul 17 15:38:27 rpmi: perl-HTTP-Negotiate-6.01-alt1 1329760563 installed
<13>Jul 17 15:38:27 rpmi: perl-libwww-6.55-alt1 sisyphus+278038.4100.1.2 1625984005 installed
<13>Jul 17 15:38:27 rpmi: perl-XML-LibXML-2.0207-alt4 sisyphus+275655.100.1.1 1624663956 installed
<13>Jul 17 15:38:27 rpmi: perl-XML-SAX-1.02-alt1 sisyphus+232322.100.1.1 1560758406 installed
<13>Jul 17 15:38:27 rpmi: perl-XML-Simple-2.25-alt2 sisyphus+257498.100.1.1 1599324034 installed
<13>Jul 17 15:38:27 rpmi: icon-naming-utils-0.8.90-alt1 sisyphus+276851.100.1.1 1625243947 installed
<13>Jul 17 15:38:28 rpmi: icon-theme-adwaita-40.1.1-alt1 sisyphus+271235.100.1.1 1620162669 installed
<13>Jul 17 15:38:28 rpmi: libdatrie-0.2.9-alt1_6 sisyphus+278217.100.1.1 1626078473 installed
<13>Jul 17 15:38:28 rpmi: libthai-0.1.28-alt1_1 sisyphus+275403.100.1.2 1624502531 installed
<13>Jul 17 15:38:28 rpmi: libpixman-3:0.40.0-alt1 sisyphus+278367.100.1.1 1626092794 installed
<13>Jul 17 15:38:28 rpmi: libbrotlicommon-1.0.9-alt2 sisyphus+278430.100.1.2 1626213212 installed
<13>Jul 17 15:38:28 rpmi: libbrotlidec-1.0.9-alt2 sisyphus+278430.100.1.2 1626213212 installed
<13>Jul 17 15:38:28 rpmi: libgraphite2-1.3.14-alt2.1 sisyphus+271676.700.1.1 1622384689 installed
<13>Jul 17 15:38:29 rpmi: libharfbuzz-2.8.1-alt1 sisyphus+274089.200.2.1 1623239904 installed
<13>Jul 17 15:38:29 rpmi: libfreetype-2.10.4-alt2 sisyphus+278003.100.1.2 1625973065 installed
<13>Jul 17 15:38:29 rpmi: fontconfig-2.13.1-alt1 sisyphus+278837.100.1.3 1626287494 installed
Updating fonts cache: <29>Jul 17 15:38:30 fontconfig: Updating fonts cache: succeeded
[ DONE ]
<13>Jul 17 15:38:30 rpmi: fonts-type1-xorg-7.0.0-alt4 sisyphus+276845.100.1.1 1625243059 installed
<13>Jul 17 15:38:30 rpmi: libxshmfence-1.3-alt1 sisyphus+278248.100.1.1 1626080763 installed
<13>Jul 17 15:38:30 rpmi: libpciaccess-1:0.16-alt1 sisyphus+278288.100.1.1 1626084208 installed
<13>Jul 17 15:38:30 rpmi: libdrm-1:2.4.107-alt1 sisyphus+278970.100.1.1 1626340427 installed
<13>Jul 17 15:38:30 rpmi: libgbm-4:21.1.5-alt1 sisyphus+278970.200.1.1 1626340871 installed
<13>Jul 17 15:38:30 rpmi: libwebp7-1.2.0-alt2 sisyphus+273452.100.1.1 1622693700 installed
<13>Jul 17 15:38:30 rpmi: libjbig-2.1-alt1 sisyphus+276068.100.1.1 1624815406 installed
<13>Jul 17 15:38:30 rpmi: libtiff5-4.2.0-alt1 sisyphus+279102.100.1.1 1626378268 installed
<13>Jul 17 15:38:30 rpmi: libgdk-pixbuf-locales-2.42.6-alt1 sisyphus+277964.100.1.1 1625927113 installed
<13>Jul 17 15:38:30 rpmi: gtk+3-themes-incompatible-3.20-alt3 1461944560 installed
<13>Jul 17 15:38:30 rpmi: libiptables-1.8.7-alt1 sisyphus+278100.2500.1.1 1626059429 installed
<13>Jul 17 15:38:30 rpmi: libjson-c5-0.15-alt1.1 sisyphus+269879.7500.52.1 1622226393 installed
<13>Jul 17 15:38:30 rpmi: libargon2-20190702-alt1 sisyphus+278291.100.1.1 1626084495 installed
<13>Jul 17 15:38:30 rpmi: hwclock-1:2.36.1-alt2 sisyphus+278158.1600.1.1 1626051520 installed
<13>Jul 17 15:38:30 rpmi: hashalot-0.3-alt1.qa1 sisyphus+276065.100.2.3 1624921317 installed
<13>Jul 17 15:38:30 rpmi: losetup-2.36.1-alt2 sisyphus+278158.1600.1.1 1626051520 installed
<13>Jul 17 15:38:30 rpmi: lsblk-2.36.1-alt2 sisyphus+278158.1600.1.1 1626051520 installed
<13>Jul 17 15:38:30 rpmi: libatk-locales-2.36.0-alt1 sisyphus+275092.100.2.1 1624560096 installed
<13>Jul 17 15:38:30 rpmi: libatk-2.36.0-alt1 sisyphus+275092.100.2.1 1624560101 installed
<13>Jul 17 15:38:30 rpmi: shared-mime-info-2.1-alt1 sisyphus+278982.100.1.1 1626350327 installed
<13>Jul 17 15:38:30 rpmi: gsettings-desktop-schemas-data-40.0-alt1 sisyphus+268501.300.4.2 1617041783 installed
<13>Jul 17 15:38:31 rpmi: libgio-2.68.3-alt1 sisyphus+278158.100.1.1 1626049671 installed
<13>Jul 17 15:38:31 rpmi: gsettings-desktop-schemas-40.0-alt1 sisyphus+268501.300.4.2 1617041559 installed
<13>Jul 17 15:38:31 rpmi: libgdk-pixbuf-2.42.6-alt1 sisyphus+277964.100.1.1 1625927159 installed
<13>Jul 17 15:38:31 rpmi: gtk-update-icon-cache-3.24.30-alt1 sisyphus+277720.100.1.1 1625768759 installed
<13>Jul 17 15:38:31 rpmi: libgusb-0.3.7-alt1 sisyphus+272535.100.1.1 1622007552 installed
<13>Jul 17 15:38:31 rpmi: libcolord-1.4.5-alt2 sisyphus+264292.100.1.1 1609619010 installed
<13>Jul 17 15:38:31 rpmi: libdconf-0.40.0-alt1 sisyphus+279299.100.1.2 1626495975 installed
<13>Jul 17 15:38:31 rpmi: libgpg-error-1.42-alt1 sisyphus+275524.40.1.1 1624455836 installed
<13>Jul 17 15:38:31 rpmi: libgcrypt20-1.9.3-alt1 sisyphus+275524.100.1.1 1624456196 installed
<13>Jul 17 15:38:31 rpmi: libsystemd-1:249-alt1 sisyphus+277787.200.2.1 1625952282 installed
<13>Jul 17 15:38:31 rpmi: libdbus-1.12.18-alt1 sisyphus+275285.100.2.2 1624573331 installed
<13>Jul 17 15:38:31 rpmi: dbus-tools-1.12.18-alt1 sisyphus+275285.100.2.2 1624573331 installed
<86>Jul 17 15:38:31 groupadd[2476158]: group added to /etc/group: name=messagebus, GID=499
<86>Jul 17 15:38:31 groupadd[2476158]: group added to /etc/gshadow: name=messagebus
<86>Jul 17 15:38:31 groupadd[2476158]: new group: name=messagebus, GID=499
<86>Jul 17 15:38:31 useradd[2476181]: new user: name=messagebus, UID=499, GID=499, home=/run/dbus, shell=/dev/null
<13>Jul 17 15:38:31 rpmi: dbus-1.12.18-alt1 sisyphus+275285.100.2.2 1624573331 installed
<13>Jul 17 15:38:31 rpmi: dconf-0.40.0-alt1 sisyphus+279299.100.1.2 1626495975 installed
<13>Jul 17 15:38:31 rpmi: libgtk+3-schemas-3.24.30-alt1 sisyphus+277720.100.1.1 1625768792 installed
<13>Jul 17 15:38:31 rpmi: libavahi-0.8-alt2 sisyphus+270871.100.1.1 1619610383 installed
<13>Jul 17 15:38:31 rpmi: libcups-2.3.3-alt6.op2 sisyphus+274028.100.1.1 1623149062 installed
<13>Jul 17 15:38:31 rpmi: libpolkit-0.119-alt1 sisyphus+273570.100.1.1 1622791451 installed
<13>Jul 17 15:38:31 rpmi: libX11-locales-3:1.7.2-alt1 sisyphus+273971.100.1.1 1623132019 installed
<13>Jul 17 15:38:31 rpmi: libXdmcp-1.1.3-alt1 sisyphus+278816.100.1.1 1626219233 installed
<13>Jul 17 15:38:31 rpmi: libXau-1.0.9-alt1 sisyphus+278247.100.1.1 1626080738 installed
<13>Jul 17 15:38:31 rpmi: libxcb-1.14-alt1 sisyphus+277968.100.1.3 1625952333 installed
<13>Jul 17 15:38:31 rpmi: libX11-3:1.7.2-alt1 sisyphus+273971.100.1.1 1623132050 installed
<13>Jul 17 15:38:31 rpmi: libXext-1.3.4-alt1 sisyphus+278817.100.1.3 1626262589 installed
<13>Jul 17 15:38:31 rpmi: libXrender-0.9.10-alt1 sisyphus+278480.100.1.2 1626227741 installed
<13>Jul 17 15:38:31 rpmi: libXi-1.7.10-alt1 sisyphus+278284.100.1.2 1626151193 installed
<13>Jul 17 15:38:31 rpmi: libXfixes-5.0.3-alt1 sisyphus+275326.100.2.2 1624573639 installed
<13>Jul 17 15:38:31 rpmi: libXcomposite-0.4.5-alt1 sisyphus+275323.100.2.2 1624573270 installed
<13>Jul 17 15:38:31 rpmi: libXtst-1.2.3-alt1 sisyphus+278848.100.1.2 1626298057 installed
<13>Jul 17 15:38:31 rpmi: libXcursor-1.2.0-alt1 sisyphus+278256.100.1.2 1626134584 installed
<13>Jul 17 15:38:31 rpmi: libat-spi2-core-2.40.3-alt1 sisyphus+277858.100.1.1 1625849867 installed
<13>Jul 17 15:38:31 rpmi: libXrandr-1.5.2-alt1 sisyphus+275330.100.2.2 1624575560 installed
<13>Jul 17 15:38:31 rpmi: libXinerama-1.1.4-alt1 sisyphus+275328.100.2.2 1624575558 installed
<13>Jul 17 15:38:31 rpmi: libXdamage-1.1.5-alt1 sisyphus+275324.100.2.2 1624573270 installed
<13>Jul 17 15:38:31 rpmi: libXft-2.3.3-alt1 sisyphus+278258.100.1.2 1626135738 installed
<13>Jul 17 15:38:31 rpmi: libXxf86vm-1.1.4-alt2 sisyphus+275334.100.2.2 1624577012 installed
<13>Jul 17 15:38:31 rpmi: libGLX-mesa-4:21.1.5-alt1 sisyphus+278970.200.1.1 1626340871 installed
<13>Jul 17 15:38:31 rpmi: libEGL-mesa-4:21.1.5-alt1 sisyphus+278970.200.1.1 1626340871 installed
<13>Jul 17 15:38:31 rpmi: libEGL-7:1.3.3-alt1 sisyphus+271643.100.1.1 1620829930 installed
<13>Jul 17 15:38:31 rpmi: libGLX-7:1.3.3-alt1 sisyphus+271643.100.1.1 1620829930 installed
<13>Jul 17 15:38:31 rpmi: libGL-7:1.3.3-alt1 sisyphus+271643.100.1.1 1620829930 installed
<13>Jul 17 15:38:31 rpmi: libcairo-1:1.16.0-alt1 sisyphus+275343.100.2.3 1624578031 installed
<13>Jul 17 15:38:31 rpmi: libpango-1.48.5-alt1 sisyphus+272129.100.1.1 1621411753 installed
<13>Jul 17 15:38:32 rpmi: libgtk+2-2.24.33-alt1 sisyphus+278555.100.1.2 1626252537 installed
<13>Jul 17 15:38:32 rpmi: libgail-2.24.33-alt1 sisyphus+278555.100.1.2 1626252537 installed
<13>Jul 17 15:38:32 rpmi: libcairo-gobject-1:1.16.0-alt1 sisyphus+275343.100.2.3 1624578031 installed
<13>Jul 17 15:38:32 rpmi: dbus-tools-gui-1.12.18-alt1 sisyphus+275285.100.2.2 1624573331 installed
<13>Jul 17 15:38:32 rpmi: at-spi2-core-2.40.3-alt1 sisyphus+277858.100.1.1 1625849867 installed
<13>Jul 17 15:38:32 rpmi: at-spi2-atk-2.38.0-alt1 sisyphus+277983.100.1.2 1625960722 installed
<13>Jul 17 15:38:32 rpmi: libXt-1.2.1-alt1 sisyphus+265202.200.1.1 1611565459 installed
<13>Jul 17 15:38:34 rpmi: libxcb-devel-1.14-alt1 sisyphus+277968.100.1.3 1625952333 installed
<13>Jul 17 15:38:34 rpmi: libX11-devel-3:1.7.2-alt1 sisyphus+273971.100.1.1 1623132050 installed
<13>Jul 17 15:38:34 rpmi: libXt-devel-1.2.1-alt1 sisyphus+265202.200.1.1 1611565459 installed
<13>Jul 17 15:38:34 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+278157.100.2.1 1626055790 installed
<13>Jul 17 15:38:34 rpmi: alternatives-0.5.1-alt1 sisyphus+278157.100.2.1 1626055790 installed
<13>Jul 17 15:38:34 rpmi: ca-certificates-2021.06.03-alt1 sisyphus+273509.400.1.1 1622736045 installed
<13>Jul 17 15:38:34 rpmi: ca-trust-0.1.2-alt1 sisyphus+233348.100.1.1 1561653823 installed
<13>Jul 17 15:38:34 rpmi: p11-kit-trust-0.23.15-alt2 sisyphus+278382.100.1.2 1626190687 installed
<13>Jul 17 15:38:34 rpmi: libcrypto1.1-1.1.1k-alt1 sisyphus+279286.100.1.1 1626469643 installed
<13>Jul 17 15:38:34 rpmi: libkmod-27.0.9.f5434cf-alt1 sisyphus+278393.100.1.2 1626199724 installed
<13>Jul 17 15:38:34 rpmi: ca-trust-java-0.1.2-alt1 sisyphus+233348.100.1.1 1561653823 installed
<13>Jul 17 15:38:38 rpmi: java-1.8.0-openjdk-headless-0:1.8.0.282.b08-alt1_0jpp8 sisyphus+265746.200.3.1 1612407392 installed
<13>Jul 17 15:38:39 rpmi: kmod-27.0.9.f5434cf-alt1 sisyphus+278393.100.1.2 1626199724 installed
<13>Jul 17 15:38:39 rpmi: libcryptsetup-2.3.5-alt1 sisyphus+279260.100.1.1 1626461618 installed
<13>Jul 17 15:38:39 rpmi: startup-0.9.9.11-alt1 sisyphus+265313.200.3.1 1612018510 installed
<13>Jul 17 15:38:40 rpmi: systemd-utils-1:249-alt1 sisyphus+277787.200.2.1 1625952282 installed
<13>Jul 17 15:38:40 rpmi: dmsetup-1.02.177-alt1 sisyphus+271927.100.1.1 1621108961 installed
<86>Jul 17 15:38:40 groupadd[2491582]: group added to /etc/group: name=tape, GID=498
<86>Jul 17 15:38:40 groupadd[2491582]: group added to /etc/gshadow: name=tape
<86>Jul 17 15:38:40 groupadd[2491582]: new group: name=tape, GID=498
<86>Jul 17 15:38:40 groupadd[2491600]: group added to /etc/group: name=dialout, GID=497
<86>Jul 17 15:38:40 groupadd[2491600]: group added to /etc/gshadow: name=dialout
<86>Jul 17 15:38:40 groupadd[2491600]: new group: name=dialout, GID=497
<86>Jul 17 15:38:40 groupadd[2491614]: group added to /etc/group: name=input, GID=496
<86>Jul 17 15:38:40 groupadd[2491614]: group added to /etc/gshadow: name=input
<86>Jul 17 15:38:40 groupadd[2491614]: new group: name=input, GID=496
<86>Jul 17 15:38:40 groupadd[2491627]: group added to /etc/group: name=video, GID=495
<86>Jul 17 15:38:40 groupadd[2491627]: group added to /etc/gshadow: name=video
<86>Jul 17 15:38:40 groupadd[2491627]: new group: name=video, GID=495
<86>Jul 17 15:38:40 groupadd[2491633]: group added to /etc/group: name=render, GID=494
<86>Jul 17 15:38:40 groupadd[2491633]: group added to /etc/gshadow: name=render
<86>Jul 17 15:38:40 groupadd[2491633]: new group: name=render, GID=494
<13>Jul 17 15:38:40 rpmi: udev-1:249-alt1 sisyphus+277787.200.2.1 1625952282 installed
<86>Jul 17 15:38:41 groupadd[2494086]: group added to /etc/group: name=colord, GID=493
<86>Jul 17 15:38:41 groupadd[2494086]: group added to /etc/gshadow: name=colord
<86>Jul 17 15:38:41 groupadd[2494086]: new group: name=colord, GID=493
<86>Jul 17 15:38:41 useradd[2494109]: new user: name=colord, UID=498, GID=493, home=/var/colord, shell=/dev/null
<13>Jul 17 15:38:41 rpmi: colord-1.4.5-alt2 sisyphus+264292.100.1.1 1609619010 installed
<13>Jul 17 15:38:42 rpmi: libgtk+3-3.24.30-alt1 sisyphus+277720.100.1.1 1625768759 installed
<13>Jul 17 15:38:42 rpmi: gtk3-demo-3.24.30-alt1 sisyphus+277720.100.1.1 1625768759 installed
<13>Jul 17 15:38:42 rpmi: libgail3-3.24.30-alt1 sisyphus+277720.100.1.1 1625768759 installed
<13>Jul 17 15:38:42 rpmi: libssl1.1-1.1.1k-alt1 sisyphus+279286.100.1.1 1626469643 installed
<13>Jul 17 15:38:42 rpmi: libpython3-3.9.6-alt1 sisyphus+276295.100.1.1 1624964545 installed
<13>Jul 17 15:38:42 rpmi: python3-3.9.6-alt1 sisyphus+276295.100.1.1 1624964545 installed
<13>Jul 17 15:38:44 rpmi: python3-base-3.9.6-alt1 sisyphus+276295.100.1.1 1624964545 installed
<13>Jul 17 15:38:44 rpmi: python3-module-six-1.15.0-alt2 sisyphus+270533.5100.6.1 1619685463 installed
<13>Jul 17 15:38:44 rpmi: python3-module-genshi-0.7.4-alt2 sisyphus+275930.100.2.1 1624873830 installed
<13>Jul 17 15:38:44 rpmi: python3-module-webencodings-0.5.1-alt2 sisyphus+276020.100.1.1 1624812421 installed
<13>Jul 17 15:38:44 rpmi: python3-module-cssselect-0.9.1-alt3 sisyphus+270533.2600.6.1 1619684675 installed
<13>Jul 17 15:38:44 rpmi: python3-module-html5lib-1:1.1-alt1 sisyphus+278096.120.5.1 1626086978 installed
<13>Jul 17 15:38:44 rpmi: python3-module-lxml-4.6.3.0.16.git5ecb40bc-alt1 sisyphus+276591.100.1.1 1625142411 installed
<13>Jul 17 15:38:44 rpmi: python3-module-javapackages-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:44 rpmi: javapackages-local-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:44 rpmi: rpm-build-java-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:44 rpmi: java-stub-javadoc-0.1-alt1 sisyphus+276859.100.1.1 1625245070 installed
<13>Jul 17 15:38:44 rpmi: alsa-ucm-conf-1.2.5.1-alt1 sisyphus+274777.200.1.1 1624089157 installed
<13>Jul 17 15:38:44 rpmi: alsa-topology-conf-1.2.5.1-alt1 sisyphus+274777.100.1.1 1624089141 installed
<13>Jul 17 15:38:44 rpmi: libalsa-1:1.2.5.1-alt1 sisyphus+274777.300.1.1 1624089220 installed
<13>Jul 17 15:38:44 rpmi: java-1.8.0-openjdk-0:1.8.0.282.b08-alt1_0jpp8 sisyphus+265746.200.3.1 1612407392 installed
<13>Jul 17 15:38:45 rpmi: java-1.8.0-openjdk-devel-0:1.8.0.282.b08-alt1_0jpp8 sisyphus+265746.200.3.1 1612407392 installed
<13>Jul 17 15:38:45 rpmi: jpackage-generic-compat-0.36-alt1 sisyphus+276808.100.1.1 1625236787 installed
<13>Jul 17 15:38:50 rpmi: java-11-openjdk-headless-0:11.0.9.11-alt2_0.3.eajpp10 sisyphus+264273.100.1.1 1609537049 installed
<13>Jul 17 15:38:52 rpmi: java-11-openjdk-0:11.0.9.11-alt2_0.3.eajpp10 sisyphus+264273.100.1.1 1609537049 installed
<13>Jul 17 15:38:53 rpmi: java-11-openjdk-devel-0:11.0.9.11-alt2_0.3.eajpp10 sisyphus+264273.100.1.1 1609537049 installed
<13>Jul 17 15:38:53 rpmi: jpackage-11-compat-0.36-alt1 sisyphus+276808.100.1.1 1625236787 installed
<13>Jul 17 15:38:53 rpmi: maven-local-1:5.3.0-alt1_15jpp11 sisyphus+278038.500.1.3 1625987751 installed
<13>Jul 17 15:38:53 rpmi: maven-plugin-bundle-4.2.1-alt1_3jpp11 sisyphus+273441.100.1.1 1622656401 installed
<13>Jul 17 15:38:53 rpmi: jgit-5.11.0-alt1_1jpp11 sisyphus+274417.100.1.2 1623484642 installed
<13>Jul 17 15:38:53 rpmi: apiguardian-1.1.1-alt1_1jpp11 sisyphus+274228.100.1.2 1623350448 installed
Building target platforms: i586
Building for target i586
Wrote: /usr/src/in/nosrpm/java-diff-utils-4.9-alt1_2jpp11.nosrc.rpm (w1.gzdio)
Installing java-diff-utils-4.9-alt1_2jpp11.src.rpm
Building target platforms: i586
Building for target i586
Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.4824
+ 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.9
+ echo 'Source #0 (java-diff-utils-parent-4.9.tar.gz):'
Source #0 (java-diff-utils-parent-4.9.tar.gz):
+ /bin/gzip -dc /usr/src/RPM/SOURCES/java-diff-utils-parent-4.9.tar.gz
+ /bin/tar -xf -
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ /bin/chmod -c -Rf u+rwX,go-w .
+ echo 'Patch #0 (java-diff-utils-unchecked.patch):'
Patch #0 (java-diff-utils-unchecked.patch):
+ /usr/bin/patch -p0
patching file java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/HistogramDiffTest.java
patching file java-diff-utils-jgit/src/test/java/com/github/difflib/algorithm/jgit/LRHistogramDiffTest.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
patching file java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java
patching file java-diff-utils/src/test/java/com/github/difflib/DiffUtilsTest.java
patching file java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
patching file java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java
+ echo 'Patch #1 (java-diff-utils-javadoc.patch):'
Patch #1 (java-diff-utils-javadoc.patch):
+ /usr/bin/patch -p0
patching file java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java
patching file java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java
patching file java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
+ /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.4824
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ /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.9 [1/3]
[INFO] --------------------------------[ pom ]---------------------------------
[INFO]
[INFO] --- maven-bundle-plugin:4.2.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.9 [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.9/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 26 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/target/classes
[INFO]
[INFO] --- maven-bundle-plugin:4.2.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 25 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ java-diff-utils ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 12 source files to /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/target/test-classes
[INFO] /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.java uses unchecked or unsafe operations.
[INFO] /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/src/test/java/com/github/difflib/patch/PatchTest.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.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.093 s - in com.github.difflib.algorithm.myers.MyersDiffTest
[INFO] Running com.github.difflib.patch.PatchTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.064 s - in com.github.difflib.patch.PatchTest
[INFO] Running com.github.difflib.DiffUtilsTest
Patch{deltas=[[EqualDelta, position: 0, lines: [The]], [ChangeDelta, position: 1, lines: [dog] to [fox]], [EqualDelta, position: 2, lines: [is]], [ChangeDelta, position: 3, lines: [brown] to [down]]]}
[DeleteDelta, position: 0, lines: [1]]
[ChangeDelta, position: 4, lines: [5] to [6]]
[WARNING] Tests run: 14, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.188 s - in com.github.difflib.DiffUtilsTest
[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,27 +1,27 @@
/*
Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
- This file is part of Java Diff Utills Library.
+ This file is part of Java Diff Utils Library.
- Java Diff Utills Library is free software: you can redistribute it and/or modify
+ Java Diff Utils Library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Java Diff Utills Library is distributed in the hope that it will be useful,
+ Java Diff Utils Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Java Diff Utills Library. If not, see .
+ along with Java Diff Utils Library. If not, see .
*/
package difflib;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import difflib.myers.*;
/**
@@ -71,21 +71,21 @@
}
/**
* Unpatch the revised text for a given patch
*
* @param revised the revised text
* @param patch the given patch
* @return the original text
*/
public static List> unpatch(List> revised, Patch patch) {
- return patch.restore(revised);
+ return patch.restore(revised); // bla-bla-bla
}
/**
* Parse the given text in unified format and creates the list of deltas for it.
*
* @param diff the text in unified format
* @return the patch with deltas.
*/
public static Patch parseUnifiedDiff(List diff) {
boolean inPrelude = true;
@@ -145,30 +145,164 @@
}
}
}
}
// Process the lines in the last chunk
if (rawChunk.size() != 0) {
List oldChunkLines = new ArrayList();
List newChunkLines = new ArrayList();
- for (Object[] raw_line: rawChunk) {
+ for (Object[] raw_line: rawChunk)
+ {
tag = (String)raw_line[0];
rest = (String)raw_line[1];
- if (tag.equals(" ") || tag.equals("-")) {
+ if (tag.equals(" ") || tag.equals("-"))
+ {
oldChunkLines.add(rest);
}
- if (tag.equals(" ") || tag.equals("+")) {
+ if (tag.equals(" ") || tag.equals("+"))
+ {
newChunkLines.add(rest);
}
}
patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),
new Chunk(new_ln - 1, new_n, newChunkLines)));
rawChunk.clear();
}
return patch;
}
+
+ /**
+ * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing the Patch.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param fname1 - Filename of the original (unrevised file)
+ * @param fname2 - Filename of the revised file
+ * @param originalLines - Lines of the original file
+ * @param patch - Patch created by the diff() function
+ * @param contextSize - number of lines of context output around each difference in the file.
+ * @return List of strings representing the Unified Diff representation of the Patch argument.
+ */
+ public static List generateUnifiedDiff(String fname1, String fname2, List originalLines, Patch patch, int contextSize ) {
+ List ret = new ArrayList();
+ ret.add( "--- " + fname1 );
+ ret.add( "+++ " + fname2 );
+
+ List cur = new ArrayList(); // current list of Delta's to process
+ int deltact = patch.getDeltas().size();
+ // if there's more than 1 Delta, we may need to output them together
+ if ( deltact > 1 ) {
+ Delta curDelta = patch.getDelta(0);
+ cur.add( curDelta ); // add the first Delta to the current set
+ for ( int i = 1; i < deltact; i++ ) {
+ int curpos = curDelta.getOriginal().getPosition(); // store the current position of the first Delta
+ Delta nextDelta = patch.getDelta(i); // Check if the next Delta is too close to the current position
+ if ( (curpos + curDelta.getOriginal().getSize() + contextSize) >= ( nextDelta.getOriginal().getPosition()-contextSize ) ) {
+ cur.add( nextDelta ); // if it is, add it to the current set
+ } else {
+ List curBlock = processDeltas( originalLines, cur, contextSize );
+ ret.addAll( curBlock ); // if it isn't, output the current set, then create a new
+ cur.clear(); // set and add the current Delta to it.
+ cur.add( nextDelta );
+ }
+ curDelta = nextDelta;
+ }
+ List curBlock = processDeltas( originalLines, cur, contextSize ); // don't forget to process the last set of Deltas
+ ret.addAll( curBlock );
+ }
+
+ return ret;
+ }
+
+ /**
+ * processDeltas takes a list of Deltas and outputs them together in a single block of Unified-Diff-format text.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param origLines - the lines of the original file
+ * @param deltas - the Deltas to be output as a single block
+ * @param contextSize - the number of lines of context to place around block
+ * @return
+ */
+ private static List processDeltas( List origLines, List deltas, int contextSize ) {
+ List buffer = new ArrayList();
+ int origTotal = 0; // counter for total lines output from Original
+ int revTotal = 0; // counter for total lines output from Original
+ int line;
+
+ Delta curDelta = deltas.get(0); // start with the first Delta
+ int origStart = curDelta.getOriginal().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( origStart < 1 ) origStart = 1; // clamp to the start of the file
+ int revStart = curDelta.getRevised().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( revStart < 1 ) revStart = 1; // clamp to the start of the file
+ int contextStart = curDelta.getOriginal().getPosition() - contextSize; // find the start of the wrapper context code
+ if ( contextStart < 0 ) contextStart = 0; // clamp to the start of the file
+ for ( line = contextStart; line < curDelta.getOriginal().getPosition(); line++ ) { // output the context before the first Delta
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( curDelta ) ); // output the first Delta
+ origTotal += curDelta.getOriginal().getLines().size();
+ revTotal += curDelta.getRevised().getLines().size();
+
+ int deltaIndex = 1;
+ while ( deltaIndex < deltas.size() ) { // for each of the other Deltas
+ Delta nextDelta = deltas.get( deltaIndex );
+ int intermediateStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = intermediateStart; line < nextDelta.getOriginal().getPosition(); line++ ) {
+ buffer.add( " " + origLines.get( line ) ); // output the code between the last Delta and this one
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( nextDelta ) ); // output the Delta
+ origTotal += nextDelta.getOriginal().getLines().size();
+ revTotal += nextDelta.getRevised().getLines().size();
+ curDelta = nextDelta;
+ deltaIndex++; // increment the iterator
+ }
+
+ // Now output the post-Delta context code, clamping the end of the file
+ contextStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = contextStart; ( line < (contextStart + contextSize )) && ( line < origLines.size() ); line++ ) {
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+
+ // Create and insert the block header, conforming to the Unified Diff standard
+ StringBuffer header = new StringBuffer();
+ header.append( "@@ -" );
+ header.append( origStart );
+ header.append( "," );
+ header.append( origTotal );
+ header.append( " +" );
+ header.append( revStart );
+ header.append( "," );
+ header.append( revTotal );
+ header.append( " @@" );
+ buffer.add( 0, header.toString() );
+
+ return buffer;
+ }
+
+ /**
+ * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param delta - the Delta to output
+ * @return list of String lines of code.
+ */
+ private static List getDeltaText( Delta delta ) {
+ List buffer = new ArrayList();
+ for ( Object line: delta.getOriginal().getLines() ) {
+ buffer.add( "-" + line );
+ }
+ for ( Object line: delta.getRevised().getLines() ) {
+ buffer.add( "+" + line );
+ }
+ return buffer;
+ }
}
--- 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
-
-- Este texto está em uma lista numérica
-- Este texto está identado
-
-
-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
- Este texto está em uma
+lista numérica
Este aqui é um
+link
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.079 s - in com.github.difflib.GenerateUnifiedDiffTest
[INFO] Running com.github.difflib.text.DiffRowGeneratorTest
[[CHANGE,Ich möchte nicht **mehr **mit ~einem~**dir** ~Bot ~sprechen.** Leite mich weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,~Ich~**Kannst** ~soll~**du** ~das~**mich** ~schon~**zum** ~wieder~**Kundendienst** ~wiederholen?~**weiterleiten?**,Kannst du mich zum Kundendienst weiterleiten?]]
This is a test ~senctence~**for diffutils**.
|original|new|
|--------|---|
|This is a test ~senctence~.|This is a test **for diffutils**.|
|This is the second line.|This is the second line.|
|~And here is the finish.~||
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[test, , ,, , test2]
[test, ,, test2, ,]
[CHANGE,Testester,ester]
[CHANGE,Testester
feature best,ester feature best]
[[CHANGE,Ich möchte nicht mit ~e~i~nem~ ~Bot ~sprechen.,Ich möchte nicht m**ehr m**it **d**i**r** sprechen.** Leite mi**ch **weiter.**], [CHANGE,~I~ch s~oll~ d~as~ ~s~ch~on~ ~wi~ede~r~ wie~de~r~ho~len?,**Kann**s**t** d**u** **mi**ch **zum Kund**e**n**d**i**e**nst** w**e**i**t**erle**ite**n?]]
[CHANGE,Tester,ester]
[CHANGE,test,anything]
[CHANGE,anything ,]
[CHANGE, ,]
[EQUAL,other,other]
[INSERT,test,test]
[INSERT,test2,test2]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[EQUAL,anything ,anything ]
[EQUAL, , ]
[EQUAL,other,other]
[CHANGE,more lines,some more lines]
[[CHANGE,American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.,bobtail jaguar. American bobtail turkish angora and tomcat.], [CHANGE,Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singa
pura, cheetah.,Russian blue leopard. Lion. Tabby scottish folded for russian blu
e, so savannah yettie? lynx. Tomcat singapura, cheetah.], [CHANGE,Bengal tiger panther but singapura but bombay munchkin for cougar.,Bengal tiger panther but singapura but bombay munchkin for cougar. And m
ore.]]
[EQUAL,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5,MessageTime,MessageType,Instrument,InstrumentState,TradePrice,TradeVolume,TradeCond,TradeId,AskPrice1,AskVol1,BidPrice1,BidVol1,AskPrice2,AskVol2,BidPrice2,BidVol2,AskPrice3,AskVol3,BidPrice3,BidVol3,AskPrice4,AskVol4,BidPrice4,BidVol4,AskPrice5,AskVol5,BidPrice5,BidVol5]
[CHANGE,2020-04-~04T08:00:00~.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,]
[CHANGE,2020-04-~04T08:00:00~.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,,2020-04-04T13:49:11.522Z,Q,HHD_MAY20,,,,,,2.6,10,2.6,10,,,,,,,,,,,,,,,,]
[CHANGE,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,~1~,Screen,0,,,,,,,,,,,,,,,,,,,,,2020-**04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,**]
[CHANGE,,**2020-**04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,**2**,Screen,0,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,HHD_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,]
[EQUAL,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-04T17:00:00.000Z,S,FHK_C23.5_MAY20,Close,,,,,,,,,,,,,,,,,,,,,,,,]
~J. G. Feldstein~**T. P. Pastor**, Chair
|TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE,| TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE, |
|~ACTIONS_C17005~, ID, NUMBER, 22, 19, N,| **ACTIONS_C16913**, ID, NUMBER, 22, 19, N, |
|~ACTIONS_C17005~, ISSUEID, NUMBER, 22, 19, Y,| **ACTIONS_C16913**, ISSUEID, NUMBER, 22, 19, Y, |
|~ACTIONS_C17005~, MODIFIED, NUMBER, 22, 10, Y,| **ACTIONS_C16913**, MODIFIED, NUMBER, 22, 10, Y, |
|~ACTIONS_C17005~, ~TABLE~, ~VARCHAR2~, ~1020~, ~null~, Y,| **ACTIONS_C16913**, **VRS**, **NUMBER**, **22**, **1**, Y, |
|~ACTIONS_C17005~, ~S_NAME~, ~CLOB~, ~4000~, null, Y,| **ACTIONS_C16913**, **ZTABS**, **VARCHAR2**, **255**, null, Y, |
|~ACTIONS_C17008~, ~ID~, ~NUMBER~, ~22~, ~19~, ~N~,| **ACTIONS_C16913**, **ZTABS_S**, **VARCHAR2**, **255**, **null**, **Y**, |
|~ACTIONS_C17008~, ~ISSUEID~, ~NUMBER~, ~22~, ~19~, Y,| **ACTIONS_C16913**, **TASK**, **VARCHAR2**, **255**, **null**, Y, |
|~ACTIONS_C17008~, ~MODIFIED~, ~NUMBER~, ~22~, ~10~, Y,| **ACTIONS_C16913**, **HOURS_SPENT**, **VARCHAR2**, **255**, **null**, Y, |
|original|new|
|--------|---|
|This is a test ~senctence~.|This is a test **for diffutils**.|
||**This is the second line.**|
[CHANGE,Ich möchte nicht m**ehr m**it ~e~**d**i~nem~**r** ~Bot ~sprechen.~ I~** Leite mi**ch **weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.]
[CHANGE,**Kann**s~oll~**t** d~as~**u** ~s~**mi**ch~on~ ~wi~**zum Kund**e**n**d**i**e~r~**nst** w**e**i**t**e~de~r~ho~le**ite**n?,Kannst du mich zum Kundendienst weiterleiten?]
[CHANGE,anyth
ing ,anyth
ing]
[CHANGE, ,]
[EQUAL,other,other]
[[CHANGE,Ich möchte nicht mit einem Bot sprechen.,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,Ich soll das schon wieder wiederholen?,Kannst du mich zum Kundendienst weiterleiten?]]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[CHANGE,anything ,anything]
[CHANGE, ,]
[EQUAL,other,other]
[INFO] Tests run: 35, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.178 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.006 s - in com.github.difflib.text.StringUtilsTest
[INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest
com.github.difflib.unifieddiff.UnifiedDiff@ccdbb5
com.github.difflib.unifieddiff.UnifiedDiff@3aa2f7
com.github.difflib.unifieddiff.UnifiedDiff@13be5ca
com.github.difflib.unifieddiff.UnifiedDiff@df9b86
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.125 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.014 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest
[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,27 +1,27 @@
/*
Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
- This file is part of Java Diff Utills Library.
+ This file is part of Java Diff Utils Library.
- Java Diff Utills Library is free software: you can redistribute it and/or modify
+ Java Diff Utils Library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Java Diff Utills Library is distributed in the hope that it will be useful,
+ Java Diff Utils Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Java Diff Utills Library. If not, see .
+ along with Java Diff Utils Library. If not, see .
*/
package difflib;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import difflib.myers.*;
/**
@@ -71,21 +71,21 @@
}
/**
* Unpatch the revised text for a given patch
*
* @param revised the revised text
* @param patch the given patch
* @return the original text
*/
public static List> unpatch(List> revised, Patch patch) {
- return patch.restore(revised);
+ return patch.restore(revised); // bla-bla-bla
}
/**
* Parse the given text in unified format and creates the list of deltas for it.
*
* @param diff the text in unified format
* @return the patch with deltas.
*/
public static Patch parseUnifiedDiff(List diff) {
boolean inPrelude = true;
@@ -145,30 +145,164 @@
}
}
}
}
// Process the lines in the last chunk
if (rawChunk.size() != 0) {
List oldChunkLines = new ArrayList();
List newChunkLines = new ArrayList();
- for (Object[] raw_line: rawChunk) {
+ for (Object[] raw_line: rawChunk)
+ {
tag = (String)raw_line[0];
rest = (String)raw_line[1];
- if (tag.equals(" ") || tag.equals("-")) {
+ if (tag.equals(" ") || tag.equals("-"))
+ {
oldChunkLines.add(rest);
}
- if (tag.equals(" ") || tag.equals("+")) {
+ if (tag.equals(" ") || tag.equals("+"))
+ {
newChunkLines.add(rest);
}
}
patch.addDelta(new ChangeDelta(new Chunk(old_ln - 1, old_n, oldChunkLines),
new Chunk(new_ln - 1, new_n, newChunkLines)));
rawChunk.clear();
}
return patch;
}
+
+ /**
+ * generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing the Patch.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param fname1 - Filename of the original (unrevised file)
+ * @param fname2 - Filename of the revised file
+ * @param originalLines - Lines of the original file
+ * @param patch - Patch created by the diff() function
+ * @param contextSize - number of lines of context output around each difference in the file.
+ * @return List of strings representing the Unified Diff representation of the Patch argument.
+ */
+ public static List generateUnifiedDiff(String fname1, String fname2, List originalLines, Patch patch, int contextSize ) {
+ List ret = new ArrayList();
+ ret.add( "--- " + fname1 );
+ ret.add( "+++ " + fname2 );
+
+ List cur = new ArrayList(); // current list of Delta's to process
+ int deltact = patch.getDeltas().size();
+ // if there's more than 1 Delta, we may need to output them together
+ if ( deltact > 1 ) {
+ Delta curDelta = patch.getDelta(0);
+ cur.add( curDelta ); // add the first Delta to the current set
+ for ( int i = 1; i < deltact; i++ ) {
+ int curpos = curDelta.getOriginal().getPosition(); // store the current position of the first Delta
+ Delta nextDelta = patch.getDelta(i); // Check if the next Delta is too close to the current position
+ if ( (curpos + curDelta.getOriginal().getSize() + contextSize) >= ( nextDelta.getOriginal().getPosition()-contextSize ) ) {
+ cur.add( nextDelta ); // if it is, add it to the current set
+ } else {
+ List curBlock = processDeltas( originalLines, cur, contextSize );
+ ret.addAll( curBlock ); // if it isn't, output the current set, then create a new
+ cur.clear(); // set and add the current Delta to it.
+ cur.add( nextDelta );
+ }
+ curDelta = nextDelta;
+ }
+ List curBlock = processDeltas( originalLines, cur, contextSize ); // don't forget to process the last set of Deltas
+ ret.addAll( curBlock );
+ }
+
+ return ret;
+ }
+
+ /**
+ * processDeltas takes a list of Deltas and outputs them together in a single block of Unified-Diff-format text.
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param origLines - the lines of the original file
+ * @param deltas - the Deltas to be output as a single block
+ * @param contextSize - the number of lines of context to place around block
+ * @return
+ */
+ private static List processDeltas( List origLines, List deltas, int contextSize ) {
+ List buffer = new ArrayList();
+ int origTotal = 0; // counter for total lines output from Original
+ int revTotal = 0; // counter for total lines output from Original
+ int line;
+
+ Delta curDelta = deltas.get(0); // start with the first Delta
+ int origStart = curDelta.getOriginal().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( origStart < 1 ) origStart = 1; // clamp to the start of the file
+ int revStart = curDelta.getRevised().getPosition()+1 - contextSize; // note the +1 to overcome the 0-offset Position
+ if ( revStart < 1 ) revStart = 1; // clamp to the start of the file
+ int contextStart = curDelta.getOriginal().getPosition() - contextSize; // find the start of the wrapper context code
+ if ( contextStart < 0 ) contextStart = 0; // clamp to the start of the file
+ for ( line = contextStart; line < curDelta.getOriginal().getPosition(); line++ ) { // output the context before the first Delta
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( curDelta ) ); // output the first Delta
+ origTotal += curDelta.getOriginal().getLines().size();
+ revTotal += curDelta.getRevised().getLines().size();
+
+ int deltaIndex = 1;
+ while ( deltaIndex < deltas.size() ) { // for each of the other Deltas
+ Delta nextDelta = deltas.get( deltaIndex );
+ int intermediateStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = intermediateStart; line < nextDelta.getOriginal().getPosition(); line++ ) {
+ buffer.add( " " + origLines.get( line ) ); // output the code between the last Delta and this one
+ origTotal++;
+ revTotal++;
+ }
+ buffer.addAll( getDeltaText( nextDelta ) ); // output the Delta
+ origTotal += nextDelta.getOriginal().getLines().size();
+ revTotal += nextDelta.getRevised().getLines().size();
+ curDelta = nextDelta;
+ deltaIndex++; // increment the iterator
+ }
+
+ // Now output the post-Delta context code, clamping the end of the file
+ contextStart = curDelta.getOriginal().getPosition() + curDelta.getOriginal().getLines().size();
+ for ( line = contextStart; ( line < (contextStart + contextSize )) && ( line < origLines.size() ); line++ ) {
+ buffer.add( " " + origLines.get( line ) );
+ origTotal++;
+ revTotal++;
+ }
+
+ // Create and insert the block header, conforming to the Unified Diff standard
+ StringBuffer header = new StringBuffer();
+ header.append( "@@ -" );
+ header.append( origStart );
+ header.append( "," );
+ header.append( origTotal );
+ header.append( " +" );
+ header.append( revStart );
+ header.append( "," );
+ header.append( revTotal );
+ header.append( " @@" );
+ buffer.add( 0, header.toString() );
+
+ return buffer;
+ }
+
+ /**
+ * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
+ * @author Bill James (tankerbay@gmail.com)
+ *
+ * @param delta - the Delta to output
+ * @return list of String lines of code.
+ */
+ private static List getDeltaText( Delta delta ) {
+ List buffer = new ArrayList();
+ for ( Object line: delta.getOriginal().getLines() ) {
+ buffer.add( "-" + line );
+ }
+ for ( Object line: delta.getRevised().getLines() ) {
+ buffer.add( "+" + line );
+ }
+ return buffer;
+ }
}
--
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
-
-- Este texto está em uma lista numérica
-- Este texto está identado
-
-
-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 esteEste texto
+está alinhado a direita
- 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.045 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest
[INFO]
[INFO] Results:
[INFO]
[WARNING] Tests run: 92, Failures: 0, Errors: 0, Skipped: 2
[INFO]
[INFO]
[INFO] --- maven-jar-plugin:3.2.0:jar (default-jar) @ java-diff-utils ---
[INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils/target/java-diff-utils-4.9.jar
[INFO]
[INFO] -----------< io.github.java-diff-utils:java-diff-utils-jgit >-----------
[INFO] Building java-diff-utils-jgit 4.9 [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.9/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.9/java-diff-utils-jgit/target/classes
[INFO]
[INFO] --- maven-bundle-plugin:4.2.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.9/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.107 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.0:jar (default-jar) @ java-diff-utils-jgit ---
[INFO] Building jar: /usr/src/RPM/BUILD/java-diff-utils-java-diff-utils-parent-4.9/java-diff-utils-jgit/target/java-diff-utils-jgit-4.9.jar
[INFO]
[INFO] ----------< io.github.java-diff-utils:java-diff-utils-parent >----------
[INFO] Building java-diff-utils-parent 4.9 [4/3]
[INFO] --------------------------------[ pom ]---------------------------------
[INFO]
[INFO] --- xmvn-mojo:3.1.0:install (default-cli) @ java-diff-utils-parent ---
[INFO]
[INFO] --- xmvn-mojo:3.1.0:javadoc (default-cli) @ java-diff-utils-parent ---
[INFO]
[INFO] --- xmvn-mojo:3.1.0:builddep (default-cli) @ java-diff-utils-parent ---
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for java-diff-utils-parent 4.9:
[INFO]
[INFO] java-diff-utils-parent ............................. SUCCESS [ 3.881 s]
[INFO] java-diff-utils .................................... SUCCESS [ 28.641 s]
[INFO] java-diff-utils-jgit ............................... SUCCESS [ 11.131 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 52.669 s
[INFO] Finished at: 2021-07-17T15:40:01Z
[INFO] ------------------------------------------------------------------------
-----BEGIN MAVEN BUILD DEPENDENCIES-----
H4sIAAAAAAACA6WRu27DMAxF93wF6112uzsO2kweOgUFuioSo9JQKEEPI/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.7662
+ 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.9
+ 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.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:jar:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:pom:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:jar:4.9
[INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:pom:4.9
[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/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.9-alt1_2jpp11
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.35862
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ export DOCDIR
+ rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-4.9
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.RIb0HD
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.9, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.9
[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.9.0
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.p7CSrD
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.9, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.9, osgi(io.github.java-diff-utils) = 4.9.0
Requires: javapackages-filesystem
Processing files: java-diff-utils-parent-4.9-alt1_2jpp11
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.728
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd java-diff-utils-java-diff-utils-parent-4.9
+ DOCDIR=/usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ export DOCDIR
+ rm -rf /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ /bin/mkdir -p /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ cp -prL --no-dereference LICENSE /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ chmod -R go-w /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ chmod -R a+rX /usr/src/tmp/java-diff-utils-buildroot/usr/share/doc/java-diff-utils-parent-4.9
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.YpZp3E
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.9
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.NmnXfC
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.maven.plugins:maven-surefire-plugin), mvn(org.apache.felix:maven-bundle-plugin)
Provides: mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.9
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.9-alt1_2jpp11
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.X9ObEE
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.9, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.9
[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.eiTjTC
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] javapackages-filesystem, mvn(org.eclipse.jgit:org.eclipse.jgit), mvn(io.github.java-diff-utils:java-diff-utils) = 4.9
[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.9, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.9
Requires: java-diff-utils = 4.9-alt1_2jpp11, javapackages-filesystem, mvn(io.github.java-diff-utils:java-diff-utils) = 4.9, mvn(org.eclipse.jgit:org.eclipse.jgit)
Processing files: java-diff-utils-javadoc-4.9-alt1_2jpp11
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.1LNneF
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.VNtLKE
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.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm (w2.lzdio)
75.45user 3.41system 1:10.44elapsed 111%CPU (0avgtext+0avgdata 236056maxresident)k
0inputs+0outputs (0major+354519minor)pagefaults 0swaps
/.out/java-diff-utils-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
/.out/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: ASL
/.out/java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm: license not found in '/usr/share/license' directory: 2.0
118.43user 16.59system 2:05.71elapsed 107%CPU (0avgtext+0avgdata 236056maxresident)k
38104inputs+0outputs (0major+1248719minor)pagefaults 0swaps
--- java-diff-utils-4.9-alt1_2jpp11.noarch.rpm.repo 2021-06-12 15:39:04.000000000 +0000
+++ java-diff-utils-4.9-alt1_2jpp11.noarch.rpm.hasher 2021-07-17 15:40:15.954768356 +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 cb5e120c4bbfa9051bef51481f8f541b
-File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml 100644 root:root e107c1bee759a0971e37f7b862d32fc6
+File: /usr/share/java/java-diff-utils/java-diff-utils.jar 100644 root:root 9d08fefa1860463d70a53c7cdb37685c
+File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml 100644 root:root b92f94b882263610c8166c1313870d6b
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 7197bc67f72e009aae17305d97bab005
-RPMIdentity: de52aadbb07cd3cfd8b4ef956ef322a4
+RPMIdentity: 2622dadea5e1d3bed8a08cefc53e19e5
--- java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm.repo 2021-06-12 15:39:04.000000000 +0000
+++ java-diff-utils-javadoc-4.9-alt1_2jpp11.noarch.rpm.hasher 2021-07-17 15:40:16.088763874 +0000
@@ -164,5 +164,5 @@
File: /usr/share/javadoc/java-diff-utils 40755 root:root
-File: /usr/share/javadoc/java-diff-utils/allclasses-index.html 100644 root:root c1a90c9a94f766f04ec0baef8a310c53
-File: /usr/share/javadoc/java-diff-utils/allclasses.html 100644 root:root da60e910fe1537098302c826c6450375
-File: /usr/share/javadoc/java-diff-utils/allpackages-index.html 100644 root:root 5f050b32b9e5d8e3b7c0f291ae71d024
+File: /usr/share/javadoc/java-diff-utils/allclasses-index.html 100644 root:root 0b827bc61456514d4756cc029cc367b3
+File: /usr/share/javadoc/java-diff-utils/allclasses.html 100644 root:root 85d3d8fac7b5635cf833b82dc14b5402
+File: /usr/share/javadoc/java-diff-utils/allpackages-index.html 100644 root:root 71b6a42b2765a7928fe27bdcd41f0159
File: /usr/share/javadoc/java-diff-utils/args 100644 root:root 576e7bea4fb8b9ccdc2dab31ef72f2f5
@@ -171,106 +171,106 @@
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 5a42b29ab01432f9e1b257b246b2ee01
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/UnifiedDiffUtils.html 100644 root:root 9d2289a0fba5af90e3fe23e0ef5cb032
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/DiffUtils.html 100644 root:root e5dcedaf22abf63488cbad85fbad42c8
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/UnifiedDiffUtils.html 100644 root:root d6f1e3ba62636afa7f055e1a807074a2
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 1b55483d088e423f297a9c944a28ca08
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmI.html 100644 root:root a2fa4b5d6a7bc7589167643d0481e518
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmListener.html 100644 root:root df48b697ddd5d8cdac91c8e971e099cc
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/Change.html 100644 root:root 308c8a752b6ab9c1ba5fa5c2132e0f9a
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmI.html 100644 root:root 6f4dbc6ea2d6157aa3adff289341894e
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/DiffAlgorithmListener.html 100644 root:root e5b295787737789aa171dc8c00cb268e
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 c85cebeccd9b8d0642621a67d85a7029
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmI.html 100644 root:root b2d4cd1bd01a6da1b1f0e7475cbe3bad
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmListener.html 100644 root:root 23c47e2a99d0b6616cbac386a554ad05
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/Change.html 100644 root:root a5236a94bf032f5f35041131dc0829c0
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmI.html 100644 root:root f004df58d92ec014715d3409b3bb3945
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/class-use/DiffAlgorithmListener.html 100644 root:root b683b3910e657374f787dc282cf94496
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 533ed77356e0f2e75e4eef78bca7add3
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataListComparator.html 100644 root:root 67a10e65257ffa69a35ae687ffea3147
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/HistogramDiff.html 100644 root:root 0e09f4044382313bad741a875835ead2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataList.html 100644 root:root 2f60971d5924f35ebe7317e538886bc0
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/DataListComparator.html 100644 root:root e9ffeb91dd572e551885a7fcaae17976
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/HistogramDiff.html 100644 root:root 075cd5fc0b9498d1f510d6ea8869197b
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 b2bb1bd66f7681e447e4d5b40f2f7a8c
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataListComparator.html 100644 root:root 7a58d3241797a8bd082eba2f3082d5cb
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/HistogramDiff.html 100644 root:root 0dcb339a297313dc39b87e4723126b74
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-summary.html 100644 root:root c2e14ce367eb4fbdc5c1c2082c8c2ef3
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-tree.html 100644 root:root 316edd5f65ebcb9ae7d3eb1c93b853ac
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-use.html 100644 root:root b1da4058f6e08eb7573644920c11c0a5
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataList.html 100644 root:root 1a30c93358b7877448befbe0fd98509f
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/DataListComparator.html 100644 root:root 4f5ff00782bd4f1262e561d7e3be9e15
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/class-use/HistogramDiff.html 100644 root:root 3d4ce0b9b3eb27d58d1d4dbbbc48f378
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-summary.html 100644 root:root a9ce1a13f3f9d1b33ee37e85da141eb6
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-tree.html 100644 root:root af466c2cdc892301ac4189fcf29f74fa
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/jgit/package-use.html 100644 root:root 5c4db6992637bef87ab29299541114fb
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/MyersDiff.html 100644 root:root 88ee6dac6cceb22faeea2aacd0a190f5
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/PathNode.html 100644 root:root 265f7026150b83d4a4f53e9600dd15a2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/MyersDiff.html 100644 root:root b6d9acc35009bfa5838a1a9b98e96c91
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/PathNode.html 100644 root:root f7b38b891e5d99eb737eb76b381283d1
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/MyersDiff.html 100644 root:root 856e54de356f53cdb1291fa8a4fd1538
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/PathNode.html 100644 root:root d81a736f1e25228b4a8c0dc8505844cc
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-summary.html 100644 root:root 800f77cf1bc5ccfb6fdf6d74b7122c59
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-tree.html 100644 root:root 3deaeaa256c3edf9c8246d4de1df51e0
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-use.html 100644 root:root 9c033a5ffce832f8c7918ed629f64ad6
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-summary.html 100644 root:root 8e8d07744c9aa52e79b4da4fa2878326
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-tree.html 100644 root:root f9d5ff417fe38e9067350d6b6a072964
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-use.html 100644 root:root da4a60fc2914710a8f35be9f3bd82d3e
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/MyersDiff.html 100644 root:root 2c48ae202623a965f149f87b4e5b5298
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/class-use/PathNode.html 100644 root:root 3d52dcf3d7bb9e5d1270286cd1938baf
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-summary.html 100644 root:root f1d61cb71ac5e908896590ee40e865ce
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-tree.html 100644 root:root 3fd4df99d338952e6f595fd36337510b
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/myers/package-use.html 100644 root:root 99e94309a8b3d394e3bf27aa02a261f1
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-summary.html 100644 root:root 6d4bfe5aa700c606b180713c7123aac7
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-tree.html 100644 root:root e39369caa438946a54199a0636c8b3e3
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/algorithm/package-use.html 100644 root:root 516ef5a570fedbf62946e235a1bcc97b
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 a023fa635e3600ada144ffe88f478ca1
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/UnifiedDiffUtils.html 100644 root:root fbde38f1436488c34ab7bb7bed62638d
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-summary.html 100644 root:root be2f04d50e1636c8602b5d382c4f7d24
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-tree.html 100644 root:root 2d9131557d9d9223e2ae5b85fc83d204
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-use.html 100644 root:root a918cd46fa48123c17262a7f21ba1f37
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/DiffUtils.html 100644 root:root 8cf85772f0e7c691a3dcdc294792a5d7
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/class-use/UnifiedDiffUtils.html 100644 root:root 0a473e26bcd370020d23165f17666e7a
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-summary.html 100644 root:root 1eb96508c01d24b8457d439a00518f26
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-tree.html 100644 root:root 9bef0e87e466dc07aa1731a53a72a6ae
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/package-use.html 100644 root:root 736f372875af2cfc978b993bb9ac3895
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 c7d0f24e79acc9357add09f38e8baffc
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ChangeDelta.html 100644 root:root e032e4d48497fdc7696f3224faeff269
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Chunk.html 100644 root:root a358e6c1a5084b6521787239f6ae71a6
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeleteDelta.html 100644 root:root 5189a63cfb81e800a973d452a02ab27a
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeltaType.html 100644 root:root 812f80c03acd521fdc15f3b19aadc4bd
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DiffException.html 100644 root:root 6170b2e095347f3b1186138e60db5e36
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/EqualDelta.html 100644 root:root 8942890601470d5c72a961e727bef3f6
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/InsertDelta.html 100644 root:root 826518f0994f8a8bd8b20cb9f8a6f67b
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.html 100644 root:root 4d838266b926e3f28bc9212ad6701534
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/PatchFailedException.html 100644 root:root 87d2015754bdce549d5da385b6aae3e7
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/AbstractDelta.html 100644 root:root 480c5f4494c601915b0deb2206346b01
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/ChangeDelta.html 100644 root:root 09be88cf4b6723e570c64535730a87a8
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Chunk.html 100644 root:root 3fc2d5892c62f287b7abd4a97483cc60
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeleteDelta.html 100644 root:root 40f1c43ad328784ed8129a66124f8494
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DeltaType.html 100644 root:root 0d61cae344e40fe05bab2f0c958bf7fd
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/DiffException.html 100644 root:root 240869c57af007a976e4a74b628a94d1
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/EqualDelta.html 100644 root:root 9c7ffa63fa2d9d8de3dea4d141cccc85
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/InsertDelta.html 100644 root:root 95baf769da8f411f30aaee520a0a7cf2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/Patch.html 100644 root:root 5bc3e858c9078e9f45e661be9e4c2f32
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/PatchFailedException.html 100644 root:root 5fbb683c7e3379b5490ea244b62c9da4
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 c7016f92e5fdec81845c9d30ba24eb1b
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ChangeDelta.html 100644 root:root f4c3e24561b13dc77aaee776e476adce
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Chunk.html 100644 root:root 005400eeafa0489b939a9035633596f1
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeleteDelta.html 100644 root:root c48c3c4ce33d0986b136b95baae4913d
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeltaType.html 100644 root:root 3c754b1bab32b4f7d222fc45432f855c
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DiffException.html 100644 root:root 1417ba47cdd19a57f5fb27faca5c748e
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/EqualDelta.html 100644 root:root e2c9de1828f7eebeb71f45a7e404a4a9
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/InsertDelta.html 100644 root:root 21cf58c0d2e944b34fe12abd33d5490c
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.html 100644 root:root 9a9ef48cd982ebf58430fe5582aac20f
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/PatchFailedException.html 100644 root:root 46cf38836c4b4ca9989e1bff3080689a
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-summary.html 100644 root:root a6121f670b6eaf6d8e544e974a502073
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-tree.html 100644 root:root cc7feaf960ecd18c7d75950ac7b6a63b
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-use.html 100644 root:root 381114d74e01a63550c6a08ec6dfb333
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/AbstractDelta.html 100644 root:root 80098ae724af6ccff242aba3807220cd
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/ChangeDelta.html 100644 root:root 812d3b8674343204cb0b730a55362788
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Chunk.html 100644 root:root 87cfaab4123fcbefe48d711607ce1dc0
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeleteDelta.html 100644 root:root bca2b3d69bd2b2c0a028327791638ee2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DeltaType.html 100644 root:root f8bfca6b16bfb3d95a2090c0919659ac
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/DiffException.html 100644 root:root 6bab446e958f7ab7cbcde6cd6b62ec81
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/EqualDelta.html 100644 root:root 6478ec5322db0f206f8a8d42694cf052
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/InsertDelta.html 100644 root:root e95697c4aa739528dbf71fbf43904388
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/Patch.html 100644 root:root 928b37c0660587c9418217d95fde8d7b
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/class-use/PatchFailedException.html 100644 root:root 68eec9338218323804e931a16b511a3c
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-summary.html 100644 root:root 3c7a079de05976cc8e762e5b2ce22e2a
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-tree.html 100644 root:root 439538479d017eb46c33771542189a03
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/patch/package-use.html 100644 root:root 9348a793690e1176e5f597bcc0773232
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 8e958a060e59e3ce62b49f66b0e23333
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.html 100644 root:root 06c0efff310cea6212dcd846a3122ae1
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.Builder.html 100644 root:root 8b08be6348c8360bdc0fc415ef213dca
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.html 100644 root:root 0b3e11eb346876ee66351c8bcc91340a
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/StringUtils.html 100644 root:root c893e4a6cc5215217a9f715d34817c03
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.Tag.html 100644 root:root 737afdb2588c706f9bb0e895f8df1cce
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRow.html 100644 root:root 4e9b0f1b890620d46d717cdae695bd90
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.Builder.html 100644 root:root b8967ac2e319eec06933d39d467b4ff3
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/DiffRowGenerator.html 100644 root:root ee67c560236563fe1b0f92a0b8c16116
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/StringUtils.html 100644 root:root b797120eb9de5a2e3d484e0d915074b3
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 33799adf9cb7d81e7d9f5ee0fb070bf3
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.html 100644 root:root 57fe82d944450e2c1d32ec9a3c704d57
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.Builder.html 100644 root:root 4d12efbf3918c9d8c6906645a8e57640
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.html 100644 root:root c13e3e2142ceeb308611ea80c00e8921
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/StringUtils.html 100644 root:root 7659b2e144145411a5708f154b293cc3
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-summary.html 100644 root:root 7cfcbd90bcb651b4622771d715fd21d6
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-tree.html 100644 root:root 5979997755c88e8e62fe2523cb23e65a
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-use.html 100644 root:root b9082c09e996a0c0c78976b8c9fc7361
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.Tag.html 100644 root:root 1b1430833ff410822aa5398215cd14fa
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRow.html 100644 root:root 1c85cdbbf29bed668324ede67c343266
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.Builder.html 100644 root:root 16a320b2cc18c1ce5d9a96a9a1ba3bbe
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/DiffRowGenerator.html 100644 root:root 551eaaa0de767d508b5fcca5fa72dd25
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/class-use/StringUtils.html 100644 root:root 66843df4af7f66b05ae1418a6f15ac16
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-summary.html 100644 root:root a818da43c87522dcfc46405d88ddee74
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-tree.html 100644 root:root 341f882d31ead3bf31d19177a17003a2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/text/package-use.html 100644 root:root c1acaeeb2b9e460b2b07038328ead9ee
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 bd8d6c4344c474f4b44fa505fb97b047
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiff.html 100644 root:root d314422b1ef2d4d6c2b1f5cb3d5883f7
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffFile.html 100644 root:root a0d80b8a247a10bf7a66bbad02aeb126
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffParserException.html 100644 root:root ba182cbb22f180c8e6fceb29b87fabe5
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root f79384c66c1b93bca9babd96fe41f318
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.html 100644 root:root 814fa4d5382ca3e896322bd536df1cb5
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffWriter.html 100644 root:root ee84d220ef5fe488a851daa50fd1e8b4
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/InternalUnifiedDiffReader.html 100644 root:root e6fa18dfbd819e9d43b3ef9ac6d2908d
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiff.html 100644 root:root a74720d952c21d8b4fcc51f71d55e62d
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffFile.html 100644 root:root 242bbcbc2344fbdb4dc197893b254d49
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffParserException.html 100644 root:root a8d4ebe709efe9ec2159374d28d94653
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root a826e054dccf5060008d1fcb5665c3e3
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffReader.html 100644 root:root e898ded2856955a86d144bd9844910e6
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/UnifiedDiffWriter.html 100644 root:root c88922b36c08f3910ec4ab7ec95ef07d
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 21125f3cba3659685beeca479386479a
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiff.html 100644 root:root 99bc478453cd8e2fe962089874af8f6d
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffFile.html 100644 root:root 625d9ab6b27c201f98917b2a83bb3d9b
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffParserException.html 100644 root:root 52b61d6e9c3a94e0febbddd10990f4fc
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root f5ce40b0f2600b5182f820dd372c70ca
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.html 100644 root:root 0fae9cd80aa1290adfe5a146d5599ee2
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffWriter.html 100644 root:root 28cc3894d2de7d540906090dcf1021a6
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-summary.html 100644 root:root 7bd0c94286af7d66928edfc490ffbe80
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-tree.html 100644 root:root ab9a68a0900289cb259c25cc1167ea7e
-File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-use.html 100644 root:root 0c71b19d64b316aaf5ec775b045dda2f
-File: /usr/share/javadoc/java-diff-utils/constant-values.html 100644 root:root 5b417ac8eb380eae5f94f985de6d7491
-File: /usr/share/javadoc/java-diff-utils/deprecated-list.html 100644 root:root e693e91f1b6bd98364919afda2bd3aa4
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/InternalUnifiedDiffReader.html 100644 root:root e290c0016179969e157354ffaee6dfd6
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiff.html 100644 root:root d132ff843d027ed62bea7db7921b7884
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffFile.html 100644 root:root 791f5e72be39918e904897a7289b4ba2
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffParserException.html 100644 root:root 862b1cb5dc23ccc69b1eeadb712cbd6f
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.UnifiedDiffLine.html 100644 root:root 7ad2a380bcdd678b2c8dab1efbecee43
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.html 100644 root:root 868eaf00e0250277feca630825769f6c
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/class-use/UnifiedDiffWriter.html 100644 root:root ca0cdf491ef53e5759148ccd52f5e9dd
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-summary.html 100644 root:root a9042ff6c8343ff911fcd680f2427f0b
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-tree.html 100644 root:root 89346d942659911a71d1cb62981840bd
+File: /usr/share/javadoc/java-diff-utils/com/github/difflib/unifieddiff/package-use.html 100644 root:root 7d4204b004f02095665177031e5d8790
+File: /usr/share/javadoc/java-diff-utils/constant-values.html 100644 root:root 47a5b6115ab2b497c3fb0efae8951b0c
+File: /usr/share/javadoc/java-diff-utils/deprecated-list.html 100644 root:root 0ca36b17b08e4ada1146898b56eab1c5
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 75f2993764ca0814d88c5888854fe26a
-File: /usr/share/javadoc/java-diff-utils/index-all.html 100644 root:root 11c692fcbb17802d2c2a9a1d78cbb1c0
-File: /usr/share/javadoc/java-diff-utils/index.html 100644 root:root 03b4985db90eb65f20ffd24242eb3f60
+File: /usr/share/javadoc/java-diff-utils/help-doc.html 100644 root:root 0ecbce13d9a59cf014c1516dced32230
+File: /usr/share/javadoc/java-diff-utils/index-all.html 100644 root:root 873daf787e4b02351cbbaece4c577b7b
+File: /usr/share/javadoc/java-diff-utils/index.html 100644 root:root 64eaf731861a71fb777a246498aa303b
File: /usr/share/javadoc/java-diff-utils/jquery 40755 root:root
@@ -309,7 +309,7 @@
File: /usr/share/javadoc/java-diff-utils/member-search-index.js 100644 root:root c915cd31696fdd94122cdc2d0178cf1b
-File: /usr/share/javadoc/java-diff-utils/member-search-index.zip 100644 root:root 8d176b1bd285f19bfc5608f0ffebdacd
-File: /usr/share/javadoc/java-diff-utils/overview-summary.html 100644 root:root 62dc747d46ccbf9d623ca5b83e17b023
-File: /usr/share/javadoc/java-diff-utils/overview-tree.html 100644 root:root 95e6ae4314b48676e7a856210d3dacfe
+File: /usr/share/javadoc/java-diff-utils/member-search-index.zip 100644 root:root 9b331ec381a1cd76af7fce39423c56dc
+File: /usr/share/javadoc/java-diff-utils/overview-summary.html 100644 root:root 40cec523b23b46e6df561279aa1100b7
+File: /usr/share/javadoc/java-diff-utils/overview-tree.html 100644 root:root 2ea01cb5e11072e5453d3c8b5266f456
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 4083f322b4561f7fc1621f0cb02bbbfc
+File: /usr/share/javadoc/java-diff-utils/package-search-index.zip 100644 root:root 523643bef12eacf688217fc232f260dd
File: /usr/share/javadoc/java-diff-utils/resources 40755 root:root
@@ -319,6 +319,6 @@
File: /usr/share/javadoc/java-diff-utils/search.js 100644 root:root a2cf11ffe638bf82e355d8d832869e24
-File: /usr/share/javadoc/java-diff-utils/serialized-form.html 100644 root:root 6d87a25e3f28e31a194e910943e2558e
+File: /usr/share/javadoc/java-diff-utils/serialized-form.html 100644 root:root 8b71cf33d8da6986d8a4d4fdcc109f8a
File: /usr/share/javadoc/java-diff-utils/stylesheet.css 100644 root:root b4825fd415c295baef246236d8e7ac21
File: /usr/share/javadoc/java-diff-utils/type-search-index.js 100644 root:root cd324d877f91062a9be4d6d722375070
-File: /usr/share/javadoc/java-diff-utils/type-search-index.zip 100644 root:root fca550ad5101a507d5d3922ff92b1ffb
-RPMIdentity: 1f4c9ea59feb1048e44e160e367c6913
+File: /usr/share/javadoc/java-diff-utils/type-search-index.zip 100644 root:root b6e11316071d0436f58057bb1059ef54
+RPMIdentity: 3a5cfda66a84fa591ddbaf24d0f5d21f
--- java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm.repo 2021-06-12 15:39:04.000000000 +0000
+++ java-diff-utils-jgit-4.9-alt1_2jpp11.noarch.rpm.hasher 2021-07-17 15:40:16.209759828 +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 0f73a11930269a80555347a81b3b722b
-File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml 100644 root:root 62169d51a999b2836e526858fd74f3e0
+File: /usr/share/java/java-diff-utils/java-diff-utils-jgit.jar 100644 root:root a36ad08eb0637e370911d4307f6fc6f0
+File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml 100644 root:root 03c41d0bf1f86eb3b578fa94d3a0084e
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 e5f06dc6af0154ed8746d231b2e7159a
-RPMIdentity: 2acb31bf7bb8f3e70d084fd295584d72
+RPMIdentity: 9d187785e7bbcac420afd2761e96f69a
--- java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm.repo 2021-06-12 15:39:04.000000000 +0000
+++ java-diff-utils-parent-4.9-alt1_2jpp11.noarch.rpm.hasher 2021-07-17 15:40:16.332755714 +0000
@@ -13,5 +13,5 @@
File: /usr/share/doc/java-diff-utils-parent-4.9/LICENSE 100644 root:root 86d3f3a95c324c9479bd8986968f4327
-File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml 100644 root:root 00c84e215d5b4323fde4eb5256398832
+File: /usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml 100644 root:root 5dfe1451f0c58ac25b0d5374a1118a82
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 8c7088613a4544d3e05490ea3960348d
-RPMIdentity: 3e922c1d654789485643e0a4e9ddce57
+RPMIdentity: c1990d1d9f0a0373eb9c0cfea6d09fa3