deps: Bump ADK Java to rev on vorburger fork with Protobuf version bump

MODULE.bazel

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ADK_JAVA_COMMIT = "99265cf268be4dbd0a82decf5c48bf57b3725b53"
+ADK_JAVA_COMMIT = "0c4eed584f"
 
 GUAVA_VERSION = "33.4.8-jre"
 
@@ -212,9 +212,9 @@ enola_maven.install(
         # "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.google.adk-java:google-adk:" + ADK_JAVA_COMMIT,
-        "com.github.google.adk-java:google-adk-dev:" + ADK_JAVA_COMMIT,
-        "com.github.google.adk-java:google-adk-contrib-langchain4j:" + ADK_JAVA_COMMIT,
+        "com.github.vorburger.adk-java:google-adk:" + ADK_JAVA_COMMIT,
+        "com.github.vorburger.adk-java:google-adk-dev:" + ADK_JAVA_COMMIT,
+        "com.github.vorburger.adk-java:google-adk-langchain4j:" + ADK_JAVA_COMMIT,
 
         # https://github.com/jknack/handlebars.java
         "com.github.jknack:handlebars:4.4.0",

docs/dev/dependencies.txt

@@ -10,6 +10,7 @@ com.anthropic:anthropic-java-core:1.4.0
 com.anthropic:anthropic-java-vertex:1.4.0
 com.drewnoakes:metadata-extractor:2.19.0
 com.epam:parso:2.0.14
+com.ethlo.time:itu:1.10.3
 com.fasterxml.jackson.core:jackson-annotations:2.19.2
 com.fasterxml.jackson.core:jackson-core:2.19.2
 com.fasterxml.jackson.core:jackson-databind:2.19.2
@@ -31,9 +32,6 @@ com.github.docker-java:docker-java-transport:3.3.6
 com.github.docker-java:docker-java-transport-httpclient5:3.3.6
 com.github.docker-java:docker-java-transport-jersey:3.3.6
 com.github.docker-java:docker-java-transport-netty:3.3.6
-com.github.google.adk-java:google-adk:99265cf268be4dbd0a82decf5c48bf57b3725b53
-com.github.google.adk-java:google-adk-contrib-langchain4j:99265cf268be4dbd0a82decf5c48bf57b3725b53
-com.github.google.adk-java:google-adk-dev:99265cf268be4dbd0a82decf5c48bf57b3725b53
 com.github.hypfvieh:dbus-java-core:4.3.1
 com.github.hypfvieh:dbus-java-transport-native-unixsocket:4.3.1
 com.github.ipfs:java-ipfs-http-client:d982fc0fa1
@@ -52,6 +50,9 @@ com.github.package-url:packageurl-java:1.5.0
 com.github.spotbugs:spotbugs-annotations:4.9.3
 com.github.valfirst:slf4j-test:3.0.1
 com.github.virtuald:curvesapi:1.08
+com.github.vorburger.adk-java:google-adk:0c4eed584f
+com.github.vorburger.adk-java:google-adk-dev:0c4eed584f
+com.github.vorburger.adk-java:google-adk-langchain4j:0c4eed584f
 com.google.android:annotations:4.1.1.4
 com.google.api-client:google-api-client:2.7.1
 com.google.api.grpc:gapic-google-cloud-storage-v2:2.47.0
@@ -116,6 +117,7 @@ com.healthmarketscience.jackcess:jackcess:4.0.7
 com.healthmarketscience.jackcess:jackcess-encrypt:4.0.2
 com.kohlschutter.junixsocket:junixsocket-common:2.6.1
 com.kohlschutter.junixsocket:junixsocket-native-common:2.6.1
+com.networknt:json-schema-validator:1.5.7
 com.pff:java-libpst:0.9.3
 com.rometools:rome:2.1.0
 com.squareup.okhttp3:logging-interceptor:4.12.0
@@ -172,7 +174,7 @@ io.kubernetes:client-java-api:24.0.0
 io.kubernetes:client-java-proto:24.0.0
 io.micrometer:micrometer-commons:1.14.2
 io.micrometer:micrometer-observation:1.14.2
-io.modelcontextprotocol.sdk:mcp:0.10.0
+io.modelcontextprotocol.sdk:mcp:0.11.3
 io.netty:netty-buffer:4.1.124.Final
 io.netty:netty-codec:4.1.124.Final
 io.netty:netty-codec-http:4.1.124.Final
@@ -236,7 +238,7 @@ org.apache.commons:commons-exec:1.4.0
 org.apache.commons:commons-lang3:3.17.0
 org.apache.commons:commons-math3:3.6.1
 org.apache.commons:commons-text:1.11.0
-org.apache.httpcomponents.client5:httpclient5:5.4.1
+org.apache.httpcomponents.client5:httpclient5:5.4.3
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents:httpclient:4.5.14

java/dev/enola/ai/adk/core/BUILD

@@ -33,7 +33,7 @@ java_library(
     deps = [
         "//java/dev/enola/common/function",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
@@ -56,7 +56,7 @@ junit_tests(
         "//java/dev/enola/common/secret",
         "//java/dev/enola/common/secret/auto",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
     ],

java/dev/enola/ai/adk/demo/BUILD

@@ -49,7 +49,7 @@ java_library(
         "//java/dev/enola/common/io/iri",
         "//java/dev/enola/common/secret/auto",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
@@ -72,7 +72,7 @@ junit_tests(
         "//java/dev/enola/common/secret",
         "//java/dev/enola/common/secret/auto",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
     ],

java/dev/enola/ai/adk/iri/BUILD

@@ -39,9 +39,9 @@ java_library(
         "@enola_maven//:com_anthropic_anthropic_java_client_okhttp",
         "@enola_maven//:com_anthropic_anthropic_java_core",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         # "@enola_maven//:com_google_adk_google_adk_contrib_langchain4j",
-        "@enola_maven//:com_github_google_adk_java_google_adk_contrib_langchain4j",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk_langchain4j",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:dev_langchain4j_langchain4j_ollama",
@@ -64,7 +64,7 @@ junit_tests(
         "//java/dev/enola/common/secret",
         "//java/dev/enola/common/secret/auto",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
     ],
 )

java/dev/enola/ai/adk/test/BUILD

@@ -35,7 +35,7 @@ java_library(
         "//java/dev/enola/common/markdown",
         "//java/dev/enola/common/yamljson",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
@@ -53,7 +53,7 @@ junit_tests(
     deps = [
         ":test",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
     ],

java/dev/enola/ai/adk/tool/BUILD

@@ -37,7 +37,7 @@ java_library(
         "//java/dev/enola/common/time",
         "//java/dev/enola/common/name",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:io_modelcontextprotocol_sdk_mcp",
         "@enola_maven//:com_google_errorprone_error_prone_annotations",
         "@enola_maven//:com_google_genai_google_genai",
@@ -62,7 +62,7 @@ junit_tests(
         "//java/dev/enola/common/secret",
         "//java/dev/enola/common/secret/auto",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
     ],
 )

java/dev/enola/ai/adk/web/AdkHttpServer.java

@@ -19,13 +19,13 @@
 
 import com.google.adk.agents.BaseAgent;
 import com.google.adk.web.AdkWebServer;
-import com.google.adk.web.config.AgentLoadingProperties;
 import com.google.common.collect.ImmutableMap;
 
 import dev.enola.ai.adk.core.Agents;
 import dev.enola.common.rx.RxJavaPluginsSetup;
 
 import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.web.ErrorProperties;
@@ -35,7 +35,6 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -73,8 +72,16 @@ public static synchronized AdkHttpServer start(Iterable<BaseAgent> agents, int p
                 "org.apache.tomcat.websocket.DEFAULT_BUFFER_SIZE",
                 String.valueOf(10 * 1024 * 1024));
 
-        var app = new SpringApplication(ImprovedAdkWebServer.class);
-        app.setBannerMode(Banner.Mode.OFF);
+        // As in com.google.adk.web.AdkWebServer#start()
+        System.setProperty("adk.agents.loader", "static");
+        SpringApplication app = new SpringApplication(ImprovedAdkWebServer.class);
+        app.setBannerMode(Banner.Mode.OFF); // ADDED NEW, not there in the original
+        app.addInitializers(
+                context -> {
+                    DefaultListableBeanFactory beanFactory =
+                            (DefaultListableBeanFactory) context.getBeanFactory();
+                    beanFactory.registerSingleton("agentLoader", new AgentStaticLoader(agents));
+                });
         var context = app.run();
         Environment environment = context.getBean(Environment.class);
         String httpPort = environment.getProperty("local.server.port");
@@ -92,14 +99,6 @@ public void close() {
 
     static class ImprovedAdkWebServer extends AdkWebServer {
 
-        @Override
-        public Map<String, BaseAgent> loadedAgentRegistry(
-                AgentLoadingProperties props, RunnerService runnerService) {
-            if (rootAgents == null)
-                throw new IllegalStateException("Call AdkHttpServer.agents(...) before start()");
-            return rootAgents;
-        }
-
         @Bean
         @Primary
         // Nota bene: @Primary takes precedence over the default ServerPropertiesAutoConfiguration,

java/dev/enola/ai/adk/web/AgentStaticLoader.java

@@ -0,0 +1,64 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2025 The Enola <https://enola.dev> Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package dev.enola.ai.adk.web;
+
+import com.google.adk.agents.BaseAgent;
+import com.google.adk.web.AgentLoader;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+// TODO Upstream this (it's package-local there)
+public class AgentStaticLoader implements AgentLoader {
+    private final ImmutableMap<String, BaseAgent> agents;
+
+    public AgentStaticLoader(BaseAgent... agents) {
+        this(Arrays.stream(agents));
+    }
+
+    public AgentStaticLoader(Iterable<BaseAgent> agents) {
+        this(StreamSupport.stream(agents.spliterator(), false));
+    }
+
+    public AgentStaticLoader(Stream<BaseAgent> agents) {
+        this.agents =
+                agents.collect(ImmutableMap.toImmutableMap(BaseAgent::name, Function.identity()));
+    }
+
+    public ImmutableList<String> listAgents() {
+        return this.agents.keySet().stream().collect(ImmutableList.toImmutableList());
+    }
+
+    public BaseAgent loadAgent(String name) {
+        if (name != null && !name.trim().isEmpty()) {
+            BaseAgent agent = this.agents.get(name);
+            if (agent == null) {
+                throw new NoSuchElementException("Agent not found: " + name);
+            } else {
+                return agent;
+            }
+        } else {
+            throw new IllegalArgumentException("Agent name cannot be null or empty");
+        }
+    }
+}

java/dev/enola/ai/adk/web/BUILD

@@ -41,9 +41,9 @@ java_library(
         "//java/dev/enola/ai/adk/test",
         "//java/dev/enola/common/rx",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         # "@enola_maven//:com_google_adk_google_adk_dev",
-        "@enola_maven//:com_github_google_adk_java_google_adk_dev",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk_dev",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:org_jspecify_jspecify",
         "@enola_maven//:org_slf4j_slf4j_api",
@@ -66,6 +66,6 @@ junit_tests(
         "//java/dev/enola/ai/adk/test",
         "//java/dev/enola/common/io",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
     ],
 )

java/dev/enola/ai/dotagent/BUILD

@@ -53,7 +53,7 @@ java_library(
         "//java/dev/enola/common/secret",
         "@enola_maven//:com_fasterxml_jackson_core_jackson_annotations",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
@@ -79,6 +79,6 @@ junit_tests(
         "//java/dev/enola/common/secret",
         "//java/dev/enola/common/secret/auto",
         "//test",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
     ],
 )

java/dev/enola/ai/dotprompt/adk/BUILD

@@ -37,7 +37,7 @@ java_library(
         "//java/dev/enola/common/io/object",
         "//java/dev/enola/common/io/object/jackson",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:io_reactivex_rxjava3_rxjava",
@@ -63,7 +63,7 @@ junit_tests(
         "//java/dev/enola/common/secret/auto",
         "//test",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_genai_google_genai",
     ],
 )

java/dev/enola/cli/BUILD

@@ -93,7 +93,7 @@ java_library(
         "@enola_maven//:com_github_multiformats_java_multibase",
         "@enola_maven//:com_github_multiformats_java_multihash",
         # "@enola_maven//:com_google_adk_google_adk",
-        "@enola_maven//:com_github_google_adk_java_google_adk",
+        "@enola_maven//:com_github_vorburger_adk_java_google_adk",
         "@enola_maven//:com_google_guava_guava",
         "@enola_maven//:com_google_protobuf_protobuf_java",
         "@enola_maven//:info_picocli_picocli",