Skip to content

Commit 35b521b

Browse files
authored
Merge branch 'main' into fix/memory-leak-delete-session
2 parents 8f5d8aa + 005121b commit 35b521b

20 files changed

Lines changed: 1672 additions & 87 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"name": "Java 17",
3+
"image": "mcr.microsoft.com/devcontainers/java:1-17-bullseye",
4+
"features": {
5+
"ghcr.io/devcontainers/features/github-cli:1": {},
6+
"ghcr.io/devcontainers/features/git-lfs:1": {}
7+
},
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"extension-pack-for-java",
12+
"redhat.vscode-xml",
13+
"rangav.vscode-thunder-client"
14+
],
15+
"settings": {
16+
"java.jdt.download.server": "latest",
17+
"java.help.firstView": "none",
18+
"java.showBuildStatusOnStart": "notification",
19+
"java.configuration.updateBuildConfiguration": "interactive",
20+
"java.autobuild.enabled": true,
21+
"terminal.integrated.focusOnOutput": false
22+
}
23+
}
24+
},
25+
"remoteUser": "vscode",
26+
"forwardPorts": [8000, 8080, 8081, 8082],
27+
"postCreateCommand": "git config --global credential.helper '!gh auth git-credential' && git config --global lfs.locksverify false"
28+
}

a2a/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<google.adk.version>${project.version}</google.adk.version>
2121
<guava.version>33.0.0-jre</guava.version>
2222
<jackson.version>2.19.0</jackson.version>
23-
<rxjava.version>3.1.5</rxjava.version>
2423
<jspecify.version>1.0.0</jspecify.version>
2524
<slf4j.version>2.0.17</slf4j.version>
2625
<truth.version>1.4.4</truth.version>
@@ -52,6 +51,11 @@
5251
<artifactId>jackson-databind</artifactId>
5352
<version>${jackson.version}</version>
5453
</dependency>
54+
<dependency>
55+
<groupId>com.fasterxml.jackson.datatype</groupId>
56+
<artifactId>jackson-datatype-jsr310</artifactId>
57+
<version>${jackson.version}</version>
58+
</dependency>
5559
<dependency>
5660
<groupId>com.fasterxml.jackson.module</groupId>
5761
<artifactId>jackson-module-parameter-names</artifactId>
@@ -60,7 +64,6 @@
6064
<dependency>
6165
<groupId>io.reactivex.rxjava3</groupId>
6266
<artifactId>rxjava</artifactId>
63-
<version>${rxjava.version}</version>
6467
</dependency>
6568
<dependency>
6669
<groupId>org.jspecify</groupId>

0 commit comments

Comments
 (0)