From e0220b20313dc1c08b3be36f184f009c5fa360f5 Mon Sep 17 00:00:00 2001
From: "Panek, Tomasz" <Tomasz.Panek@sabre.com>
Date: Tue, 21 Oct 2025 22:11:14 +0200
Subject: [PATCH 1/4] returning non empty session state

---
 core/pom.xml                                  |  2 ++
 .../adk/sessions/VertexAiSessionService.java  |  2 +-
 pom.xml                                       | 33 +++++--------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 809ee0039..d10b0a3cb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,6 +23,7 @@
     <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
 
+  <groupId>com.sabre.adk</groupId>
   <artifactId>google-adk</artifactId>
   <name>Agent Development Kit</name>
   <description>Agent Development Kit: an open-source, code-first toolkit designed to simplify building, evaluating, and deploying advanced AI agents anywhere.</description>
@@ -196,6 +197,7 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+
     </plugins>
   </build>
 </project>
diff --git a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
index 0321ef281..47c74abc7 100644
--- a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
+++ b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
@@ -138,7 +138,7 @@ private ListSessionsResponse parseListSessionsResponse(
           Session.builder(sessionId)
               .appName(appName)
               .userId(userId)
-              .state(new ConcurrentHashMap<>())
+              .state(new ConcurrentHashMap<>((Map<String, Object>) apiSession.get("sessionState")))
               .lastUpdateTime(updateTimestamp)
               .build();
       sessions.add(session);
diff --git a/pom.xml b/pom.xml
index d174f6ad8..d9c384066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,27 +383,11 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.sonatype.central</groupId>
-          <artifactId>central-publishing-maven-plugin</artifactId>
-          <version>0.8.0</version>
-          <extensions>true</extensions>
-          <configuration>
-            <publishingServerId>central</publishingServerId>
-          </configuration>
-        </plugin>
+
       </plugins>
   </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.sonatype.central</groupId>
-        <artifactId>central-publishing-maven-plugin</artifactId>
-        <version>0.8.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <publishingServerId>central</publishingServerId>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>com.spotify.fmt</groupId>
         <artifactId>fmt-maven-plugin</artifactId>
@@ -537,14 +521,15 @@
   </developers>
   <distributionManagement>
     <repository>
-      <id>central</id>
-      <name>Maven Central Repository</name>
-      <url>https://central.sonatype.com/api/v1/publisher</url>
+      <id>sabre-repo-stages</id>
+      <url>https://repository.sabre-gcp.com/repository/maven-staging/</url>
+      <layout>default</layout>
     </repository>
     <snapshotRepository>
-      <id>central</id>
-      <name>Maven Central Repository Snapshots</name>
-      <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+      <id>gcp.repository.sabre.com-snapshots</id>
+      <url>https://repository.sabre-gcp.com/repository/maven-snapshots/</url>
+      <layout>default</layout>
+      <uniqueVersion>true</uniqueVersion>
     </snapshotRepository>
   </distributionManagement>
 </project>

From acd7d5cd4ac6fdeb696adc1ad2c55755befb1e3d Mon Sep 17 00:00:00 2001
From: "Panek, Tomasz" <Tomasz.Panek@sabre.com>
Date: Tue, 21 Oct 2025 22:49:14 +0200
Subject: [PATCH 2/4] handling null sessionState in map

---
 .../com/google/adk/sessions/VertexAiSessionService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
index 47c74abc7..b4b00d66d 100644
--- a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
+++ b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
@@ -122,6 +122,7 @@ public Single<ListSessionsResponse> listSessions(String appName, String userId)
         .defaultIfEmpty(ListSessionsResponse.builder().build());
   }
 
+  @SuppressWarnings("unchecked")
   private ListSessionsResponse parseListSessionsResponse(
       JsonNode listSessionsResponseMap, String appName, String userId) {
     List<Map<String, Object>> apiSessions =
@@ -138,7 +139,11 @@ private ListSessionsResponse parseListSessionsResponse(
           Session.builder(sessionId)
               .appName(appName)
               .userId(userId)
-              .state(new ConcurrentHashMap<>((Map<String, Object>) apiSession.get("sessionState")))
+              .state(
+                  apiSession.get("sessionState") == null
+                      ? new ConcurrentHashMap<>()
+                      : new ConcurrentHashMap<>(
+                          (Map<String, Object>) apiSession.get("sessionState")))
               .lastUpdateTime(updateTimestamp)
               .build();
       sessions.add(session);

From 354f92f261ecc2248a70a068efbc0024336bb648 Mon Sep 17 00:00:00 2001
From: "Panek, Tomasz" <tomasz.panek@gmail.com>
Date: Tue, 21 Oct 2025 23:48:43 +0200
Subject: [PATCH 3/4] refactoring

---
 .../com/google/adk/sessions/VertexAiSessionService.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
index b4b00d66d..7878daf22 100644
--- a/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
+++ b/core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
@@ -122,7 +122,6 @@ public Single<ListSessionsResponse> listSessions(String appName, String userId)
         .defaultIfEmpty(ListSessionsResponse.builder().build());
   }
 
-  @SuppressWarnings("unchecked")
   private ListSessionsResponse parseListSessionsResponse(
       JsonNode listSessionsResponseMap, String appName, String userId) {
     List<Map<String, Object>> apiSessions =
@@ -142,8 +141,9 @@ private ListSessionsResponse parseListSessionsResponse(
               .state(
                   apiSession.get("sessionState") == null
                       ? new ConcurrentHashMap<>()
-                      : new ConcurrentHashMap<>(
-                          (Map<String, Object>) apiSession.get("sessionState")))
+                      : objectMapper.convertValue(
+                          apiSession.get("sessionState"),
+                          new TypeReference<ConcurrentMap<String, Object>>() {}))
               .lastUpdateTime(updateTimestamp)
               .build();
       sessions.add(session);

From 1aa3d817d5b955eb0ec2aee5378245d107e582f3 Mon Sep 17 00:00:00 2001
From: "Panek, Tomasz" <tomasz.panek@gmail.com>
Date: Wed, 22 Oct 2025 19:56:13 +0200
Subject: [PATCH 4/4] changing group id for parent

---
 core/pom.xml | 2 +-
 pom.xml      | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d10b0a3cb..8865695f8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.google.adk</groupId>
+    <groupId>com.sabre.adk</groupId>
     <artifactId>google-adk-parent</artifactId>
     <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   </parent>
diff --git a/pom.xml b/pom.xml
index d9c384066..91c595b81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.google.adk</groupId>
+  <groupId>com.sabre.adk</groupId>
   <artifactId>google-adk-parent</artifactId>
   <version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
   <packaging>pom</packaging>
@@ -26,13 +26,6 @@
 
   <modules>
     <module>core</module>
-    <module>dev</module>
-    <module>maven_plugin</module>
-    <module>contrib/langchain4j</module>
-    <module>contrib/samples</module>
-    <module>tutorials/city-time-weather</module>
-    <module>a2a</module>
-    <module>a2a/webservice</module>
   </modules>
 
   <properties>