From d0bddeaca9c9e31f474477dee9038bc9aae6ef5b Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Mon, 6 Jul 2026 22:16:08 +0000
Subject: [PATCH 1/7] deps(shared-deps): migrate awaitility to
 shared-dependencies

Move awaitility dependency management to java-shared-dependencies
so that it can be managed centrally in the monorepo.
Remove local awaitility version override from java-spanner.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 java-spanner/google-cloud-spanner/pom.xml                   | 2 --
 .../third-party-dependencies/pom.xml                        | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java-spanner/google-cloud-spanner/pom.xml b/java-spanner/google-cloud-spanner/pom.xml
index ef54caa99e5d..622bf33aa0df 100644
--- a/java-spanner/google-cloud-spanner/pom.xml
+++ b/java-spanner/google-cloud-spanner/pom.xml
@@ -15,7 +15,6 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-spanner</site.installationModule>
-    <awaitility.version>4.3.0</awaitility.version>
     <opencensus.version>0.31.1</opencensus.version>
     <google.cloud.monitoring.version>3.85.0</google.cloud.monitoring.version>
     <spanner.testenv.config.class>com.google.cloud.spanner.GceTestEnvConfig</spanner.testenv.config.class>
@@ -439,7 +438,6 @@
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>${awaitility.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
index 36809c3d794c..e20bb9b0e92b 100644
--- a/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/sdk-platform-java/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -273,6 +273,12 @@
         <artifactId>jspecify</artifactId>
         <version>${jspecify.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.awaitility</groupId>
+        <artifactId>awaitility</artifactId>
+        <version>${awaitility.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

From 9f0d1b84ae11cfcd00de06d97ded3fe5d93ee2b9 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 03:42:00 +0000
Subject: [PATCH 2/7] deps(datastore): migrate awaitility to
 shared-dependencies

Remove local awaitility version override from java-datastore.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 java-datastore/google-cloud-datastore/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java-datastore/google-cloud-datastore/pom.xml b/java-datastore/google-cloud-datastore/pom.xml
index c9fb4829558c..178e4a6ce80f 100644
--- a/java-datastore/google-cloud-datastore/pom.xml
+++ b/java-datastore/google-cloud-datastore/pom.xml
@@ -248,7 +248,6 @@
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
-      <version>4.3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From cb31bdefbe4d7615a67c93eff9d84aa75b9a8dcd Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 03:59:37 +0000
Subject: [PATCH 3/7] fix(deps): align logback-classic and logback-core
 versions

Bump logback-classic to 1.5.33 in google-cloud-jar-parent to match
logback-core. Remove local logback-classic override in google-cloud-storage
which was causing AbstractMethodError due to version mismatch.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 google-cloud-jar-parent/pom.xml           | 2 +-
 java-storage/google-cloud-storage/pom.xml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index e0c993412b08..fb78491a669c 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.5.25</version>
+        <version>1.5.33</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 615a0eab825f..679be96ca5a8 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -359,7 +359,6 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.3.16</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 5c39005d807a58bb4fe9f6b6f95b02ff0cce2e39 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 04:12:34 +0000
Subject: [PATCH 4/7] fix(deps): override logback to 1.3.16 in storage for Java
 8 compatibility

Override both logback-classic and logback-core to 1.3.16 in
google-cloud-storage to support running tests on Java 8 runtime,
as Logback 1.5.x requires Java 11+.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 java-storage/google-cloud-storage/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 679be96ca5a8..10611e1b67f4 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -359,6 +359,13 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
+      <version>1.3.16</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>1.3.16</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 432e1a8752b6ba825e3f66b0142cedc494e3468f Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 04:37:30 +0000
Subject: [PATCH 5/7] fix(deps): add java8 profile for logback in jar-parent,
 revert storage override

Add a `java8-logback` profile in `google-cloud-jar-parent` to downgrade
logback dependencies to `1.3.16` when running on Java 8. Remove the
hardcoded override in `google-cloud-storage` to keep default behavior on
Java 11+ at 1.5.33 while maintaining Java 8 test runtime compatibility.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 google-cloud-jar-parent/pom.xml           | 22 ++++++++++++++++++++++
 java-storage/google-cloud-storage/pom.xml |  7 -------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index fb78491a669c..688be50e7b88 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -190,6 +190,28 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>java8-logback</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 
   <build>
diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 10611e1b67f4..679be96ca5a8 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -359,13 +359,6 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.3.16</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <version>1.3.16</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 7a802f804900e36aacbf8f890bb0c75367f71c26 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 05:20:59 +0000
Subject: [PATCH 6/7] refactor(deps): move java8-logback profile to storage
 parent

Move the `java8-logback` profile from `google-cloud-jar-parent` to
`java-storage/pom.xml` (Storage Parent) since Java 8 compatibility for
tests is primarily needed/used in the Storage module. Add explanatory
comments regarding Logback 1.5.x Java 11+ requirement and the need to
downgrade to 1.3.x for Java 8 runtimes.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 google-cloud-jar-parent/pom.xml | 22 ----------------------
 java-storage/pom.xml            | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index 688be50e7b88..fb78491a669c 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -190,28 +190,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>java8-logback</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.3.16</version>
-            <scope>test</scope>
-          </dependency>
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.3.16</version>
-            <scope>test</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
   </profiles>
 
   <build>
diff --git a/java-storage/pom.xml b/java-storage/pom.xml
index a8d8a9c80871..34fed7682373 100644
--- a/java-storage/pom.xml
+++ b/java-storage/pom.xml
@@ -193,5 +193,31 @@
         <skipTests>true</skipTests>
       </properties>
     </profile>
+    <profile>
+      <!--
+        Logback 1.5.x requires Java 11+. To support running tests on Java 8,
+        we downgrade to 1.3.x when running in a Java 8 environment.
+      -->
+      <id>java8-logback</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+          <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.16</version>
+            <scope>test</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 </project>

From e714c3c3db39557d27979b7f8d2c9a87b193b95f Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 15:25:56 +0000
Subject: [PATCH 7/7] revert: remove logback changes, to be split into separate
 PR

Revert all logback-related changes (alignment and Java 8 profile) from
this branch to keep it strictly focused on Awaitility migration. The
logback changes will be submitted in a separate PR.

TAG=agy
CONV=d1b443f9-5dae-4a94-afc1-e1c33d78a802
---
 google-cloud-jar-parent/pom.xml           |  2 +-
 java-storage/google-cloud-storage/pom.xml |  1 +
 java-storage/pom.xml                      | 26 -----------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml
index fb78491a669c..e0c993412b08 100644
--- a/google-cloud-jar-parent/pom.xml
+++ b/google-cloud-jar-parent/pom.xml
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.5.33</version>
+        <version>1.5.25</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/java-storage/google-cloud-storage/pom.xml b/java-storage/google-cloud-storage/pom.xml
index 679be96ca5a8..615a0eab825f 100644
--- a/java-storage/google-cloud-storage/pom.xml
+++ b/java-storage/google-cloud-storage/pom.xml
@@ -359,6 +359,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
+      <version>1.3.16</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/java-storage/pom.xml b/java-storage/pom.xml
index 34fed7682373..a8d8a9c80871 100644
--- a/java-storage/pom.xml
+++ b/java-storage/pom.xml
@@ -193,31 +193,5 @@
         <skipTests>true</skipTests>
       </properties>
     </profile>
-    <profile>
-      <!--
-        Logback 1.5.x requires Java 11+. To support running tests on Java 8,
-        we downgrade to 1.3.x when running in a Java 8 environment.
-      -->
-      <id>java8-logback</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.3.16</version>
-            <scope>test</scope>
-          </dependency>
-          <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.3.16</version>
-            <scope>test</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
   </profiles>
 </project>