From 6c3fe48b20181f4a785dde50d4a5297dc2d85ad1 Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Fri, 25 Oct 2024 12:48:01 -0400
Subject: [PATCH 1/3] add additional potential exceptions when retrieving
 protobuf manifest file to get version

---
 .../src/main/java/com/google/api/gax/core/GaxProperties.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
index 20d5ecc0dc..005b160244 100644
--- a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
+++ b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
@@ -144,7 +144,7 @@ static Optional<String> getBundleVersion(Class<?> clazz) {
         Attributes attributes = jar.getManifest().getMainAttributes();
         return Optional.ofNullable(attributes.getValue("Bundle-Version"));
       }
-    } catch (URISyntaxException | IOException e) {
+    } catch (URISyntaxException | IOException | IllegalArgumentException | SecurityException | NullPointerException e) {
       // Unable to read Bundle-Version from manifest. Recover gracefully.
       return Optional.empty();
     }

From 683f2d6efb2518c356d2fa08e1cd72e4a6039acd Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Fri, 25 Oct 2024 12:55:18 -0400
Subject: [PATCH 2/3] format

---
 .../main/java/com/google/api/gax/core/GaxProperties.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
index 005b160244..7a9b9d31f3 100644
--- a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
+++ b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
@@ -144,7 +144,11 @@ static Optional<String> getBundleVersion(Class<?> clazz) {
         Attributes attributes = jar.getManifest().getMainAttributes();
         return Optional.ofNullable(attributes.getValue("Bundle-Version"));
       }
-    } catch (URISyntaxException | IOException | IllegalArgumentException | SecurityException | NullPointerException e) {
+    } catch (URISyntaxException
+        | IOException
+        | IllegalArgumentException
+        | SecurityException
+        | NullPointerException e) {
       // Unable to read Bundle-Version from manifest. Recover gracefully.
       return Optional.empty();
     }

From 5dd61e28c14d41e3379313a3831767e30c805e84 Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:03:15 -0400
Subject: [PATCH 3/3] let's keep generic to ensure no other issues occur

---
 .../main/java/com/google/api/gax/core/GaxProperties.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
index 7a9b9d31f3..f15046afcb 100644
--- a/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
+++ b/gax-java/gax/src/main/java/com/google/api/gax/core/GaxProperties.java
@@ -36,7 +36,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URISyntaxException;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.jar.Attributes;
@@ -144,11 +143,7 @@ static Optional<String> getBundleVersion(Class<?> clazz) {
         Attributes attributes = jar.getManifest().getMainAttributes();
         return Optional.ofNullable(attributes.getValue("Bundle-Version"));
       }
-    } catch (URISyntaxException
-        | IOException
-        | IllegalArgumentException
-        | SecurityException
-        | NullPointerException e) {
+    } catch (Exception e) {
       // Unable to read Bundle-Version from manifest. Recover gracefully.
       return Optional.empty();
     }