From 9389c435e0ed71397854e6af27f7a652e4b54012 Mon Sep 17 00:00:00 2001 From: Sandeep Belgavi Date: Wed, 25 Mar 2026 18:27:09 +0530 Subject: [PATCH 1/2] Detach Sarvam AI from the main reactor build while aligning its parent version with the current repository parent POM. This keeps root `./mvnw test` stable and allows Sarvam to be built independently when needed. Made-with: Cursor --- contrib/sarvam-ai/pom.xml | 2 +- pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/sarvam-ai/pom.xml b/contrib/sarvam-ai/pom.xml index 636289044..955861397 100644 --- a/contrib/sarvam-ai/pom.xml +++ b/contrib/sarvam-ai/pom.xml @@ -20,7 +20,7 @@ com.google.adk google-adk-parent - 0.9.1-SNAPSHOT + 1.0.1-rc.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 6d4c16836..40332472f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ contrib/spring-ai contrib/samples contrib/firestore-session-service - contrib/sarvam-ai tutorials/city-time-weather tutorials/live-audio-single-agent a2a From 81e7318bb94e655af1fae063e59de2b255a7d3a7 Mon Sep 17 00:00:00 2001 From: Sandeep Belgavi Date: Thu, 26 Mar 2026 12:42:15 +0530 Subject: [PATCH 2/2] Include Sarvam AI in the reactor; upgrade JaCoCo for JDK 24; fix Surefire JUnit alignment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Re-add contrib/sarvam-ai to root modules. Bump jacoco-maven-plugin to 0.8.14 for Java 24 bytecode. Simplify Sarvam Surefire plugin dependencies so JUnit Platform versions match Surefire’s provider, and inherit parent argLine for JaCoCo and add-opens. Validated with ./mvnw clean install. Made-with: Cursor --- contrib/sarvam-ai/pom.xml | 15 +-------------- pom.xml | 3 ++- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/contrib/sarvam-ai/pom.xml b/contrib/sarvam-ai/pom.xml index 955861397..67aca7598 100644 --- a/contrib/sarvam-ai/pom.xml +++ b/contrib/sarvam-ai/pom.xml @@ -104,27 +104,14 @@ maven-surefire-junit5-tree-reporter 0.1.0 - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - + ${surefire.argLine} plain **/*Test.java - - ${project.basedir}/src/test/java diff --git a/pom.xml b/pom.xml index 40332472f..a1e39bc7d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ contrib/spring-ai contrib/samples contrib/firestore-session-service + contrib/sarvam-ai tutorials/city-time-weather tutorials/live-audio-single-agent a2a @@ -453,7 +454,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + 0.8.14