Mock Version: 4.1 Mock Version: 4.1 Mock Version: 4.1 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --noclean --target noarch --nodeps /builddir/build/SPECS/java-diff-utils.spec'], chrootPath='/var/lib/mock/dist-ocs23-build-96023-5984/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=86400uid=981gid=135user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bs --noclean --target noarch --nodeps /builddir/build/SPECS/java-diff-utils.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: noarch Building for target noarch Wrote: /builddir/build/SRPMS/java-diff-utils-4.11-3.ocs23.src.rpm Child return code was: 0 ENTER ['do_with_status'](['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --noclean --target noarch --nodeps /builddir/build/SPECS/java-diff-utils.spec'], chrootPath='/var/lib/mock/dist-ocs23-build-96023-5984/root'env={'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'}shell=Falselogger=timeout=86400uid=981gid=135user='mockbuild'nspawn_args=[]unshare_net=TrueprintOutput=False) Executing command: ['bash', '--login', '-c', '/usr/bin/rpmbuild -bb --noclean --target noarch --nodeps /builddir/build/SPECS/java-diff-utils.spec'] with env {'TERM': 'vt100', 'SHELL': '/bin/bash', 'HOME': '/builddir', 'HOSTNAME': 'mock', 'PATH': '/usr/bin:/bin:/usr/sbin:/sbin', 'PROMPT_COMMAND': 'printf "\\033]0;\\007"', 'PS1': ' \\s-\\v\\$ ', 'LANG': 'C.UTF-8'} and shell False Building target platforms: noarch Building for target noarch Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.13B1X4 + umask 022 + cd /builddir/build/BUILD + cd /builddir/build/BUILD + rm -rf java-diff-utils-java-diff-utils-parent-4.11 + /usr/lib/rpm/rpmuncompress -x /builddir/build/SOURCES/java-diff-utils-parent-4.11.tar.gz + STATUS=0 + '[' 0 -ne 0 ']' + cd java-diff-utils-java-diff-utils-parent-4.11 + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin -r :maven-checkstyle-plugin + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin -r :maven-javadoc-plugin + /usr/bin/python3 /usr/share/java-utils/pom_editor.py pom_remove_plugin :maven-release-plugin + RPM_EC=0 ++ jobs -p + exit 0 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.1t6zM3 + umask 022 + cd /builddir/build/BUILD + CFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/OpenCloudOS/OpenCloudOS-hardened-cc1 -fstack-protector-strong -m64 -march=x86-64-v2 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection' + export CFLAGS + CXXFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/OpenCloudOS/OpenCloudOS-hardened-cc1 -fstack-protector-strong -m64 -march=x86-64-v2 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection' + export CXXFLAGS + FFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/OpenCloudOS/OpenCloudOS-hardened-cc1 -fstack-protector-strong -m64 -march=x86-64-v2 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib/gfortran/modules' + export FFLAGS + FCFLAGS='-O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/OpenCloudOS/OpenCloudOS-hardened-cc1 -fstack-protector-strong -m64 -march=x86-64-v2 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I/usr/lib/gfortran/modules' + export FCFLAGS + LDFLAGS='-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/OpenCloudOS/OpenCloudOS-hardened-ld -Wl,--build-id=sha1' + export LDFLAGS + LT_SYS_LIBRARY_PATH=/usr/lib: + export LT_SYS_LIBRARY_PATH + CC=gcc + export CC + CXX=g++ + export CXX + cd java-diff-utils-java-diff-utils-parent-4.11 + /usr/bin/python3 /usr/share/java-utils/mvn_build.py --xmvn-javadoc -s Executing: xmvn --batch-mode --offline verify org.fedoraproject.xmvn:xmvn-mojo:install org.fedoraproject.xmvn:xmvn-mojo:javadoc org.fedoraproject.xmvn:xmvn-mojo:builddep ['xmvn', '--batch-mode', '--offline', '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.11 [1/3] [INFO] --------------------------------[ pom ]--------------------------------- [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils-parent --- [WARNING] Ignoring project type pom - supportedProjectTypes = [jar, bundle] [INFO] [INFO] -------------< io.github.java-diff-utils:java-diff-utils >-------------- [INFO] Building java-diff-utils 4.11 [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 /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/resources [INFO] [INFO] --- maven-compiler-plugin:3.10.1:compile (default-compile) @ java-diff-utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 30 source files to /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/target/classes [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils --- [INFO] [INFO] --- maven-resources-plugin:3.2.0:testResources (default-testResources) @ java-diff-utils --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] Copying 37 resources [INFO] [INFO] --- maven-compiler-plugin:3.10.1:testCompile (default-testCompile) @ java-diff-utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 16 source files to /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/target/test-classes [INFO] /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java: Some input files use unchecked or unsafe operations. [INFO] /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/test/java/com/github/difflib/patch/PatchWithAllDiffAlgorithmsTest.java: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:3.0.0-M6:test (default-test) @ java-diff-utils --- [INFO] Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider [INFO] [INFO] ------------------------------------------------------- [INFO] T E S T S [INFO] ------------------------------------------------------- [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.112 s - in com.github.difflib.DiffUtilsTest [INFO] Running com.github.difflib.patch.PatchWithMeyerDiffWithLinearSpaceTest [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in com.github.difflib.patch.PatchWithMeyerDiffWithLinearSpaceTest [INFO] Running com.github.difflib.patch.PatchWithAllDiffAlgorithmsTest [INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.096 s - in com.github.difflib.patch.PatchWithAllDiffAlgorithmsTest [INFO] Running com.github.difflib.patch.PatchWithMeyerDiffTest [INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.patch.PatchWithMeyerDiffTest [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.017 s - in com.github.difflib.unifieddiff.UnifiedDiffWriterTest [INFO] Running com.github.difflib.unifieddiff.UnifiedDiffReaderTest com.github.difflib.unifieddiff.UnifiedDiff@14028087 com.github.difflib.unifieddiff.UnifiedDiff@7188af83 com.github.difflib.unifieddiff.UnifiedDiff@548a24a com.github.difflib.unifieddiff.UnifiedDiff@433defed [INFO] Tests run: 25, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.182 s - in com.github.difflib.unifieddiff.UnifiedDiffReaderTest [INFO] Running com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest header -- tail header --- original +++ revised @@ -1,4 +1,5 @@ test line1 test line2 +@@ -2,6 +2,7 @@ test line 4 test line 5 -- tail header --- 5A.txt +++ 5B.txt @@ -106,20 +106,28 @@ +++ b/x @@ -1,6 +1,6 @@ -whitespace at beginning + whitespace at beginning whitespace change -whitespace in the middle +white space in the middle whitespace at end unchanged line CR at endQ +git diff -b --ignore-space-at-eol > out +test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" > x && git diff --check | grep "space before tab in indent" @@ -363,10 +371,11 @@ git config core.autocrlf true && test_must_fail git merge master && git diff | sed -e "1,/^@@@/d" >actual && ! grep "^-" actual ' test_done + -- tail header --- original.txt +++ revised.txt @@ -1,12 +1,12 @@ /* - * Copyright 2009-2017 java-diff-utils. + * Copyright 2009-2017 java-diff-utills. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,21 +24,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.BiPredicate; /** * Implements the difference and patching engine */ -public final class DiffUtils { +public final class DiffUtills { /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param types to be diffed * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param progress progress listener * @return The patch describing the difference between the original and revised sequences. Never @@ -102,39 +102,65 @@ * @param progress The diff algorithm listener. * @param includeEqualParts Include equal data parts into the patch. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress, boolean includeEqualParts) { Objects.requireNonNull(original, "original must not be null"); Objects.requireNonNull(revised, "revised must not be null"); - Objects.requireNonNull(algorithm, "algorithm must not be null"); + Objects.requireNonNull(algorithm, "algorithm must not be null"); /* BLA BLA BLA */ return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts); } /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param algorithm The diff algorithm. Must not be {@code null}. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm) { return diff(original, revised, algorithm, null); - } + } + /** + * Computes the difference between the given texts inline. This one uses the "trick" to make out + * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end + * together again. + * + * @param original + * @param revised + * @return + */ + public static Patch diffInline(String original, String revised) { + List origList = new ArrayList<>(); + List revList = new ArrayList<>(); + for (Character character : original.toCharArray()) { + origList.add(character.toString()); + } + for (Character character : revised.toCharArray()) { + revList.add(character.toString()); + } + Patch patch = DiffUtils.diff(origList, revList); + for (AbstractDelta delta : patch.getDeltas()) { + delta.getSource().setLines(compressLines(delta.getSource().getLines(), "")); + delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), "")); + } + return patch; + } + private static List compressLines(List lines, String delimiter) { if (lines.isEmpty()) { return Collections.emptyList(); } return Collections.singletonList(String.join(delimiter, lines)); } /** * Patch the original text with given patch * -- tail header --- one_delta_test_original.txt +++ one_delta_test_revised.txt @@ -1,54 +1,11 @@ -

Esta é uma obra Online.

-

 

-

Este texto é negrito

-

Este texto é itálico

-

Este texto está sublinhado

-

Este texto está riscado

-

Este texto está centralizado

-

Este texto está alinhado a direita

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

Este -aqui é um link

-

 

-

 

-

 

, -

 

-

Página 1

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 2

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 3

-

 

+

Revisão 3

 

Esta é uma obra +Online.

 

Este texto é +negrit

Este texto é itálico/p>

Este texto está +sublinhado

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

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

Este texto +está alinhado a direita

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

Este aqui é um +link

-- tail [WARNING] Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.017 s - in com.github.difflib.unifieddiff.UnifiedDiffRoundTripTest [INFO] Running com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpaceTest Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]} Patch{deltas=[[InsertDelta, position: 0, lines: [C]], [DeleteDelta, position: 0, lines: [A]], [DeleteDelta, position: 2, lines: [C]], [DeleteDelta, position: 5, lines: [B]], [InsertDelta, position: 7, lines: [C]]]} [start, 6 - 13, 2 - 13, 0 - 13, 0 - 13, 0 - 13, 0 - 13, 2 - 13, 0 - 13, 0 - 13, end] Finished in 12266ms and resulted 2 deltas [INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.287 s - in com.github.difflib.algorithm.myers.MeyersDiffWithLinearSpaceTest [INFO] Running com.github.difflib.algorithm.myers.MyersDiffTest [start, 0 - 14, 1 - 14, 2 - 14, 3 - 14, 4 - 14, 5 - 14, end] [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s - in com.github.difflib.algorithm.myers.MyersDiffTest [INFO] Running com.github.difflib.algorithm.myers.WithMeyersDiffWithLinearSpacePatchTest [INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s - in com.github.difflib.algorithm.myers.WithMeyersDiffWithLinearSpacePatchTest [INFO] Running com.github.difflib.text.StringUtilsTest [INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 s - in com.github.difflib.text.StringUtilsTest [INFO] Running com.github.difflib.text.DiffRowGeneratorTest [CHANGE,const world: string = ~'world',,const world: string = 'world';] [CHANGE, ~**'world';**,const p: number | undefined = 42;] [CHANGE,**const **p: number | undefined = 42;,] [[CHANGE,Ich möchte nicht **mehr **mit ~einem~**dir** ~Bot ~sprechen.** Leite mich weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,~Ich~**Kannst** ~soll~**du** ~das~**mich** ~schon~**zum** ~wieder~**Kundendienst** ~wiederholen?~**weiterleiten?**,Kannst du mich zum Kundendienst weiterleiten?]] This is a test ~senctence~**for diffutils**. |original|new| |--------|---| |This is a test ~senctence~.|This is a test **for diffutils**.| |This is the second line.|This is the second line.| |~And here is the finish.~|| [CHANGE,anything ,anything] [CHANGE, ,] [EQUAL,other,other] [CHANGE,~A~,**a**] [DELETE,~B~,] [EQUAL,C,C] [CHANGE,~D~,] [EQUAL,E,E] [test, , ,, , test2] [test, ,, test2, ,] [CHANGE,Testester,ester] [CHANGE,Testester
feature best,ester feature best] [[CHANGE,Ich möchte nicht mit ~e~i~nem~ ~Bot ~sprechen.,Ich möchte nicht m**ehr m**it **d**i**r** sprechen.** Leite mi**ch **weiter.**], [CHANGE,~I~ch s~oll~ d~as~ ~s~ch~on~ ~wi~ede~r~ wie~de~r~ho~len?,**Kann**s**t** d**u** **mi**ch **zum Kund**e**n**d**i**e**nst** w**e**i**t**erle**ite**n?]] [CHANGE,Tester,ester] [CHANGE,test,anything] [CHANGE,anything ,] [DELETE, ,] [EQUAL,other,other] [INSERT,test,test] [INSERT,test2,test2] [CHANGE,anything ,anything] [CHANGE, ,] [EQUAL,other,other] [CHANGE,anything ,anything] [CHANGE, ,] [EQUAL,other,other] [EQUAL,anything ,anything ] [EQUAL, , ] [EQUAL,other,other] [CHANGE,more lines,some more lines] [[CHANGE,American bobtail jaguar. American bobtail bombay but turkish angora and tomcat.,bobtail jaguar. American bobtail turkish angora and tomcat.], [CHANGE,Russian blue leopard. Lion. Tabby scottish fold for russian blue, so savannah yet lynx. Tomcat singa
pura, cheetah.,Russian blue leopard. Lion. Tabby scottish folded for russian blu
e, so savannah yettie? lynx. Tomcat singapura, cheetah.], [CHANGE,Bengal tiger panther but singapura but bombay munchkin for cougar.,Bengal tiger panther but singapura but bombay munchkin for cougar. And m
ore.
]] [CHANGE,2020-04-~04T08:00:00~**02T08:00:00**.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-02T08:00:00.000Z,S,HHD_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] [CHANGE,2020-04-~04T08:00:00~**02T08:00:00**.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,,2020-04-02T08:00:00.000Z,S,FHK_C23.5_MAY20,Open,,,,,,,,,,,,,,,,,,,,,,,,] [CHANGE,2020-~04~**04xs**-~04T13:49:18~**04T17dw:00:00**.~210Z~**000Z**,~T~**Sdwdw**,~HHD_MAY20~**HHD_MAY20dwdw**,**Closdwde**,~2.6~,~1~,~Screen~,~0~,,,,,,,,,,,,,,,,,,,,,2020-04xs-04T17dw:00:00.000Z,Sdwdw,HHD_MAY20dwdw,Closdwde,,,,,,,,,,,,,,,,,,,,,,,,] [INSERT,**2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,**,2020-04-04T13:49:18.210Z,T,HHD_MAY20,,2.6,2,Screen,0,,,,,,,,,,,,,,,,,,,,] ~J. G. Feldstein~**T. P. Pastor**, Chair |TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE,| TABLE_NAME, COLUMN_NAME, DATA_TYPE, DATA_LENGTH, DATA_PRECISION, NULLABLE, | |~ACTIONS_C17005~, ID, NUMBER, 22, 19, N,| **ACTIONS_C16913**, ID, NUMBER, 22, 19, N, | |~ACTIONS_C17005~, ISSUEID, NUMBER, 22, 19, Y,| **ACTIONS_C16913**, ISSUEID, NUMBER, 22, 19, Y, | |~ACTIONS_C17005~, MODIFIED, NUMBER, 22, 10, Y,| **ACTIONS_C16913**, MODIFIED, NUMBER, 22, 10, Y, | |~ACTIONS_C17005~, ~TABLE~, ~VARCHAR2~, ~1020~, ~null~, Y,| **ACTIONS_C16913**, **VRS**, **NUMBER**, **22**, **1**, Y, | |~ACTIONS_C17005~, ~S_NAME~, ~CLOB~, ~4000~, null, Y,| **ACTIONS_C16913**, **ZTABS**, **VARCHAR2**, **255**, null, Y, | |~ACTIONS_C17008~, ~ID~, ~NUMBER~, ~22~, ~19~, ~N~,| **ACTIONS_C16913**, **ZTABS_S**, **VARCHAR2**, **255**, **null**, **Y**, | |~ACTIONS_C17008~, ~ISSUEID~, ~NUMBER~, ~22~, ~19~, Y,| **ACTIONS_C16913**, **TASK**, **VARCHAR2**, **255**, **null**, Y, | |~ACTIONS_C17008~, ~MODIFIED~, ~NUMBER~, ~22~, ~10~, Y,| **ACTIONS_C16913**, **HOURS_SPENT**, **VARCHAR2**, **255**, **null**, Y, | |original|new| |--------|---| |This is a test ~senctence~.|This is a test **for diffutils**.| ||**This is the second line.**| [CHANGE,A,a] [DELETE,B,] [EQUAL,C,C] [CHANGE,D,] [EQUAL,E,E] [CHANGE,Ich möchte nicht m**ehr m**it ~e~**d**i~nem~**r** ~Bot ~sprechen.~ I~** Leite mi**ch **weiter.**,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.] [CHANGE,**Kann**s~oll~**t** d~as~**u** ~s~**mi**ch~on~ ~wi~**zum Kund**e**n**d**i**e~r~**nst** w**e**i**t**e~de~r~ho~le**ite**n?,Kannst du mich zum Kundendienst weiterleiten?] [CHANGE,anyth
ing ,anyth
ing] [CHANGE, ,] [EQUAL,other,other] [[CHANGE,Ich möchte nicht mit einem Bot sprechen.,Ich möchte nicht mehr mit dir sprechen. Leite mich weiter.], [CHANGE,Ich soll das schon wieder wiederholen?,Kannst du mich zum Kundendienst weiterleiten?]] [CHANGE,anything ,anything] [CHANGE, ,] [EQUAL,other,other] [CHANGE,anything ,anything] [CHANGE, ,] [EQUAL,other,other] [INFO] Tests run: 38, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 s - in com.github.difflib.text.DiffRowGeneratorTest [INFO] Running com.github.difflib.GenerateUnifiedDiffTest --- 5A.txt +++ 5B.txt @@ -106,20 +106,28 @@ +++ b/x @@ -1,6 +1,6 @@ -whitespace at beginning + whitespace at beginning whitespace change -whitespace in the middle +white space in the middle whitespace at end unchanged line CR at endQ +git diff -b --ignore-space-at-eol > out +test_expect_failure 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out' + +tr 'Q' '\015' << EOF > expect +diff --git a/x b/x +index d99af23..8b32fb5 100644 +--- a/x ++++ b/x EOF git diff -b > out test_expect_success 'another test, with -b' 'test_cmp expect out' test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" > x && git diff --check | grep "space before tab in indent" @@ -363,10 +371,11 @@ git config core.autocrlf true && test_must_fail git merge master && git diff | sed -e "1,/^@@@/d" >actual && ! grep "^-" actual ' test_done + --- original.txt +++ revised.txt @@ -1,12 +1,12 @@ /* - * Copyright 2009-2017 java-diff-utils. + * Copyright 2009-2017 java-diff-utills. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,21 +24,21 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.function.BiPredicate; /** * Implements the difference and patching engine */ -public final class DiffUtils { +public final class DiffUtills { /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param types to be diffed * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param progress progress listener * @return The patch describing the difference between the original and revised sequences. Never @@ -102,39 +102,65 @@ * @param progress The diff algorithm listener. * @param includeEqualParts Include equal data parts into the patch. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm, DiffAlgorithmListener progress, boolean includeEqualParts) { Objects.requireNonNull(original, "original must not be null"); Objects.requireNonNull(revised, "revised must not be null"); - Objects.requireNonNull(algorithm, "algorithm must not be null"); + Objects.requireNonNull(algorithm, "algorithm must not be null"); /* BLA BLA BLA */ return Patch.generate(original, revised, algorithm.computeDiff(original, revised, progress), includeEqualParts); } /** * Computes the difference between the original and revised list of elements with default diff * algorithm * * @param original The original text. Must not be {@code null}. * @param revised The revised text. Must not be {@code null}. * @param algorithm The diff algorithm. Must not be {@code null}. * @return The patch describing the difference between the original and revised sequences. Never * {@code null}. */ public static Patch diff(List original, List revised, DiffAlgorithmI algorithm) { return diff(original, revised, algorithm, null); - } + } + /** + * Computes the difference between the given texts inline. This one uses the "trick" to make out + * of texts lists of characters, like DiffRowGenerator does and merges those changes at the end + * together again. + * + * @param original + * @param revised + * @return + */ + public static Patch diffInline(String original, String revised) { + List origList = new ArrayList<>(); + List revList = new ArrayList<>(); + for (Character character : original.toCharArray()) { + origList.add(character.toString()); + } + for (Character character : revised.toCharArray()) { + revList.add(character.toString()); + } + Patch patch = DiffUtils.diff(origList, revList); + for (AbstractDelta delta : patch.getDeltas()) { + delta.getSource().setLines(compressLines(delta.getSource().getLines(), "")); + delta.getTarget().setLines(compressLines(delta.getTarget().getLines(), "")); + } + return patch; + } + private static List compressLines(List lines, String delimiter) { if (lines.isEmpty()) { return Collections.emptyList(); } return Collections.singletonList(String.join(delimiter, lines)); } /** * Patch the original text with given patch * --- one_delta_test_original.txt +++ one_delta_test_revised.txt @@ -1,54 +1,11 @@ -

Esta é uma obra Online.

-

 

-

Este texto é negrito

-

Este texto é itálico

-

Este texto está sublinhado

-

Este texto está riscado

-

Este texto está centralizado

-

Este texto está alinhado a direita

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

Este -aqui é um link

-

 

-

 

-

 

, -

 

-

Página 1

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 2

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

 

-

Página 3

-

 

+

Revisão 3

 

Esta é uma obra +Online.

 

Este texto é +negrit

Este texto é itálico/p>

Este texto está +sublinhado

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

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

Este texto +está alinhado a direita

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

Este aqui é um +link

[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 s - in com.github.difflib.GenerateUnifiedDiffTest [INFO] [INFO] Results: [INFO] [WARNING] Tests run: 121, Failures: 0, Errors: 0, Skipped: 2 [INFO] [INFO] [INFO] --- maven-jar-plugin:3.2.2:jar (default-jar) @ java-diff-utils --- [INFO] Building jar: /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/target/java-diff-utils-4.11.jar [INFO] [INFO] -----------< io.github.java-diff-utils:java-diff-utils-jgit >----------- [INFO] Building java-diff-utils-jgit 4.11 [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 /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils-jgit/src/main/resources [INFO] [INFO] --- maven-compiler-plugin:3.10.1:compile (default-compile) @ java-diff-utils-jgit --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 1 source file to /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils-jgit/target/classes [INFO] [INFO] --- maven-bundle-plugin:5.1.1:manifest (bundle-manifest) @ java-diff-utils-jgit --- [INFO] [INFO] --- maven-resources-plugin:3.2.0:testResources (default-testResources) @ java-diff-utils-jgit --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Using 'UTF-8' encoding to copy filtered properties files. [INFO] Copying 1 resource [INFO] [INFO] --- maven-compiler-plugin:3.10.1:testCompile (default-testCompile) @ java-diff-utils-jgit --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 2 source files to /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils-jgit/target/test-classes [INFO] [INFO] --- maven-surefire-plugin:3.0.0-M6:test (default-test) @ java-diff-utils-jgit --- [INFO] Using auto detected provider org.apache.maven.surefire.junitplatform.JUnitPlatformProvider [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.042 s - in com.github.difflib.algorithm.jgit.HistogramDiffTest [INFO] [INFO] Results: [INFO] [INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 [INFO] [INFO] [INFO] --- maven-jar-plugin:3.2.2:jar (default-jar) @ java-diff-utils-jgit --- [INFO] Building jar: /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils-jgit/target/java-diff-utils-jgit-4.11.jar [INFO] [INFO] ----------< io.github.java-diff-utils:java-diff-utils-parent >---------- [INFO] Building java-diff-utils-parent 4.11 [4/3] [INFO] --------------------------------[ pom ]--------------------------------- [INFO] [INFO] --- xmvn-mojo:4.0.0:install (default-cli) @ java-diff-utils-parent --- [INFO] [INFO] --- xmvn-mojo:4.0.0:javadoc (default-cli) @ java-diff-utils-parent --- Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/DiffException.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/ConflictOutput.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/PatchFailedException.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/Patch.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/DeltaType.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffFile.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/package-info.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiff.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffParserException.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/Change.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmI.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmFactory.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/DiffAlgorithmListener.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/PathNode.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/algorithm/myers/MeyersDiff.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/text/DiffRow.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/text/StringUtils.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/DiffUtils.java... Loading source file /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils-jgit/src/main/java/com/github/difflib/algorithm/jgit/HistogramDiff.java... Constructing Javadoc information... Building index for all the packages and classes... Standard Doclet version 17.0.3-ga+1 Building tree for all the packages and classes... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/AbstractDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/Change.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/ChangeDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/Chunk.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/ConflictOutput.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/DataList.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/DataListComparator.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/DeleteDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/DeltaType.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/DiffAlgorithmFactory.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/DiffAlgorithmI.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/DiffAlgorithmListener.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/DiffException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/DiffRow.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/DiffRow.Tag.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/DiffRowGenerator.html... /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java:283: warning: @param argument "deltaList" is not a parameter name. * @param deltaList ^ Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/DiffRowGenerator.Builder.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/DiffUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/EqualDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/HistogramDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/InsertDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/InternalUnifiedDiffReader.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/MeyersDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.DiffData.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/MeyersDiffWithLinearSpace.Snake.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/Patch.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/PatchFailedException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/PathNode.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/StringUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiffFile.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiffParserException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiffReader.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiffReader.UnifiedDiffLine.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/UnifiedDiffUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/UnifiedDiffWriter.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/VerifyChunk.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/package-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/package-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/constant-values.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/serialized-form.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/DiffException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/InsertDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/AbstractDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/ConflictOutput.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/VerifyChunk.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/PatchFailedException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/ChangeDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/Chunk.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/Patch.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/DeleteDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/DeltaType.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/class-use/EqualDelta.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiffFile.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiffWriter.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiffReader.UnifiedDiffLine.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/InternalUnifiedDiffReader.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/class-use/UnifiedDiffParserException.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/class-use/UnifiedDiffUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/class-use/Change.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/class-use/DiffAlgorithmI.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/class-use/DiffAlgorithmFactory.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/class-use/DiffAlgorithmListener.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/class-use/PathNode.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.Snake.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/class-use/MeyersDiffWithLinearSpace.DiffData.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/class-use/MeyersDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/class-use/DiffRow.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/class-use/DiffRow.Tag.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/class-use/StringUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/class-use/DiffRowGenerator.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/class-use/DiffRowGenerator.Builder.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/class-use/DiffUtils.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/class-use/HistogramDiff.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/class-use/DataListComparator.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/class-use/DataList.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/jgit/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/algorithm/myers/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/patch/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/text/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/com/github/difflib/unifieddiff/package-use.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/overview-tree.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/index.html... Building index for all classes... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/allclasses-index.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/allpackages-index.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/index-all.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/overview-summary.html... Generating /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11/target/xmvn-apidocs/help-doc.html... 1 warning [INFO] [INFO] --- xmvn-mojo:4.0.0:builddep (default-cli) @ java-diff-utils-parent --- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary for java-diff-utils-parent 4.11: [INFO] [INFO] java-diff-utils-parent ............................. SUCCESS [ 1.520 s] [INFO] java-diff-utils .................................... SUCCESS [ 16.537 s] [INFO] java-diff-utils-jgit ............................... SUCCESS [ 0.647 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 19.403 s [INFO] Finished at: 2023-10-07T07:36:44+08:00 [INFO] ------------------------------------------------------------------------ -----BEGIN MAVEN BUILD DEPENDENCIES----- H4sIAAAAAAAC/6WRu27DMAxF93wF6112uzsO2kweOgUFuioSo9JQKEEPI/n7yn26KKAlC4F77wHO wH53OVuYMURyvG0e2vsGkJXTxGbbvBzE42E/js1u2PR3QsBTJqtBo0fWBSOMYJAxyIQajld4fZ4Z hCj0mhk2AL/FdYmlMMFlP+rBBdNKL9Ubtie0dOm77+WTkyHRSapUirOckcUxs7YovM2GuO9W++Lp /orq3ikzpXI9JQwV8QcnfrhblDJGDGmqyL4IoVzA21yoLPmI7WQoVYT/0Zp0lZbfvgNJ+WkOQgIA AA== -----END MAVEN BUILD DEPENDENCIES----- + RPM_EC=0 ++ jobs -p + exit 0 Executing(%install): /bin/sh -e /var/tmp/rpm-tmp.xkdG4S + umask 022 + cd /builddir/build/BUILD + '[' /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch '!=' / ']' + rm -rf /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch ++ dirname /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch + mkdir -p /builddir/build/BUILDROOT + mkdir /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch + cd java-diff-utils-java-diff-utils-parent-4.11 + xmvn-install -R .xmvn-reactor -n java-diff-utils -d /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-parent:pom:4.11 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:jar:4.11 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils:pom:4.11 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:jar:4.11 [INFO] Installing artifact io.github.java-diff-utils:java-diff-utils-jgit:pom:4.11 [INFO] Installation successful + jdir=target/site/apidocs + '[' -d .xmvn/apidocs ']' + jdir=.xmvn/apidocs + /usr/bin/mkdir -p /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses + '[' -d .xmvn/apidocs ']' + install -dm755 /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/javadoc/java-diff-utils + cp -pr .xmvn/apidocs/allclasses-index.html .xmvn/apidocs/allpackages-index.html .xmvn/apidocs/args .xmvn/apidocs/com .xmvn/apidocs/constant-values.html .xmvn/apidocs/element-list .xmvn/apidocs/help-doc.html .xmvn/apidocs/index-all.html .xmvn/apidocs/index.html .xmvn/apidocs/jquery-ui.overrides.css .xmvn/apidocs/legal .xmvn/apidocs/member-search-index.js .xmvn/apidocs/module-search-index.js .xmvn/apidocs/overview-summary.html .xmvn/apidocs/overview-tree.html .xmvn/apidocs/package-search-index.js .xmvn/apidocs/resources .xmvn/apidocs/script-dir .xmvn/apidocs/script.js .xmvn/apidocs/search.js .xmvn/apidocs/serialized-form.html .xmvn/apidocs/stylesheet.css .xmvn/apidocs/tag-search-index.js .xmvn/apidocs/type-search-index.js /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/javadoc/java-diff-utils + echo /usr/share/javadoc/java-diff-utils + /usr/bin/find-debuginfo -j32 --strict-build-id -m -i --build-id-seed 4.11-3.ocs23 --unique-debug-suffix -4.11-3.ocs23.noarch --unique-debug-src-base java-diff-utils-4.11-3.ocs23.noarch -S debugsourcefiles.list /builddir/build/BUILD/java-diff-utils-java-diff-utils-parent-4.11 + /usr/lib/rpm/check-buildroot + /usr/lib/rpm/OpenCloudOS/brp-ldconfig + /usr/lib/rpm/brp-compress + /usr/lib/rpm/OpenCloudOS/brp-strip-lto /usr/bin/strip + /usr/lib/rpm/brp-strip-static-archive /usr/bin/strip + /usr/lib/rpm/check-rpaths + /usr/lib/rpm/OpenCloudOS/brp-mangle-shebangs + /usr/lib/rpm/OpenCloudOS/brp-python-bytecompile '' 1 0 + /usr/lib/rpm/OpenCloudOS/brp-python-hardlink Processing files: java-diff-utils-4.11-3.ocs23.noarch Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.Y58DDv + umask 022 + cd /builddir/build/BUILD + cd java-diff-utils-java-diff-utils-parent-4.11 + LICENSEDIR=/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils + export LC_ALL=C + LC_ALL=C + export LICENSEDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils + cp -pr LICENSE /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils + RPM_EC=0 ++ jobs -p + exit 0 [INFO maven.prov] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml'] [INFO maven.prov] mvn(io.github.java-diff-utils:java-diff-utils) = 4.11, mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.11 [INFO osgi.prov] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/java/java-diff-utils/java-diff-utils.jar'] [INFO osgi.prov] osgi(io.github.java-diff-utils) = 4.11.0 [INFO maven.req] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/maven-metadata/java-diff-utils-java-diff-utils.xml'] [INFO maven.req] javapackages-filesystem, (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless) [INFO osgi.req] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/java/java-diff-utils/java-diff-utils.jar'] Provides: java-diff-utils = 4.11-3.ocs23 mvn(io.github.java-diff-utils:java-diff-utils) = 4.11 mvn(io.github.java-diff-utils:java-diff-utils:pom:) = 4.11 osgi(io.github.java-diff-utils) = 4.11.0 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless) javapackages-filesystem Processing files: java-diff-utils-parent-4.11-3.ocs23.noarch Executing(%license): /bin/sh -e /var/tmp/rpm-tmp.aUV6Xk + umask 022 + cd /builddir/build/BUILD + cd java-diff-utils-java-diff-utils-parent-4.11 + LICENSEDIR=/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils-parent + export LC_ALL=C + LC_ALL=C + export LICENSEDIR + /usr/bin/mkdir -p /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils-parent + cp -pr LICENSE /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/licenses/java-diff-utils-parent + RPM_EC=0 ++ jobs -p + exit 0 [INFO maven.prov] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/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.11 [INFO maven.req] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/maven-metadata/java-diff-utils-java-diff-utils-parent.xml'] [INFO maven.req] (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless), javapackages-filesystem [INFO maven.req] from POM(s): mvn(org.apache.maven.plugins:maven-surefire-plugin), mvn(org.apache.felix:maven-bundle-plugin) Provides: java-diff-utils-parent = 4.11-3.ocs23 mvn(io.github.java-diff-utils:java-diff-utils-parent:pom:) = 4.11 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless) javapackages-filesystem mvn(org.apache.felix:maven-bundle-plugin) mvn(org.apache.maven.plugins:maven-surefire-plugin) Processing files: java-diff-utils-jgit-4.11-3.ocs23.noarch [INFO maven.prov] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/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.11, mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.11 [INFO osgi.prov] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar'] [INFO maven.req] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/maven-metadata/java-diff-utils-java-diff-utils-jgit.xml'] [INFO maven.req] (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless), mvn(io.github.java-diff-utils:java-diff-utils) = 4.11, javapackages-filesystem, mvn(org.eclipse.jgit:org.eclipse.jgit) [INFO osgi.req] input: ['/builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch/usr/share/java/java-diff-utils/java-diff-utils-jgit.jar'] Provides: java-diff-utils-jgit = 4.11-3.ocs23 mvn(io.github.java-diff-utils:java-diff-utils-jgit) = 4.11 mvn(io.github.java-diff-utils:java-diff-utils-jgit:pom:) = 4.11 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: (java-headless or java-17-headless or java-11-headless or java-1.8.0-headless) javapackages-filesystem mvn(io.github.java-diff-utils:java-diff-utils) = 4.11 mvn(org.eclipse.jgit:org.eclipse.jgit) Processing files: java-diff-utils-javadoc-4.11-3.ocs23.noarch Provides: java-diff-utils-javadoc = 4.11-3.ocs23 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(FileDigests) <= 4.6.0-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 Requires: javapackages-filesystem Checking for unpackaged file(s): /usr/lib/rpm/check-files /builddir/build/BUILDROOT/java-diff-utils-4.11-3.ocs23.noarch Wrote: /builddir/build/RPMS/java-diff-utils-jgit-4.11-3.ocs23.noarch.rpm Wrote: /builddir/build/RPMS/java-diff-utils-parent-4.11-3.ocs23.noarch.rpm Wrote: /builddir/build/RPMS/java-diff-utils-4.11-3.ocs23.noarch.rpm Wrote: /builddir/build/RPMS/java-diff-utils-javadoc-4.11-3.ocs23.noarch.rpm Child return code was: 0