From c1a8e66a2b8c62991032e998067b5d5f2829092e Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Wed, 19 Nov 2025 16:52:17 -0500
Subject: [PATCH 1/2] chore: update and fix logback versions used in test

---
 java-showcase/gapic-showcase/pom.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/java-showcase/gapic-showcase/pom.xml b/java-showcase/gapic-showcase/pom.xml
index 845158467f..473ce0eb80 100644
--- a/java-showcase/gapic-showcase/pom.xml
+++ b/java-showcase/gapic-showcase/pom.xml
@@ -18,7 +18,9 @@
 
   <properties>
     <gapic-showcase.version>0.36.2</gapic-showcase.version>
-    <slf4j1-logback.version>1.2.13</slf4j1-logback.version>
+    <!-- This is the last version supporting slf4j 1.x, do not upgrade -->
+    <slf4j1-logback.version>1.2.13</slf4j1-logback.version> 
+    <slf4j2-logback.version>1.5.21</slf4j2-logback.version>
   </properties>
 
   <build>
@@ -244,13 +246,13 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.5.16</version>
+          <version>${slf4j2-logback.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
-          <version>1.5.16</version>
+          <version>${slf4j2-logback.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -333,13 +335,13 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.2.13</version>
+          <version>${slf4j1-logback.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
-          <version>1.3.15</version>
+          <version>${slf4j1-logback.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

From 2dcb68ef3a9927d484d31f6dbcdc8f4234057d62 Mon Sep 17 00:00:00 2001
From: Min Zhu <zhumin@google.com>
Date: Thu, 20 Nov 2025 10:30:10 -0500
Subject: [PATCH 2/2] remove trailing whitespace

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 java-showcase/gapic-showcase/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-showcase/gapic-showcase/pom.xml b/java-showcase/gapic-showcase/pom.xml
index 473ce0eb80..a9e4de22fe 100644
--- a/java-showcase/gapic-showcase/pom.xml
+++ b/java-showcase/gapic-showcase/pom.xml
@@ -19,7 +19,7 @@
   <properties>
     <gapic-showcase.version>0.36.2</gapic-showcase.version>
     <!-- This is the last version supporting slf4j 1.x, do not upgrade -->
-    <slf4j1-logback.version>1.2.13</slf4j1-logback.version> 
+    <slf4j1-logback.version>1.2.13</slf4j1-logback.version>
     <slf4j2-logback.version>1.5.21</slf4j2-logback.version>
   </properties>