diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3cb45a710..3f27438f2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,9 +4,9 @@
# For syntax help see:
# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
-# The @googleapis/firestore-dpe is the default owner for changes in this repo
-* @googleapis/yoshi-java @googleapis/firestore-dpe
-**/*.java @googleapis/firestore-dpe
+# The @googleapis/cloud-native-db-dpes @googleapis/api-firestore is the default owner for changes in this repo
+* @googleapis/yoshi-java @googleapis/cloud-native-db-dpes @googleapis/api-firestore
+**/*.java @googleapis/cloud-native-db-dpes @googleapis/api-firestore
# The java-samples-reviewers team is the default owner for samples changes
samples/**/*.java @googleapis/java-samples-reviewers
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 83ef7f9c2..417e9cffa 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,23 +1,8 @@
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
+'on':
push:
branches:
- - main
- pull_request:
+ - 2.2.x
+ pull_request: null
name: ci
jobs:
units:
@@ -25,63 +10,69 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [8, 11, 17]
+ java:
+ - 8
+ - 11
+ - 17
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: ${{matrix.java}}
- - run: java -version
- - run: .kokoro/build.sh
- env:
- JOB_TYPE: test
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: ${{matrix.java}}
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: test
windows:
runs-on: windows-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: 8
- - run: java -version
- - run: .kokoro/build.bat
- env:
- JOB_TYPE: test
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/build.bat
+ env:
+ JOB_TYPE: test
dependencies:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11, 17]
+ java:
+ - 8
+ - 11
+ - 17
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: ${{matrix.java}}
- - run: java -version
- - run: .kokoro/dependencies.sh
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: ${{matrix.java}}
+ - run: java -version
+ - run: .kokoro/dependencies.sh
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: 11
- - run: java -version
- - run: .kokoro/build.sh
- env:
- JOB_TYPE: lint
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: 11
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: lint
clirr:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-java@v3
- with:
- distribution: zulu
- java-version: 8
- - run: java -version
- - run: .kokoro/build.sh
- env:
- JOB_TYPE: clirr
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: zulu
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: clirr
diff --git a/.repo-metadata.json b/.repo-metadata.json
index 72965ea86..6e452200e 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -9,7 +9,7 @@
"repo": "googleapis/java-datastore",
"repo_short": "java-datastore",
"distribution_name": "com.google.cloud:google-cloud-datastore",
- "codeowner_team": "@googleapis/firestore-dpe",
+ "codeowner_team": "@googleapis/cloud-native-db-dpes @googleapis/api-firestore",
"api_id": "datastore.googleapis.com",
"library_type": "GAPIC_COMBO",
"api_description": "is a fully managed, schemaless database for\nstoring non-relational data. Cloud Datastore automatically scales with\nyour users and supports ACID transactions, high availability of reads and\nwrites, strong consistency for reads and ancestor queries, and eventual\nconsistency for all other queries.",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7a42555c..94a4556ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [2.2.10](https://github.com/googleapis/java-datastore/compare/v2.2.9...v2.2.10) (2022-04-20)
+
+
+### Dependencies
+
+* update shared config, shared deps, and errorprone ([#717](https://github.com/googleapis/java-datastore/issues/717)) ([344d28a](https://github.com/googleapis/java-datastore/commit/344d28a59fab7e5567737efa0de1cff28ea05578))
+
### [2.2.9](https://github.com/googleapis/java-datastore/compare/v2.2.8...v2.2.9) (2022-03-14)
diff --git a/README.md b/README.md
index 5cc63da8f..f9a3ecbb5 100644
--- a/README.md
+++ b/README.md
@@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies
```Groovy
-implementation platform('com.google.cloud:libraries-bom:25.0.0')
+implementation platform('com.google.cloud:libraries-bom:25.1.0')
implementation 'com.google.cloud:google-cloud-datastore'
```
If you are using Gradle without BOM, add this to your dependencies
```Groovy
-implementation 'com.google.cloud:google-cloud-datastore:2.2.8'
+implementation 'com.google.cloud:google-cloud-datastore:2.3.1'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.2.8"
+libraryDependencies += "com.google.cloud" % "google-cloud-datastore" % "2.3.1"
```
## Authentication
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 1bfb72240..d53b9a8f0 100644
--- a/datastore-v1-proto-client/pom.xml
+++ b/datastore-v1-proto-client/pom.xml
@@ -19,12 +19,12 @@
4.0.0
com.google.cloud.datastore
datastore-v1-proto-client
- 2.2.9
+ 2.2.10
com.google.cloud
google-cloud-datastore-parent
- 2.2.9
+ 2.2.10
jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index c71c77a1e..cf82820aa 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-datastore-bom
- 2.2.9
+ 2.2.10
pom
com.google.cloud
@@ -52,12 +52,12 @@
com.google.cloud
google-cloud-datastore
- 2.2.9
+ 2.2.10
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.93.9
+ 0.93.10
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 02f15090a..fd690dd7a 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-datastore
- 2.2.9
+ 2.2.10
jar
Google Cloud Datastore
https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-datastore-parent
- 2.2.9
+ 2.2.10
google-cloud-datastore
diff --git a/pom.xml b/pom.xml
index 372150042..b2afd294b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-datastore-parent
pom
- 2.2.9
+ 2.2.10
Google Cloud Datastore Parent
https://github.com/googleapis/java-datastore
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 1.3.0
+ 1.3.2
@@ -143,7 +143,7 @@
github
google-cloud-datastore-parent
https://googleapis.dev/java/google-api-grpc/latest
- 2.11.0
+ 2.13.1
@@ -151,7 +151,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.8.0
+ 2.10.0
pom
import
@@ -159,17 +159,17 @@
com.google.cloud
google-cloud-datastore
- 2.2.9
+ 2.2.10
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.93.9
+ 0.93.10
com.google.cloud.datastore
datastore-v1-proto-client
- 2.2.9
+ 2.2.10
com.google.api.grpc
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 6f4686178..000e40c76 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.93.9
+ 0.93.10
proto-google-cloud-datastore-v1
PROTO library for proto-google-cloud-datastore-v1
com.google.cloud
google-cloud-datastore-parent
- 2.2.9
+ 2.2.10
diff --git a/versions.txt b/versions.txt
index 4532a0077..a08ef30c3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.2.9:2.2.9
-google-cloud-datastore-bom:2.2.9:2.2.9
-proto-google-cloud-datastore-v1:0.93.9:0.93.9
-datastore-v1-proto-client:2.2.9:2.2.9
+google-cloud-datastore:2.2.10:2.2.10
+google-cloud-datastore-bom:2.2.10:2.2.10
+proto-google-cloud-datastore-v1:0.93.10:0.93.10
+datastore-v1-proto-client:2.2.10:2.2.10