diff --git a/MODULE.bazel b/MODULE.bazel
index e72779412..b8d210124 100644
--- a/MODULE.bazel
+++ b/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",
diff --git a/docs/dev/dependencies.txt b/docs/dev/dependencies.txt
index 77a35aa17..3a4191dd5 100644
--- a/docs/dev/dependencies.txt
+++ b/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
diff --git a/java/dev/enola/ai/adk/core/BUILD b/java/dev/enola/ai/adk/core/BUILD
index cdc87df64..ae669630e 100644
--- a/java/dev/enola/ai/adk/core/BUILD
+++ b/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",
     ],
diff --git a/java/dev/enola/ai/adk/demo/BUILD b/java/dev/enola/ai/adk/demo/BUILD
index a8d1ab69e..5149f9727 100644
--- a/java/dev/enola/ai/adk/demo/BUILD
+++ b/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",
     ],
diff --git a/java/dev/enola/ai/adk/iri/BUILD b/java/dev/enola/ai/adk/iri/BUILD
index 575a66319..770d5421a 100644
--- a/java/dev/enola/ai/adk/iri/BUILD
+++ b/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",
     ],
 )
diff --git a/java/dev/enola/ai/adk/test/BUILD b/java/dev/enola/ai/adk/test/BUILD
index 384092615..de12713da 100644
--- a/java/dev/enola/ai/adk/test/BUILD
+++ b/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",
     ],
diff --git a/java/dev/enola/ai/adk/tool/BUILD b/java/dev/enola/ai/adk/tool/BUILD
index e0eddf065..1bb61a283 100644
--- a/java/dev/enola/ai/adk/tool/BUILD
+++ b/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",
     ],
 )
diff --git a/java/dev/enola/ai/adk/web/AdkHttpServer.java b/java/dev/enola/ai/adk/web/AdkHttpServer.java
index 9439377e4..9a8e30dd3 100644
--- a/java/dev/enola/ai/adk/web/AdkHttpServer.java
+++ b/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,
diff --git a/java/dev/enola/ai/adk/web/AgentStaticLoader.java b/java/dev/enola/ai/adk/web/AgentStaticLoader.java
new file mode 100644
index 000000000..f6ddcd14f
--- /dev/null
+++ b/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");
+        }
+    }
+}
diff --git a/java/dev/enola/ai/adk/web/BUILD b/java/dev/enola/ai/adk/web/BUILD
index 405d14176..cc508b8e1 100644
--- a/java/dev/enola/ai/adk/web/BUILD
+++ b/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",
     ],
 )
diff --git a/java/dev/enola/ai/dotagent/BUILD b/java/dev/enola/ai/dotagent/BUILD
index a8dc4181c..f620ce792 100644
--- a/java/dev/enola/ai/dotagent/BUILD
+++ b/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",
     ],
 )
diff --git a/java/dev/enola/ai/dotprompt/adk/BUILD b/java/dev/enola/ai/dotprompt/adk/BUILD
index 66eda1011..ddf9bfda0 100644
--- a/java/dev/enola/ai/dotprompt/adk/BUILD
+++ b/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",
     ],
 )
diff --git a/java/dev/enola/cli/BUILD b/java/dev/enola/cli/BUILD
index b95dc717c..895523da4 100644
--- a/java/dev/enola/cli/BUILD
+++ b/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",
diff --git a/maven_install.json b/maven_install.json
index 2ae953d02..354a15403 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1669500651,
-  "__RESOLVED_ARTIFACTS_HASH": 2108037596,
+  "__INPUT_ARTIFACTS_HASH": 1094381205,
+  "__RESOLVED_ARTIFACTS_HASH": 1285681559,
   "conflict_resolution": {
     "com.github.multiformats:java-multihash:d238c77f11a0ff33970ad43578ae11f049324848": "com.github.multiformats:java-multihash:1.3.6"
   },
@@ -89,6 +89,13 @@
       },
       "version": "2.0.14"
     },
+    "com.ethlo.time:itu": {
+      "shasums": {
+        "jar": "23d3ba84095d489a595240f89045085ea5066fb6fc1dc091258d577df9d74abc",
+        "sources": "1c7a769e498b2537754c286497e8eac470635239c6ddb16f75a9bc90aecc727f"
+      },
+      "version": "1.10.3"
+    },
     "com.fasterxml.jackson.core:jackson-annotations": {
       "shasums": {
         "jar": "e516743a316dcf83c572ffc9cb6e8c5e8c134880c8c5155b02f7b34e9c5dc3cf",
@@ -236,24 +243,6 @@
       },
       "version": "3.3.6"
     },
-    "com.github.google.adk-java:google-adk": {
-      "shasums": {
-        "jar": "325a62a0b001b95b2e72ec7cc363da384975224dd010671bfcff0a851261f6a7"
-      },
-      "version": "99265cf268be4dbd0a82decf5c48bf57b3725b53"
-    },
-    "com.github.google.adk-java:google-adk-contrib-langchain4j": {
-      "shasums": {
-        "jar": "dd8edcae84db43e7ad087087c874a8028ff35655b290deb308be7f7c7c912262"
-      },
-      "version": "99265cf268be4dbd0a82decf5c48bf57b3725b53"
-    },
-    "com.github.google.adk-java:google-adk-dev": {
-      "shasums": {
-        "jar": "3e44e2c4f7dd53ddc6ab761dbc61790030cfb3fdeb61026da104b51131f794dc"
-      },
-      "version": "99265cf268be4dbd0a82decf5c48bf57b3725b53"
-    },
     "com.github.hypfvieh:dbus-java-core": {
       "shasums": {
         "jar": "3cd38632f86745707dc2c8b2cb630c59130cfa314eb7a488b4c19078bf417d54",
@@ -380,6 +369,24 @@
       },
       "version": "1.08"
     },
+    "com.github.vorburger.adk-java:google-adk": {
+      "shasums": {
+        "jar": "f36b2c0bd8b5c35987f2dfebac1a7bf21a9640f60ac0e4736b1bf403d51e5fe1"
+      },
+      "version": "0c4eed584f"
+    },
+    "com.github.vorburger.adk-java:google-adk-dev": {
+      "shasums": {
+        "jar": "f029f2c8ee7fd7dd3d74f3162ddfddbe81fcbfd2393c3062c400a39d58b97127"
+      },
+      "version": "0c4eed584f"
+    },
+    "com.github.vorburger.adk-java:google-adk-langchain4j": {
+      "shasums": {
+        "jar": "2b20ad5f715f6b87a84a0bfa34559be13258896d24c871ed9290e4735863ba46"
+      },
+      "version": "0c4eed584f"
+    },
     "com.google.android:annotations": {
       "shasums": {
         "jar": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15",
@@ -827,6 +834,13 @@
       },
       "version": "2.6.1"
     },
+    "com.networknt:json-schema-validator": {
+      "shasums": {
+        "jar": "2c71e970dc1b67499b99efaf65982696e98ced0028548d43bf4eba06edd8834f",
+        "sources": "b0f1e69d852f464a5f30a33a5870afc6a09d656238c56ad95123be13b47fdeff"
+      },
+      "version": "1.5.7"
+    },
     "com.pff:java-libpst": {
       "shasums": {
         "jar": "039cd61635ded94dba67f909d3b1763e13f9c23d02f9750eb6259af10e1dabdb",
@@ -1220,10 +1234,10 @@
     },
     "io.modelcontextprotocol.sdk:mcp": {
       "shasums": {
-        "jar": "ee5b24c04a9432ef9495342f80f6dcaceb6fc2a907f535677be0331ea896ca6b",
-        "sources": "4dea795cb679a36f7d6f97f3578a1727c90954f874631e0bc33cc422634fc10d"
+        "jar": "a5490c9f2d5c19126d00ed0983bf991c4d7538ee7b0c74b58959d768613043b3",
+        "sources": "cb93adaed2e478baedc18585a532e8158e9cdc9031ea065e0b8192e34121a155"
       },
-      "version": "0.10.0"
+      "version": "0.11.3"
     },
     "io.netty:netty-buffer": {
       "shasums": {
@@ -1668,10 +1682,10 @@
     },
     "org.apache.httpcomponents.client5:httpclient5": {
       "shasums": {
-        "jar": "c6c6fc60cbb3edd9e823d9226d608ff3135eb48bd2049bb83bdbc3ef4a911138",
-        "sources": "eeecccbfe76ee20ac0902ae776ba3df0fe343fa0488e013031a5e3b505b495b6"
+        "jar": "739e035679c68e15efa93b44c808a453bc98eaac1722e5a80cab15c026223022",
+        "sources": "20bbffb4c8998a9f00eb5ad215f0271e9ecd5f9b039b9d6051e84610fb78c4b6"
       },
-      "version": "5.4.1"
+      "version": "5.4.3"
     },
     "org.apache.httpcomponents.core5:httpcore5": {
       "shasums": {
@@ -3181,54 +3195,6 @@
       "io.netty:netty-transport-native-epoll:jar:linux-x86_64",
       "io.netty:netty-transport-native-kqueue:jar:osx-x86_64"
     ],
-    "com.github.google.adk-java:google-adk": [
-      "com.anthropic:anthropic-java",
-      "com.anthropic:anthropic-java-vertex",
-      "com.fasterxml.jackson.core:jackson-databind",
-      "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
-      "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
-      "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
-      "com.github.docker-java:docker-java",
-      "com.github.docker-java:docker-java-transport-httpclient5",
-      "com.google.auth:google-auth-library-oauth2-http",
-      "com.google.cloud:google-cloud-aiplatform",
-      "com.google.cloud:google-cloud-speech",
-      "com.google.cloud:google-cloud-storage",
-      "com.google.errorprone:error_prone_annotations",
-      "com.google.genai:google-genai",
-      "com.google.protobuf:protobuf-java",
-      "com.squareup.okhttp3:okhttp",
-      "io.modelcontextprotocol.sdk:mcp",
-      "io.opentelemetry:opentelemetry-api",
-      "io.opentelemetry:opentelemetry-exporter-otlp",
-      "io.opentelemetry:opentelemetry-sdk",
-      "io.opentelemetry:opentelemetry-sdk-logs",
-      "io.opentelemetry:opentelemetry-sdk-trace",
-      "io.projectreactor:reactor-core",
-      "io.reactivex.rxjava3:rxjava",
-      "org.java-websocket:Java-WebSocket",
-      "org.jspecify:jspecify"
-    ],
-    "com.github.google.adk-java:google-adk-contrib-langchain4j": [
-      "com.github.google.adk-java:google-adk",
-      "com.github.google.adk-java:google-adk-dev",
-      "com.google.genai:google-genai",
-      "dev.langchain4j:langchain4j-core",
-      "io.modelcontextprotocol.sdk:mcp"
-    ],
-    "com.github.google.adk-java:google-adk-dev": [
-      "com.github.google.adk-java:google-adk",
-      "guru.nidi:graphviz-java",
-      "io.opentelemetry:opentelemetry-api",
-      "io.opentelemetry:opentelemetry-exporter-otlp",
-      "io.opentelemetry:opentelemetry-sdk",
-      "io.opentelemetry:opentelemetry-sdk-common",
-      "io.opentelemetry:opentelemetry-sdk-logs",
-      "io.opentelemetry:opentelemetry-sdk-trace",
-      "org.apache.httpcomponents.client5:httpclient5",
-      "org.springframework.boot:spring-boot-starter-web",
-      "org.springframework.boot:spring-boot-starter-websocket"
-    ],
     "com.github.hypfvieh:dbus-java-transport-native-unixsocket": [
       "com.github.hypfvieh:dbus-java-core"
     ],
@@ -3270,6 +3236,54 @@
     "com.github.valfirst:slf4j-test": [
       "org.slf4j:slf4j-api"
     ],
+    "com.github.vorburger.adk-java:google-adk": [
+      "com.anthropic:anthropic-java",
+      "com.anthropic:anthropic-java-vertex",
+      "com.fasterxml.jackson.core:jackson-databind",
+      "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
+      "com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
+      "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
+      "com.github.docker-java:docker-java",
+      "com.github.docker-java:docker-java-transport-httpclient5",
+      "com.google.auth:google-auth-library-oauth2-http",
+      "com.google.cloud:google-cloud-aiplatform",
+      "com.google.cloud:google-cloud-speech",
+      "com.google.cloud:google-cloud-storage",
+      "com.google.errorprone:error_prone_annotations",
+      "com.google.genai:google-genai",
+      "com.google.protobuf:protobuf-java",
+      "com.squareup.okhttp3:okhttp",
+      "io.modelcontextprotocol.sdk:mcp",
+      "io.opentelemetry:opentelemetry-api",
+      "io.opentelemetry:opentelemetry-exporter-otlp",
+      "io.opentelemetry:opentelemetry-sdk",
+      "io.opentelemetry:opentelemetry-sdk-logs",
+      "io.opentelemetry:opentelemetry-sdk-trace",
+      "io.projectreactor:reactor-core",
+      "io.reactivex.rxjava3:rxjava",
+      "org.java-websocket:Java-WebSocket",
+      "org.jspecify:jspecify"
+    ],
+    "com.github.vorburger.adk-java:google-adk-dev": [
+      "com.github.vorburger.adk-java:google-adk",
+      "guru.nidi:graphviz-java",
+      "io.opentelemetry:opentelemetry-api",
+      "io.opentelemetry:opentelemetry-exporter-otlp",
+      "io.opentelemetry:opentelemetry-sdk",
+      "io.opentelemetry:opentelemetry-sdk-common",
+      "io.opentelemetry:opentelemetry-sdk-logs",
+      "io.opentelemetry:opentelemetry-sdk-trace",
+      "org.apache.httpcomponents.client5:httpclient5",
+      "org.springframework.boot:spring-boot-starter-web",
+      "org.springframework.boot:spring-boot-starter-websocket"
+    ],
+    "com.github.vorburger.adk-java:google-adk-langchain4j": [
+      "com.github.vorburger.adk-java:google-adk",
+      "com.github.vorburger.adk-java:google-adk-dev",
+      "com.google.genai:google-genai",
+      "dev.langchain4j:langchain4j-core",
+      "io.modelcontextprotocol.sdk:mcp"
+    ],
     "com.google.api.grpc:grpc-google-cloud-pubsub-v1": [
       "com.google.api.grpc:proto-google-cloud-pubsub-v1",
       "com.google.api.grpc:proto-google-common-protos",
@@ -3646,6 +3660,12 @@
     "com.healthmarketscience.jackcess:jackcess-encrypt": [
       "org.bouncycastle:bcprov-jdk18on"
     ],
+    "com.networknt:json-schema-validator": [
+      "com.ethlo.time:itu",
+      "com.fasterxml.jackson.core:jackson-databind",
+      "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
+      "org.slf4j:slf4j-api"
+    ],
     "com.rometools:rome": [
       "org.jdom:jdom2",
       "org.slf4j:slf4j-api"
@@ -3849,6 +3869,7 @@
     ],
     "io.modelcontextprotocol.sdk:mcp": [
       "com.fasterxml.jackson.core:jackson-databind",
+      "com.networknt:json-schema-validator",
       "io.projectreactor:reactor-core",
       "org.slf4j:slf4j-api"
     ],
@@ -5008,6 +5029,14 @@
       "com.epam.parso.date",
       "com.epam.parso.impl"
     ],
+    "com.ethlo.time:itu": [
+      "com.ethlo.time",
+      "com.ethlo.time.internal",
+      "com.ethlo.time.internal.fixed",
+      "com.ethlo.time.internal.token",
+      "com.ethlo.time.internal.util",
+      "com.ethlo.time.token"
+    ],
     "com.fasterxml.jackson.core:jackson-annotations": [
       "com.fasterxml.jackson.annotation"
     ],
@@ -5215,33 +5244,6 @@
       "com.github.dockerjava.netty",
       "com.github.dockerjava.netty.handler"
     ],
-    "com.github.google.adk-java:google-adk": [
-      "com.google.adk",
-      "com.google.adk.agents",
-      "com.google.adk.artifacts",
-      "com.google.adk.codeexecutors",
-      "com.google.adk.events",
-      "com.google.adk.examples",
-      "com.google.adk.flows",
-      "com.google.adk.flows.llmflows",
-      "com.google.adk.flows.llmflows.audio",
-      "com.google.adk.memory",
-      "com.google.adk.models",
-      "com.google.adk.runner",
-      "com.google.adk.sessions",
-      "com.google.adk.tools",
-      "com.google.adk.tools.applicationintegrationtoolset",
-      "com.google.adk.tools.mcp",
-      "com.google.adk.tools.retrieval",
-      "com.google.adk.utils"
-    ],
-    "com.github.google.adk-java:google-adk-contrib-langchain4j": [
-      "com.google.adk.models.langchain4j"
-    ],
-    "com.github.google.adk-java:google-adk-dev": [
-      "com.google.adk.web",
-      "com.google.adk.web.config"
-    ],
     "com.github.hypfvieh:dbus-java-core": [
       "org.freedesktop.dbus",
       "org.freedesktop.dbus.annotations",
@@ -5393,6 +5395,37 @@
       "com.graphbuilder.org.apache.harmony.awt.gl",
       "com.graphbuilder.struc"
     ],
+    "com.github.vorburger.adk-java:google-adk": [
+      "com.google.adk",
+      "com.google.adk.agents",
+      "com.google.adk.artifacts",
+      "com.google.adk.codeexecutors",
+      "com.google.adk.events",
+      "com.google.adk.examples",
+      "com.google.adk.flows",
+      "com.google.adk.flows.llmflows",
+      "com.google.adk.flows.llmflows.audio",
+      "com.google.adk.memory",
+      "com.google.adk.models",
+      "com.google.adk.runner",
+      "com.google.adk.sessions",
+      "com.google.adk.tools",
+      "com.google.adk.tools.applicationintegrationtoolset",
+      "com.google.adk.tools.mcp",
+      "com.google.adk.tools.retrieval",
+      "com.google.adk.utils"
+    ],
+    "com.github.vorburger.adk-java:google-adk-dev": [
+      "com.google.adk.web",
+      "com.google.adk.web.config",
+      "com.google.adk.web.controller",
+      "com.google.adk.web.dto",
+      "com.google.adk.web.service",
+      "com.google.adk.web.websocket"
+    ],
+    "com.github.vorburger.adk-java:google-adk-langchain4j": [
+      "com.google.adk.models.langchain4j"
+    ],
     "com.google.android:annotations": [
       "android.annotation"
     ],
@@ -5766,6 +5799,22 @@
     "com.kohlschutter.junixsocket:junixsocket-native-common": [
       "org.newsclub.lib.junixsocket.common"
     ],
+    "com.networknt:json-schema-validator": [
+      "com.networknt.org.apache.commons.validator.routines",
+      "com.networknt.schema",
+      "com.networknt.schema.annotation",
+      "com.networknt.schema.format",
+      "com.networknt.schema.i18n",
+      "com.networknt.schema.oas",
+      "com.networknt.schema.output",
+      "com.networknt.schema.regex",
+      "com.networknt.schema.resource",
+      "com.networknt.schema.result",
+      "com.networknt.schema.serialization",
+      "com.networknt.schema.serialization.node",
+      "com.networknt.schema.utils",
+      "com.networknt.schema.walk"
+    ],
     "com.pff:java-libpst": [
       "com.pff",
       "example"
@@ -9937,6 +9986,8 @@
       "com.drewnoakes:metadata-extractor:jar:sources",
       "com.epam:parso",
       "com.epam:parso:jar:sources",
+      "com.ethlo.time:itu",
+      "com.ethlo.time:itu:jar:sources",
       "com.fasterxml.jackson.core:jackson-annotations",
       "com.fasterxml.jackson.core:jackson-annotations:jar:sources",
       "com.fasterxml.jackson.core:jackson-core",
@@ -9979,9 +10030,6 @@
       "com.github.docker-java:docker-java-transport-netty:jar:sources",
       "com.github.docker-java:docker-java-transport:jar:sources",
       "com.github.docker-java:docker-java:jar:sources",
-      "com.github.google.adk-java:google-adk",
-      "com.github.google.adk-java:google-adk-contrib-langchain4j",
-      "com.github.google.adk-java:google-adk-dev",
       "com.github.hypfvieh:dbus-java-core",
       "com.github.hypfvieh:dbus-java-core:jar:sources",
       "com.github.hypfvieh:dbus-java-transport-native-unixsocket",
@@ -10018,6 +10066,9 @@
       "com.github.valfirst:slf4j-test:jar:sources",
       "com.github.virtuald:curvesapi",
       "com.github.virtuald:curvesapi:jar:sources",
+      "com.github.vorburger.adk-java:google-adk",
+      "com.github.vorburger.adk-java:google-adk-dev",
+      "com.github.vorburger.adk-java:google-adk-langchain4j",
       "com.google.android:annotations",
       "com.google.android:annotations:jar:sources",
       "com.google.api-client:google-api-client",
@@ -10145,6 +10196,8 @@
       "com.kohlschutter.junixsocket:junixsocket-common:jar:sources",
       "com.kohlschutter.junixsocket:junixsocket-native-common",
       "com.kohlschutter.junixsocket:junixsocket-native-common:jar:sources",
+      "com.networknt:json-schema-validator",
+      "com.networknt:json-schema-validator:jar:sources",
       "com.pff:java-libpst",
       "com.pff:java-libpst:jar:sources",
       "com.rometools:rome",
@@ -10799,6 +10852,8 @@
       "com.drewnoakes:metadata-extractor:jar:sources",
       "com.epam:parso",
       "com.epam:parso:jar:sources",
+      "com.ethlo.time:itu",
+      "com.ethlo.time:itu:jar:sources",
       "com.fasterxml.jackson.core:jackson-annotations",
       "com.fasterxml.jackson.core:jackson-annotations:jar:sources",
       "com.fasterxml.jackson.core:jackson-core",
@@ -10841,9 +10896,6 @@
       "com.github.docker-java:docker-java-transport-netty:jar:sources",
       "com.github.docker-java:docker-java-transport:jar:sources",
       "com.github.docker-java:docker-java:jar:sources",
-      "com.github.google.adk-java:google-adk",
-      "com.github.google.adk-java:google-adk-contrib-langchain4j",
-      "com.github.google.adk-java:google-adk-dev",
       "com.github.hypfvieh:dbus-java-core",
       "com.github.hypfvieh:dbus-java-core:jar:sources",
       "com.github.hypfvieh:dbus-java-transport-native-unixsocket",
@@ -10880,6 +10932,9 @@
       "com.github.valfirst:slf4j-test:jar:sources",
       "com.github.virtuald:curvesapi",
       "com.github.virtuald:curvesapi:jar:sources",
+      "com.github.vorburger.adk-java:google-adk",
+      "com.github.vorburger.adk-java:google-adk-dev",
+      "com.github.vorburger.adk-java:google-adk-langchain4j",
       "com.google.android:annotations",
       "com.google.android:annotations:jar:sources",
       "com.google.api-client:google-api-client",
@@ -11007,6 +11062,8 @@
       "com.kohlschutter.junixsocket:junixsocket-common:jar:sources",
       "com.kohlschutter.junixsocket:junixsocket-native-common",
       "com.kohlschutter.junixsocket:junixsocket-native-common:jar:sources",
+      "com.networknt:json-schema-validator",
+      "com.networknt:json-schema-validator:jar:sources",
       "com.pff:java-libpst",
       "com.pff:java-libpst:jar:sources",
       "com.rometools:rome",
@@ -13447,9 +13504,9 @@
   },
   "skipped": [
     "com.adobe.xmp:xmpcore:jar:sources",
-    "com.github.google.adk-java:google-adk-contrib-langchain4j:jar:sources",
-    "com.github.google.adk-java:google-adk-dev:jar:sources",
-    "com.github.google.adk-java:google-adk:jar:sources",
+    "com.github.vorburger.adk-java:google-adk-dev:jar:sources",
+    "com.github.vorburger.adk-java:google-adk-langchain4j:jar:sources",
+    "com.github.vorburger.adk-java:google-adk:jar:sources",
     "com.google.guava:listenablefuture:jar:sources",
     "guru.nidi.com.eclipsesource.j2v8:j2v8_linux_x86_64:jar:sources",
     "org.apache.tomcat:annotations-api:jar:sources"