From 60fd99c31bf7f971f77cfee81e7f62952e0b79b5 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 24 Feb 2022 15:55:29 +0000
Subject: [PATCH 1/2] chore(deps): update dependency
 io.github.java-diff-utils:java-diff-utils to v4.11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e99627718..3a1a546b66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>

From 6ba6912fb160a0e62ab614ff6a3950196705691d Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Mon, 28 Feb 2022 15:36:14 -0500
Subject: [PATCH 2/2] fix code for version change

---
 PROPERTIES.bzl                                                 | 2 +-
 .../java/com/google/api/generator/test/framework/Differ.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/PROPERTIES.bzl b/PROPERTIES.bzl
index 8abf2dd26f..78b7d809c0 100644
--- a/PROPERTIES.bzl
+++ b/PROPERTIES.bzl
@@ -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.
diff --git a/src/test/java/com/google/api/generator/test/framework/Differ.java b/src/test/java/com/google/api/generator/test/framework/Differ.java
index 488282c070..74e5d76135 100644
--- a/src/test/java/com/google/api/generator/test/framework/Differ.java
+++ b/src/test/java/com/google/api/generator/test/framework/Differ.java
@@ -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;
@@ -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 =