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

* Bump java-diff-utils from 4.5 to 4.7

Bumps [java-diff-utils](https://github.com/java-diff-utils/java-diff-utils) from 4.5 to 4.7.
- [Release notes](https://github.com/java-diff-utils/java-diff-utils/releases)
- [Changelog](https://github.com/java-diff-utils/java-diff-utils/blob/master/CHANGELOG.md)
- [Commits](java-diff-utils/java-diff-utils@java-diff-utils-parent-4.5...java-diff-utils-parent-4.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update DiffHighlighting.java

* Update DiffHighlighting.java

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>

build.gradle

@@ -133,7 +133,7 @@ dependencies {
     libreoffice 'org.libreoffice:ridl:6.4.3'
     libreoffice 'org.libreoffice:unoil:6.4.3'
 
-    implementation 'io.github.java-diff-utils:java-diff-utils:4.5'
+    implementation 'io.github.java-diff-utils:java-diff-utils:4.7'
     implementation 'info.debatty:java-string-similarity:1.2.1'
 
     antlr3 'org.antlr:antlr:3.5.2'

src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java

@@ -8,7 +8,6 @@
 import javafx.scene.text.Text;
 
 import com.github.difflib.DiffUtils;
-import com.github.difflib.algorithm.DiffException;
 import com.github.difflib.patch.AbstractDelta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,13 +22,7 @@ private DiffHighlighting() {
     public static List<Text> generateDiffHighlighting(String baseString, String modifiedString, String separator) {
         List<String> stringList = Arrays.asList(baseString.split(separator));
         List<Text> result = stringList.stream().map(text -> forUnchanged(text + separator)).collect(Collectors.toList());
-        List<AbstractDelta<String>> deltaList;
-        try {
-            deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
-        } catch (DiffException e) {
-            LOGGER.error("Error while generating diff of " + baseString + " and " + modifiedString);
-            return Collections.emptyList();
-        }
+        List<AbstractDelta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
         Collections.reverse(deltaList);
         for (AbstractDelta<String> delta : deltaList) {
             int startPos = delta.getSource().getPosition();
@@ -87,13 +80,7 @@ public static Text forRemoved(String text) {
     public static List<Text> generateSymmetricHighlighting(String baseString, String modifiedString, String separator) {
         List<String> stringList = Arrays.asList(baseString.split(separator));
         List<Text> result = stringList.stream().map(text -> DiffHighlighting.forUnchanged(text + separator)).collect(Collectors.toList());
-        List<AbstractDelta<String>> deltaList;
-        try {
-            deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
-        } catch (DiffException e) {
-            LOGGER.error("Error while generating diff of " + baseString + " and " + modifiedString);
-            return Collections.emptyList();
-        }
+        List<AbstractDelta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
         Collections.reverse(deltaList);
         for (AbstractDelta<String> delta : deltaList) {
             int startPos = delta.getSource().getPosition();