From 25b7e47f26649712506bec5ef4160d12f6b32bba Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Mon, 4 May 2026 11:32:17 -0400
Subject: [PATCH 1/2] feat(datastore): Bump to v3 major version

---
 gapic-libraries-bom/pom.xml                        |  2 +-
 java-datastore/datastore-v1-proto-client/pom.xml   |  4 ++--
 java-datastore/google-cloud-datastore-bom/pom.xml  | 10 +++++-----
 .../google-cloud-datastore-utils/pom.xml           |  4 ++--
 java-datastore/google-cloud-datastore/pom.xml      |  4 ++--
 .../cloud/datastore/admin/v1/stub/Version.java     |  2 +-
 .../google/cloud/datastore/v1/stub/Version.java    |  2 +-
 .../grpc-google-cloud-datastore-admin-v1/pom.xml   |  4 ++--
 .../grpc-google-cloud-datastore-v1/pom.xml         |  4 ++--
 java-datastore/pom.xml                             | 14 +++++++-------
 .../proto-google-cloud-datastore-admin-v1/pom.xml  |  4 ++--
 .../proto-google-cloud-datastore-v1/pom.xml        |  2 +-
 java-datastore/samples/snapshot/pom.xml            |  2 +-
 java-datastore/samples/snippets/pom.xml            |  2 +-
 versions.txt                                       | 12 ++++++------
 15 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/gapic-libraries-bom/pom.xml b/gapic-libraries-bom/pom.xml
index 0b07209ddcc8..c5abd69cdb38 100644
--- a/gapic-libraries-bom/pom.xml
+++ b/gapic-libraries-bom/pom.xml
@@ -535,7 +535,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-datastore-bom</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/java-datastore/datastore-v1-proto-client/pom.xml b/java-datastore/datastore-v1-proto-client/pom.xml
index 13093cf79cd4..b924d8f29956 100644
--- a/java-datastore/datastore-v1-proto-client/pom.xml
+++ b/java-datastore/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud.datastore</groupId>
   <artifactId>datastore-v1-proto-client</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
 
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
 
   <packaging>jar</packaging>
diff --git a/java-datastore/google-cloud-datastore-bom/pom.xml b/java-datastore/google-cloud-datastore-bom/pom.xml
index 74e3a02ab7e5..5d196d53bbdc 100644
--- a/java-datastore/google-cloud-datastore-bom/pom.xml
+++ b/java-datastore/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-datastore-bom</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore-bom:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -53,17 +53,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-datastore</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-datastore-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/java-datastore/google-cloud-datastore-utils/pom.xml b/java-datastore/google-cloud-datastore-utils/pom.xml
index fcacc7e3d141..8029b316323d 100644
--- a/java-datastore/google-cloud-datastore-utils/pom.xml
+++ b/java-datastore/google-cloud-datastore-utils/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-utils</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
     <packaging>jar</packaging>
     <name>Google Cloud Datastore Utilities</name>
     <url>https://github.com/googleapis/google-cloud-java</url>
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-datastore-parent</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
     </parent>
     <properties>
         <site.installationModule>google-cloud-datastore-utils</site.installationModule>
diff --git a/java-datastore/google-cloud-datastore/pom.xml b/java-datastore/google-cloud-datastore/pom.xml
index 587678c50cb3..50c6e5852553 100644
--- a/java-datastore/google-cloud-datastore/pom.xml
+++ b/java-datastore/google-cloud-datastore/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-datastore</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Datastore</name>
   <url>https://github.com/googleapis/google-cloud-java</url>
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-datastore</site.installationModule>
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/Version.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/Version.java
index 8e9973f4d290..50095a56c42e 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/Version.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/admin/v1/stub/Version.java
@@ -21,7 +21,7 @@
 @InternalApi("For internal use only")
 final class Version {
   // {x-version-update-start:google-cloud-datastore:current}
-  static final String VERSION = "2.41.0-SNAPSHOT";
+  static final String VERSION = "3.0.0-SNAPSHOT";
   // {x-version-update-end}
 
 }
diff --git a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/Version.java b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/Version.java
index 66ffd7c4d696..c8b06105c2ab 100644
--- a/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/Version.java
+++ b/java-datastore/google-cloud-datastore/src/main/java/com/google/cloud/datastore/v1/stub/Version.java
@@ -21,7 +21,7 @@
 @InternalApi("For internal use only")
 final class Version {
   // {x-version-update-start:google-cloud-datastore:current}
-  static final String VERSION = "2.41.0-SNAPSHOT";
+  static final String VERSION = "3.0.0-SNAPSHOT";
   // {x-version-update-end}
 
 }
diff --git a/java-datastore/grpc-google-cloud-datastore-admin-v1/pom.xml b/java-datastore/grpc-google-cloud-datastore-admin-v1/pom.xml
index ee38019380f4..2bf02456b73a 100644
--- a/java-datastore/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/java-datastore/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
   <name>grpc-google-cloud-datastore-admin-v1</name>
   <description>GRPC library for google-cloud-datastore</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-datastore/grpc-google-cloud-datastore-v1/pom.xml b/java-datastore/grpc-google-cloud-datastore-v1/pom.xml
index f909ed5129b5..3cc24b6f7b57 100644
--- a/java-datastore/grpc-google-cloud-datastore-v1/pom.xml
+++ b/java-datastore/grpc-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-datastore-v1</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
   <name>grpc-google-cloud-datastore-v1</name>
   <description>GRPC library for google-cloud-datastore</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-datastore/pom.xml b/java-datastore/pom.xml
index d21df30749eb..4695d38a6728 100644
--- a/java-datastore/pom.xml
+++ b/java-datastore/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-datastore-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   <name>Google Cloud Datastore Parent</name>
   <url>https://github.com/googleapis/google-cloud-java</url>
   <description>
@@ -156,17 +156,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-datastore-admin-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-admin-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-datastore</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -176,17 +176,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-datastore-v1</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-datastore-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-datastore-utils</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud.datastore</groupId>
         <artifactId>datastore-v1-proto-client</artifactId>
-        <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
+        <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:datastore-v1-proto-client:current} -->
         <exclusions>
           <exclusion>
             <groupId>com.google.api.grpc</groupId>
diff --git a/java-datastore/proto-google-cloud-datastore-admin-v1/pom.xml b/java-datastore/proto-google-cloud-datastore-admin-v1/pom.xml
index fe9845fd8006..0155284c4b99 100644
--- a/java-datastore/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/java-datastore/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-datastore-admin-v1</artifactId>
-  <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
+  <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-datastore-admin-v1:current} -->
   <name>proto-google-cloud-datastore-admin-v1</name>
   <description>Proto library for google-cloud-datastore</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-datastore/proto-google-cloud-datastore-v1/pom.xml b/java-datastore/proto-google-cloud-datastore-v1/pom.xml
index 8aafa16c3e4f..e94f7bd6a1d6 100644
--- a/java-datastore/proto-google-cloud-datastore-v1/pom.xml
+++ b/java-datastore/proto-google-cloud-datastore-v1/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-datastore-parent</artifactId>
-    <version>2.41.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
+    <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-datastore/samples/snapshot/pom.xml b/java-datastore/samples/snapshot/pom.xml
index 126dd7df5c69..e7c4b50af83d 100644
--- a/java-datastore/samples/snapshot/pom.xml
+++ b/java-datastore/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>2.41.0-SNAPSHOT</version>
+      <version>3.0.0-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
 
diff --git a/java-datastore/samples/snippets/pom.xml b/java-datastore/samples/snippets/pom.xml
index 5ef3e9ca533e..2ca7631b04fb 100644
--- a/java-datastore/samples/snippets/pom.xml
+++ b/java-datastore/samples/snippets/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>2.40.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
+      <version>3.0.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
     </dependency>
     <!-- [END datastore_install_with_bom] -->
 
diff --git a/versions.txt b/versions.txt
index 3350202b615f..9672ab3aa5c4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -957,13 +957,13 @@ grpc-google-cloud-bigquerystorage-v1alpha:3.27.0:3.28.0-SNAPSHOT
 proto-google-cloud-bigquerystorage-v1alpha:3.27.0:3.28.0-SNAPSHOT
 proto-google-cloud-bigquerystorage-v1beta:3.27.0:3.28.0-SNAPSHOT
 grpc-google-cloud-bigquerystorage-v1beta:3.27.0:3.28.0-SNAPSHOT
-google-cloud-datastore:2.40.0:2.41.0-SNAPSHOT
-google-cloud-datastore-bom:2.40.0:2.41.0-SNAPSHOT
+google-cloud-datastore:2.40.0:3.0.0-SNAPSHOT
+google-cloud-datastore-bom:2.40.0:3.0.0-SNAPSHOT
 proto-google-cloud-datastore-v1:0.131.0:0.132.0-SNAPSHOT
-datastore-v1-proto-client:2.40.0:2.41.0-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.40.0:2.41.0-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.40.0:2.41.0-SNAPSHOT
-grpc-google-cloud-datastore-v1:2.40.0:2.41.0-SNAPSHOT
+datastore-v1-proto-client:2.40.0:3.0.0-SNAPSHOT
+proto-google-cloud-datastore-admin-v1:2.40.0:3.0.0-SNAPSHOT
+grpc-google-cloud-datastore-admin-v1:2.40.0:3.0.0-SNAPSHOT
+grpc-google-cloud-datastore-v1:2.40.0:3.0.0-SNAPSHOT
 google-cloud-logging-logback:0.140.0-alpha:0.141.0-alpha-SNAPSHOT
 proto-google-cloud-ces-v1beta:0.7.0:0.8.0-SNAPSHOT
 grpc-google-cloud-ces-v1beta:0.7.0:0.8.0-SNAPSHOT

From de88056379766ad7d8f2a7b6333bfabd578f5dc5 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Mon, 4 May 2026 17:17:33 -0400
Subject: [PATCH 2/2] chore: Update version from 3.0.0 to 3.0.0-SNAPSHOT

---
 java-datastore/samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java-datastore/samples/snippets/pom.xml b/java-datastore/samples/snippets/pom.xml
index 2ca7631b04fb..474170280d3e 100644
--- a/java-datastore/samples/snippets/pom.xml
+++ b/java-datastore/samples/snippets/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-datastore</artifactId>
-      <version>3.0.0</version><!-- {x-version-update:google-cloud-datastore:current} -->
+      <version>3.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
     </dependency>
     <!-- [END datastore_install_with_bom] -->