Upstream sync 2026 03 07

.devcontainer/devcontainer.json

@@ -0,0 +1,30 @@
+{
+  "name": "Java 17",
+  "image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/git-lfs:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "extension-pack-for-java",
+        "redhat.vscode-xml"
+      ],
+      "settings": {
+        "java.jdt.download.server": "latest",
+        "java.help.firstView": "none",
+        "java.showBuildStatusOnStart": "notification",
+        "java.configuration.updateBuildConfiguration": "interactive",
+        "java.autobuild.enabled": true,
+        "terminal.integrated.focusOnOutput": false
+      }
+    }
+  },
+  "remoteUser": "vscode",
+  "forwardPorts": [8000, 8080, 8081, 8082],
+  "postCreateCommand": "git config --global credential.helper '!gh auth git-credential' && git config --global lfs.locksverify false",
+  "hostRequirements": {
+    "cpus": 4
+  }
+}

.github/workflows/release-please.yaml

@@ -14,4 +14,4 @@ jobs:
     steps:
       - uses: googleapis/release-please-action@v4
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.RELEASE_PLEASE_TOKEN }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.2.0"
+    ".": "0.8.0"
 }

README.md

@@ -1,97 +1,3 @@
-
-# Capability Supported
-
-Of course. Here is the table with the 4th column for "Bedrock API" added.
-
-| Feature | Gemini | Anthropic | AWS Bedrock API | Ollama | Azure OAI (redBus) | Bedrock+Anthropic |
-| :--- | :--- | :--- | :--- | :--- | :--- | :--- |
-| **Chat** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Tools/Function** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Chat Stream** | ✅ | ❌ | ✅ | ✅ | ✅ | ❌ |
-| **Image (Input)** | ✅ (Multimodal models) | ❌ | ✅ (Via models like Claude 3) |  ✅  | ❓ | ❌ (Claude 3 models) |
-| **Image Gen (Output)** | ✅ | ❌ | ✅ (Via Titan, Stable Diffusion) | ❌ | ❓ | ❌ (Via other models like Titan Image Generator) |
-| **Audio Streaming (Input)** | ✅ (Some APIs/integrations) | ❌ | ❌ (Via Amazon Transcribe) | ❌ | ❓ |❌ (Via services like Amazon Transcribe) |
-| **Transcription** | ✅ (Some APIs/integrations) | ❌ | ❌ (Via Amazon Transcribe) | ❌ | ❓ | ❌ (Via Amazon Transcribe) |
-| **Persistent session (MapDB)** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅  |
-| **Agents as Tool/Function** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Interoperability (A2A)** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Interoperability (Tools/Functions)** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Interoperability (Agents as Tool/Function)** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Agent Workflow** | ✅ | ✅ | ✅   | ✅ | ✅ | ✅ |
-| **Parallel Agents** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅   |
-| **Sequential Agents** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| **Agent Orchestration** | ✅ | ✅ | ✅   | ✅ | ✅ | ✅ |
-| **Hierarchical Task Decomposition** | ✅ | ✅ | ✅ | ✅ | ✅ | ✅   |
-
-
-# Core Differences
-
-## Persistent session storage added, 
-
-| Store | Chat | Stream | Artifact | 
-| :--- | :--- | :--- | :--- | 
-| **MapDB** | ✅ | ✅ | ✅ |  
-| **MongoDB** | ✅ | ✅ | ❌ |  
-| **Postgres** | ✅ | ✅ | ✅ |  
-
-### MapDbSessionService("map.db")
-
-```
-    public BaseSessionService sessionService() {
-
-        try {
-            // TODO: Add logic to select service based on config (e.g., DB URL)
-            log.info("Using MapDbSessionService");
-            return new MapDbSessionService("map.db");
-        } catch (Exception ex) {
-            java.util.logging.Logger.getLogger(AdkWebServer.class.getName()).log(Level.SEVERE, null, ex);
-        }
-
-        // TODO: Add logic to select service based on config (e.g., DB URL)
-        log.info("Using InMemorySessionService");
-        return new InMemorySessionService();
-    }
-```
-
-## Ollama API Supported, 
-
-### OllamaBaseLM("qwen3:0.6b")
-```
-    LlmAgent coordinator = LlmAgent.builder()
-                .name("Coordinator")
-                 . model(new com.google.adk.models.OllamaBaseLM("qwen3:0.6b"))//
-                .instruction("You are an assistant. Delegate requests to appropriate agent")
-                .description("Main coordinator.")
-                .build();
-```
-
-## Secondary Auth Over Azure API
-
-### RedbusADG("40")
-
-```
-LlmAgent.builder()
-            .name(NAME)
-            .model(new com.google.adk.models.OllamaBaseLM("qwen3:0.6b"))//.model(new RedbusADG("40"))
-            .description("Agent to calculate trigonometric functions (sine, cosine, tangent) for given angles.") // Updated description
-            .instruction(
-                "You are a helpful agent who can calculate trigonometric functions (sine, cosine, and"
-                    + " tangent). Use the provided tools to perform these calculations."
-                    + " When the user provides an angle, identify the value and the unit (degrees or radians)."
-                    + " Call the appropriate tool based on the requested function (sin, cos, tan) and provide the angle value and unit."
-                    + " Ensure the angle unit is explicitly passed to the tool as 'degrees' or 'radians'.") // Updated instruction
-            .tools(
-                // Register the new trigonometry tools
-                FunctionTool.create(TrigonometryAgent.class, "calculateSine"),
-                FunctionTool.create(TrigonometryAgent.class, "calculateCosine"),
-                FunctionTool.create(TrigonometryAgent.class, "calculateTangent")
-                // Removed FunctionTool.create for getCurrentTime and getWeather
-                )
-            .build();
-```
-
-
-
 # Agent Development Kit (ADK) for Java
 
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
@@ -144,13 +50,13 @@ If you're using Maven, add the following to your dependencies:
 <dependency>
   <groupId>com.google.adk</groupId>
   <artifactId>google-adk</artifactId>
-  <version>1.2.0</version>
+  <version>0.8.0</version>
 </dependency>
 <!-- Dev UI -->
 <dependency>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-dev</artifactId>
-    <version>1.2.0</version>
+    <version>0.8.0</version>
 </dependency>
 ```
 

a2a/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.google.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
-    <version>1.2.0</version><!-- {x-version-update:google-adk:current} -->
+    <version>0.8.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
   <artifactId>google-adk-a2a</artifactId>
@@ -19,17 +19,22 @@
     <a2a.sdk.version>0.3.2.Final</a2a.sdk.version>
     <google.adk.version>${project.version}</google.adk.version>
     <guava.version>33.0.0-jre</guava.version>
-    <jackson.version>2.19.0</jackson.version>
     <rxjava.version>3.1.5</rxjava.version>
+    <jackson.version>2.19.0</jackson.version>
     <jspecify.version>1.0.0</jspecify.version>
-    <slf4j.version>2.0.17</slf4j.version>
     <errorprone.version>2.38.0</errorprone.version>
+    <grpc.version>1.76.2</grpc.version>
+    <slf4j.version>2.0.17</slf4j.version>
     <truth.version>1.4.4</truth.version>
     <junit4.version>4.13.2</junit4.version>
-    <grpc.version>1.62.2</grpc.version>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.adk</groupId>
+      <artifactId>google-adk</artifactId>
+      <version>${google.adk.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty-shaded</artifactId>
@@ -51,11 +56,6 @@
       <artifactId>gson</artifactId>
       <version>2.10.1</version>
     </dependency>
-    <dependency>
-      <groupId>com.google.adk</groupId>
-      <artifactId>google-adk</artifactId>
-      <version>${google.adk.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -76,6 +76,11 @@
       <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-parameter-names</artifactId>
@@ -129,13 +134,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -149,7 +154,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
   <build>
     <extensions>
       <extension>
@@ -159,6 +163,14 @@
       </extension>
     </extensions>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -187,7 +199,7 @@
           </protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>
-            io.grpc:protoc-gen-grpc-java:1.48.1:exe:${os.detected.classifier}
+            io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
           </pluginArtifact>
         </configuration>
         <executions>