From d7775e5608e6cfb3d03697d7cb089941c179c6b6 Mon Sep 17 00:00:00 2001
From: rishigupta1599 <rishi@browserstack.com>
Date: Thu, 18 Jun 2026 18:46:13 +0530
Subject: [PATCH 1/2] fix: add explicit jsr305 dependency for java-client
 9.x/10.x compatibility

java-client 8.x provided javax.annotation.Nullable transitively, but
java-client 9.x/10.x dropped that transitive dependency, so the SDK fails to
compile (@Nullable in AppAutomate/ScreenshotOptions) against modern clients.

Declare com.google.code.findbugs:jsr305 explicitly so the SDK builds and runs
against all major java-client versions without forcing a version bump that
would drop the Java 8 floor.

Validated: unit suite (139 tests) green on java-client 8.6.0 AND 10.1.1; and
end-to-end on App Automate with java-client 7.6.0 / 8.6.0 / 9.5.0 across
Appium servers 1.22.0 and 2.15.0.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 29c0e7c..9341bfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,17 @@
         <artifactId>java-client</artifactId>
         <version>8.6.0</version>
     </dependency>
+    <!--
+      Provides javax.annotation.Nullable. java-client 8.x pulled this in
+      transitively, but java-client 9.x/10.x dropped that transitive
+      dependency. Declaring it explicitly keeps the SDK compiling and running
+      against all major java-client versions (8, 9, 10).
+    -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>

From 168fa0ced38ef3f21b63c21ca3e140fd56c79ece Mon Sep 17 00:00:00 2001
From: rishigupta1599 <rishi@browserstack.com>
Date: Mon, 22 Jun 2026 18:03:21 +0530
Subject: [PATCH 2/2] chore: scope jsr305 as provided (review)

@Nullable has CLASS retention; provided scope keeps jsr305 off consumers'
transitive compile classpath while still satisfying the SDK's own compile.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2de731d..45b347c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,13 +52,16 @@
     <!--
       Provides javax.annotation.Nullable. java-client 8.x pulled this in
       transitively, but java-client 9.x/10.x dropped that transitive
-      dependency. Declaring it explicitly keeps the SDK compiling and running
-      against all major java-client versions (8, 9, 10).
+      dependency. Declaring it explicitly keeps the SDK compiling against all
+      major java-client versions (8, 9, 10). Scope is "provided": @Nullable has
+      CLASS retention (compile-only), so it is not needed at runtime and should
+      not leak onto consumers' classpath as a transitive compile dependency.
     -->
     <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
         <version>3.0.2</version>
+        <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>