chore: merge main into generate-libraries-main

Author: cloud-java-bot

.gitignore

@@ -13,11 +13,12 @@ target/
 *.vim
 
 # Vscode Settings
-.vscode/settings.json
+.vscode
 
 # Python
 **/__pycache__/
 .venv
+.python-version
 
 # library generation
 **/googleapis

java-showcase/gapic-showcase/pom.xml

@@ -18,7 +18,9 @@
 
   <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>
+    <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>