Skip to content

Commit b9cd700

Browse files
authored
chore(deps): update dependency io.github.java-diff-utils:java-diff-utils to v4.11 (#943)
[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [io.github.java-diff-utils:java-diff-utils](https://togithub.com/java-diff-utils/java-diff-utils) | `4.0` -> `4.11` | [![age](https://badges.renovateapi.com/packages/maven/io.github.java-diff-utils:java-diff-utils/4.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/io.github.java-diff-utils:java-diff-utils/4.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/io.github.java-diff-utils:java-diff-utils/4.11/compatibility-slim/4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/io.github.java-diff-utils:java-diff-utils/4.11/confidence-slim/4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>java-diff-utils/java-diff-utils</summary> ### [`v4.11`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;411) ##### Changed - bugfixing new UnifiedDiff reader - header for each file - skip empty lines - introduction of Meyers Diff Algorithm with Linear Space improvment (until matured this will not be the default diff algorithm) - introduction of DiffAlgorithmFactory to set the default diff algorithm DiffUtils use (`DiffUtils.withDefaultDiffAlgorithmFactory(MeyersDiffWithLinearSpace.factory());`) ### [`v4.10`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;410) ##### Changed - bugfixing on new UnifiedDiff reader / writer for multifile usage - bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset - introduced change position into UnifiedDiff reader - introduced first version of conflict output possibility (like GIT merge conflict) - moved verification to `AbstractDelta` - introduced `ConflictOutput` to `Patch` to add optional behaviour to patch conflicts ### [`v4.9`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;49) ##### Changed - make patch serializable ### [`v4.8`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;48) ##### Changed - some bugfixes regarding unified diff writer - UnifiedDiffReader improved for **deleted file mode** and better timestamp recognition - UnifiedDiffReader improved for **new file mode** and better timestamp recognition ### [`v4.7`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;47) ##### Changed - minor bug fixes - optional include equal parts of original and revised data - **API** change: removed DiffException completely - added possibility to **process diffs** to for instance show whitespace characters ### [`v4.4`](https://togithub.com/java-diff-utils/java-diff-utils/blob/HEAD/CHANGELOG.md#&#8203;44--2019-11-06) ##### Changed - java-diff-utils is now a multi module project. The main project java-diff-utils now comes without any dependencies. - started reimplementation of unified diff tools - Exchange `0 += 1` for `0 = 1` in UnifiedDiffUtils - preview of new Unified Diff Reader / Writer. This is not yet feature complete but passes the tests of the old version. - feel free to issue some change requests for the api. - introduces lineNormalizer extension point to e.g. change html code encoding. (issue [#&#8203;41](https://togithub.com/java-diff-utils/java-diff-utils/issues/41)) </details> --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-java).
1 parent 79ac05f commit b9cd700

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

PROPERTIES.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PROPERTIES = {
1111
"maven.com_google_auto_value_auto_value_annotations": "com.google.auto.value:auto-value-annotations:1.7.2",
1212
"maven.com_google_code_gson": "com.google.code.gson:gson:2.8.6",
1313
"maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.19.1",
14-
"maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.0",
14+
"maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.11",
1515
"maven.javax_annotation_javax_annotation_api": "javax.annotation:javax.annotation-api:1.3.2",
1616

1717
# Gapic YAML parsing for batching settings.

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
<dependency>
343343
<groupId>io.github.java-diff-utils</groupId>
344344
<artifactId>java-diff-utils</artifactId>
345-
<version>4.0</version>
345+
<version>4.11</version>
346346
<scope>test</scope>
347347
</dependency>
348348
</dependencies>

src/test/java/com/google/api/generator/test/framework/Differ.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import com.github.difflib.DiffUtils;
1818
import com.github.difflib.UnifiedDiffUtils;
19-
import com.github.difflib.algorithm.DiffException;
2019
import com.github.difflib.patch.Patch;
2120
import java.io.IOException;
2221
import java.nio.file.Files;
@@ -49,7 +48,7 @@ private static List<String> diffTwoStringLists(List<String> original, List<Strin
4948
Patch<String> diff = null;
5049
try {
5150
diff = DiffUtils.diff(original, revised);
52-
} catch (DiffException e) {
51+
} catch (RuntimeException e) {
5352
throw new ComputeDiffException("Could not compute the differences.", e);
5453
}
5554
List<String> unifiedDiff =

0 commit comments

Comments
 (0)