[CALCITE-2020] Upgrade org.incava java-diff Upgrade org.incava java-diff from 1.1 to 1.1.1. The license changed from 2-clause BSD to Apache. The package changed from org.incava.util.diff to org.incava.diff.
Change-Id: I4d66cef25e5a746bcb1767cd78b9df94ac87e62f Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d134694a Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d134694a Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d134694a Branch: refs/heads/master Commit: d134694aedcf19c0620b42045167ee13e15f5e2a Parents: fb8ebd3 Author: Julian Hyde <jh...@apache.org> Authored: Mon Oct 23 13:26:04 2017 -0700 Committer: Jesus Camacho Rodriguez <jcama...@apache.org> Committed: Tue Mar 13 15:01:04 2018 -0700 ---------------------------------------------------------------------- core/src/test/java/org/apache/calcite/test/DiffTestCase.java | 8 ++++---- pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/d134694a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java b/core/src/test/java/org/apache/calcite/test/DiffTestCase.java index c8a9a89..c539ab3 100644 --- a/core/src/test/java/org/apache/calcite/test/DiffTestCase.java +++ b/core/src/test/java/org/apache/calcite/test/DiffTestCase.java @@ -19,8 +19,8 @@ package org.apache.calcite.test; import org.apache.calcite.util.ReflectUtil; import org.apache.calcite.util.Util; -import org.incava.util.diff.Diff; -import org.incava.util.diff.Difference; +import org.incava.diff.Diff; +import org.incava.diff.Difference; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -385,8 +385,8 @@ public abstract class DiffTestCase { * Returns a string containing the difference between the two sets of lines. */ public static String diffLines(List<String> lines1, List<String> lines2) { - Diff differencer = new Diff(lines1, lines2); - List<Difference> differences = differencer.diff(); + final Diff<String> differencer = new Diff<>(lines1, lines2); + final List<Difference> differences = differencer.execute(); StringWriter sw = new StringWriter(); int offset = 0; for (Difference d : differences) { http://git-wip-us.apache.org/repos/asf/calcite/blob/d134694a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9919c36..550f413 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ limitations under the License. <hydromatic-tpcds.version>0.4</hydromatic-tpcds.version> <jackson.version>2.9.4</jackson.version> <janino.version>2.7.6</janino.version> - <java-diff.version>1.1</java-diff.version> + <java-diff.version>1.1.1</java-diff.version> <javacc-maven-plugin.version>2.4</javacc-maven-plugin.version> <jcip-annotations.version>1.0-1</jcip-annotations.version> <jetty.version>9.2.19.v20160908</jetty.version>
