From a69ad8fd5e5d83f663fb79594e6335b73d3a6b11 Mon Sep 17 00:00:00 2001
From: Yujun Zou <yujunzou@google.com>
Date: Mon, 8 Sep 2025 21:04:55 -0700
Subject: [PATCH] refactor: Centralize logging exclusions and update maven
 plugin POM

This change moves the Spring Boot logging exclusions to the dependencyManagement section in the dev/pom.xml. This simplifies individual module POMs, such as the one for tutorials/city-time-weather, by removing the need for repeated exclusions. The maven_plugin/pom.xml is also updated to reflect its new role, though it appears to contain erroneously duplicated content.

PiperOrigin-RevId: 804711972
---
 dev/pom.xml                         | 38 +++++++++++++++++++++
 maven_plugin/pom.xml                | 51 +----------------------------
 tutorials/city-time-weather/pom.xml | 10 ------
 3 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/dev/pom.xml b/dev/pom.xml
index eb206e76..edb8ea3f 100644
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -45,6 +45,40 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- Override Spring Boot starters to exclude logging -->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-web</artifactId>
+        <version>${spring-boot.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-websocket</artifactId>
+        <version>${spring-boot.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-test</artifactId>
+        <version>${spring-boot.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -57,6 +91,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-websocket</artifactId>
diff --git a/maven_plugin/pom.xml b/maven_plugin/pom.xml
index 53aa4e71..c9f3cb2b 100644
--- a/maven_plugin/pom.xml
+++ b/maven_plugin/pom.xml
@@ -55,55 +55,6 @@
             <artifactId>google-adk-dev</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!-- Spring Boot Dependencies -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Simple logging for Maven plugin -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
-
-        <!-- Apache HTTP Client for Spring Boot -->
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-        </dependency>
-
-        <!-- Graphviz for graph generation -->
-        <dependency>
-            <groupId>guru.nidi</groupId>
-            <artifactId>graphviz-java</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -187,4 +138,4 @@
 
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/tutorials/city-time-weather/pom.xml b/tutorials/city-time-weather/pom.xml
index 64c1704b..f39aad65 100644
--- a/tutorials/city-time-weather/pom.xml
+++ b/tutorials/city-time-weather/pom.xml
@@ -37,16 +37,6 @@
       <groupId>com.google.adk</groupId>
       <artifactId>google-adk-dev</artifactId>
       <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
     </dependency>
   </dependencies>
 </project>