From 608b071422981e4e6bf5c20b86482f262f01e148 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Tue, 7 Jul 2026 15:26:40 +0000
Subject: [PATCH] fix(deps): align logback versions and add java8 profile in
 storage

Align `logback-classic` and `logback-core` to `1.5.33` in
`google-cloud-jar-parent` to fix the version mismatch on Java 11+.
Remove local `logback-classic` override from `google-cloud-storage` to
inherit the aligned version.
Add a `java8-logback` profile in `java-storage/pom.xml` to manage both
logback dependencies to `1.3.16` when running in a Java 8 environment,
maintaining test compatibility.

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, 27 insertions(+), 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>
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>