chore: WIP... too much in 1 go

MODULE.bazel

@@ -116,9 +116,9 @@ maven.install(
         "com.github.valfirst:slf4j-test:3.0.1",
         "org.apache.sshd:sshd-core:2.15.0",
         "de.swiesend:secret-service:2.0.1-alpha",
-        "com.github.vorburger.adk-java:google-adk:0c4eed584f",
-        "com.github.vorburger.adk-java:google-adk-dev:0c4eed584f",
+        "com.github.vorburger.adk-java:google-adk-dev:e60bddf6502bbfac5af3fb993acc100439c0d90f",
         "org.commonmark:commonmark:0.25.0",
+        "io.modelcontextprotocol.sdk:mcp:0.11.3",
     ],
 
     # NB: Never de-activate duplicate_version_warning = "error"!
@@ -169,6 +169,15 @@ maven.install(
         # Used by Multiformats, IPFS & IPLD
         "https://jitpack.io",
     ],
+    resolver = "maven",
+)
+maven.artifact(
+    artifact = "google-adk",
+    exclusions = [
+        "io.modelcontextprotocol.sdk:mcp",
+    ],
+    group = "com.github.vorburger.adk-java",
+    version = "e60bddf6502bbfac5af3fb993acc100439c0d90f",
 )
 maven.artifact(
     artifact = "google-adk-langchain4j",
@@ -177,9 +186,10 @@ maven.artifact(
         "ch.qos.logback:logback-core",
         "ch.qos.logback:logback-classic",
         "org.springframework.boot:spring-boot-starter-logging",
+        "io.modelcontextprotocol.sdk:mcp",
     ],
     group = "com.github.vorburger.adk-java",
-    version = "0c4eed584f",
+    version = "e60bddf6502bbfac5af3fb993acc100439c0d90f",
 )
 maven.artifact(
     artifact = "guava",

MODULE.bazel.handlebars

@@ -98,6 +98,7 @@ maven.install(
         # Used by Multiformats, IPFS & IPLD
         "https://jitpack.io",
     ],
+    resolver = "maven",
 ){{#bomx}}
 maven.artifact(
     {{gav this}}

MODULE.bom.handlebars.yaml

@@ -17,7 +17,8 @@
 version:
   langchain4j: 1.6.0
   langchain4j-beta: 1.6.0-beta12
-  adk: 0c4eed584f
+  # https://github.com/google/adk-java/pull/486
+  adk: e60bddf6502bbfac5af3fb993acc100439c0d90f
   rdf4j: 5.1.4
   grpc: 1.75.0
 
@@ -136,22 +137,31 @@ bom:
   # "org.purejava:kdewallet:1.6.0"
 
   # https://google.github.io/adk-docs/get-started/installation/
-  # "com.google.adk:google-adk:0.2.0"
   # "com.google.adk:google-adk-dev:0.2.0"
-  # "com.google.adk:google-adk-contrib-langchain4j:0.2.0"
-  - "com.github.vorburger.adk-java:google-adk:{{version.adk}}"
   - "com.github.vorburger.adk-java:google-adk-dev:{{version.adk}}"
 
   # https://github.com/commonmark/commonmark-java
   - "org.commonmark:commonmark:0.25.0"
 
+  # Beware of https://github.com/enola-dev/enola/issues/1857
+  - io.modelcontextprotocol.sdk:mcp:0.11.3
+
 bomx:
+  - "com.github.vorburger.adk-java:google-adk:{{version.adk}}":
+    exclusions:
+      - io.modelcontextprotocol.sdk:mcp
+
+  # NB: No com.github.vorburger.adk-java:google-adk (com.google.adk:google-adk),
+  #     as that's transitively included by google-adk-langchain4j anyway.
+  # "com.google.adk:google-adk-contrib-langchain4j:0.2.0"
   - "com.github.vorburger.adk-java:google-adk-langchain4j:{{version.adk}}":
     exclusions:
       - org.eclipse.jdt:ecj
       - ch.qos.logback:logback-core
       - ch.qos.logback:logback-classic
       - org.springframework.boot:spring-boot-starter-logging
+      # Due to https://github.com/enola-dev/enola/issues/1857
+      - io.modelcontextprotocol.sdk:mcp
 
   - com.google.guava:guava:33.4.8-jre:
     exclusions: