Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump java-diff-utils from 4.5 to 4.7 #6365

Conversation

dependabot-preview[bot]
Copy link
Contributor

Bumps java-diff-utils from 4.5 to 4.7.

Changelog

Sourced from java-diff-utils's changelog.

[4.7]

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

[4.4] – 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 #41)

[4.0] – 2019-01-09

Changed

  • moved to organisation java-diff-utils
  • changed groupid to io.github.java-diff-utils and artifact id to java-diff-utils

[3.0] – 2018-10-18

Added

  • Introduced a process listener to diff algorithms. For long running diffs one could implement some progress information.
  • automatic module name for JDK 9 and higher usage

Changed

  • changed generation of inline diffes, if there are different linefeeds within one diff, then these are excluded from the diff block.

Removed

  • Due to licensing issues Delta.java and DiffAlgorithm.java were removed.

[2.2] – 2017-11-09

Added

  • released at maven central
  • included checkstyle source code conventions
  • allow configurable splitting of lines to define the blocks to compare (words, characters, phrases).
... (truncated)
Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

If all status checks pass Dependabot will automatically merge this pull request.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
  • @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in the .dependabot/config.yml file in this repo:

  • Update frequency
  • Automerge options (never/patch/minor, and dev/runtime dependencies)
  • Out-of-range updates (receive only lockfile updates, if desired)
  • Security updates (receive only security updates, if desired)

@dependabot-preview
Copy link
Contributor Author

The following labels could not be found: t: dependencies.

@dependabot-preview
Copy link
Contributor Author

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

@tobiasdiez tobiasdiez self-requested a review April 28, 2020 06:37
@tobiasdiez tobiasdiez merged commit 2f848f7 into master Apr 28, 2020
@tobiasdiez tobiasdiez deleted the dependabot/gradle/io.github.java-diff-utils-java-diff-utils-4.7 branch April 28, 2020 07:12
Siedlerchr added a commit that referenced this pull request Apr 30, 2020
…ionCaseInsensitive

* upstream/master:
  New Crowdin translations (#6375)
  Squashed 'src/main/resources/csl-styles/' changes from 143464e..906cd6d
  Fixes #6357: File directory (#6377)
  Disable the generate button if the ID field is empty (#6371)
  Fix Preferences style value too long (#6372)
  Fix various Dark theme issues (#6368)
  Correct label name in dependabot
  Bump java-diff-utils from 4.5 to 4.7 (#6365)
  Try with info.plist.template also (#6366)
  Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. (#6358)
  Bump flexmark-ext-gfm-strikethrough from 0.61.6 to 0.61.20 (#6361)
  Bump checkstyle from 8.31 to 8.32 (#6360)
  Bump flexmark-ext-gfm-tasklist from 0.61.16 to 0.61.20 (#6364)
  Bump flexmark from 0.61.16 to 0.61.20 (#6359)
  Bump org.beryx.jlink from 2.17.7 to 2.17.8 (#6362)
  Bump classgraph from 4.8.71 to 4.8.77 (#6363)
  Change blue and red colors in Merge entries dialog in Dark theme (#6356)
  Add Info plist to mac resources (#5986)
  Backward compatibility for 4.3.1 (#6296)
Siedlerchr added a commit that referenced this pull request May 2, 2020
* upstream/master: (166 commits)
  New Crowdin translations (#6382)
  Update code-howtos.md (#6393)
  Fix jstyle was invalid with default section at the start (#6386)
  Correcting file name for groups.uml (#6373)
  Fix underscore character being omitted from file name in Recent Libraries list (#6389)
  Rework journal abbreviation caching (#6304)
  Fix selecting custom export for copy to clipboard with uppercase file ext (#6290)
  New Crowdin translations (#6375)
  Squashed 'src/main/resources/csl-styles/' changes from 143464e..906cd6d
  Fixes #6357: File directory (#6377)
  Disable the generate button if the ID field is empty (#6371)
  Fix Preferences style value too long (#6372)
  Fix various Dark theme issues (#6368)
  Correct label name in dependabot
  Bump java-diff-utils from 4.5 to 4.7 (#6365)
  Try with info.plist.template also (#6366)
  Fix wrong button order (Apply and Cancel) in ManageProtectedTermsDialog. (#6358)
  Bump flexmark-ext-gfm-strikethrough from 0.61.6 to 0.61.20 (#6361)
  Bump checkstyle from 8.31 to 8.32 (#6360)
  Bump flexmark-ext-gfm-tasklist from 0.61.16 to 0.61.20 (#6364)
  ...
koppor pushed a commit that referenced this pull request Apr 15, 2023
4728902faa Create wiley-was.csl (#6283)
5853909f89 Create journal-of-human-nutrition-and-dietetics.csl (#6311)
286a3606c1 Create stanovnistvo.csl (#6431)
22a7139dc5 Update zitierguide-leitfaden-zum-fachgerechten-zitieren-in-rechtswiss… (#6489)
e51e9363ee Update netherlands-journal-of-geosciences-geologie-en-mijnbouw.csl (#6493)
4e1a69231c Add Bristol UP dependents (auto-generated) (#6494)
c9021437a4 Create microbiome-research-reports.csl (#6371)
f71e516dda Update harvard-anglia-ruskin-university.csl (#6365)
c187663e75 Create publicatiewijzer.csl (#6316)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 4728902faa1ef43c0d89366c77b7ea8f46c6730f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant