Skip to content

Commit

Permalink
chore(deps): update dependency io.github.java-diff-utils:java-diff-ut…
Browse files Browse the repository at this point in the history
…ils 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).
  • Loading branch information
renovate-bot authored Feb 28, 2022
1 parent 79ac05f commit b9cd700
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion PROPERTIES.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PROPERTIES = {
"maven.com_google_auto_value_auto_value_annotations": "com.google.auto.value:auto-value-annotations:1.7.2",
"maven.com_google_code_gson": "com.google.code.gson:gson:2.8.6",
"maven.com_google_protobuf_protobuf_java": "com.google.protobuf:protobuf-java:3.19.1",
"maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.0",
"maven.io_github_java_diff_utils": "io.github.java-diff-utils:java-diff-utils:4.11",
"maven.javax_annotation_javax_annotation_api": "javax.annotation:javax.annotation-api:1.3.2",

# Gapic YAML parsing for batching settings.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@
<dependency>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils</artifactId>
<version>4.0</version>
<version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import com.github.difflib.DiffUtils;
import com.github.difflib.UnifiedDiffUtils;
import com.github.difflib.algorithm.DiffException;
import com.github.difflib.patch.Patch;
import java.io.IOException;
import java.nio.file.Files;
Expand Down Expand Up @@ -49,7 +48,7 @@ private static List<String> diffTwoStringLists(List<String> original, List<Strin
Patch<String> diff = null;
try {
diff = DiffUtils.diff(original, revised);
} catch (DiffException e) {
} catch (RuntimeException e) {
throw new ComputeDiffException("Could not compute the differences.", e);
}
List<String> unifiedDiff =
Expand Down

0 comments on commit b9cd700

Please sign in to comment.