diff --git a/.github/release-please.yml b/.github/release-please.yml
index 53b119627..cbb5be49c 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -30,3 +30,7 @@ branches:
handleGHRelease: true
releaseType: java-backport
branch: 2.17.x
+ - bumpMinorPreMajor: true
+ handleGHRelease: true
+ releaseType: java-backport
+ branch: 2.19.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 046f23200..fce568dc2 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -170,6 +170,22 @@ branchProtectionRules:
- 'Kokoro - Test: Java GraalVM Native Image'
- 'Kokoro - Test: Java 17 GraalVM Native Image'
- javadoc
+ - pattern: 2.19.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (17)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - cla/google
+ - 'Kokoro - Test: Java GraalVM Native Image'
+ - 'Kokoro - Test: Java 17 GraalVM Native Image'
+ - javadoc
permissionRules:
- team: yoshi-admins
permission: admin
diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml
index 7146cc3dc..8b479f3a4 100644
--- a/.github/workflows/hermetic_library_generation.yaml
+++ b/.github/workflows/hermetic_library_generation.yaml
@@ -17,9 +17,12 @@ name: Hermetic library generation upon generation config change through pull req
on:
pull_request:
+env:
+ HEAD_REF: ${{ github.head_ref }}
+
jobs:
library_generation:
- # skip pull requests coming from a forked repository
+ # skip pull requests come from a forked repository
if: github.event.pull_request.head.repo.full_name == github.repository
runs-on: ubuntu-latest
steps:
@@ -35,6 +38,6 @@ jobs:
[ -z "$(git config user.name)" ] && git config --global user.name "cloud-java-bot"
bash .github/scripts/hermetic_library_generation.sh \
--target_branch ${{ github.base_ref }} \
- --current_branch ${{ github.head_ref }}
+ --current_branch $HEAD_REF
env:
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
index ec72b08ac..ffc858543 100644
--- a/.github/workflows/unmanaged_dependency_check.yaml
+++ b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
shell: bash
run: .kokoro/build.sh
- name: Unmanaged dependency check
- uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.32.0
+ uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.33.0
with:
bom-path: google-cloud-datastore-bom/pom.xml
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 0c813eaf7..a452e7c8c 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.32.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.33.0"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index ef1c9176c..ad15d4f7f 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.32.0"
+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.33.0"
}
env_vars: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ca1c263..f6234e13b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## [2.21.1](https://github.com/googleapis/java-datastore/compare/v2.21.0...v2.21.1) (2024-08-06)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.33.0 ([#1531](https://github.com/googleapis/java-datastore/issues/1531)) ([9e52395](https://github.com/googleapis/java-datastore/commit/9e52395f7ee71315331790284d35e7aad2f387ed))
+
+## [2.21.0](https://github.com/googleapis/java-datastore/compare/v2.20.2...v2.21.0) (2024-07-31)
+
+
+### Features
+
+* Enable hermetic library generation ([#1462](https://github.com/googleapis/java-datastore/issues/1462)) ([d142d9c](https://github.com/googleapis/java-datastore/commit/d142d9c95d91c8cadaf696efc12d6136814938ff))
+
## [2.20.2](https://github.com/googleapis/java-datastore/compare/v2.20.1...v2.20.2) (2024-06-28)
diff --git a/datastore-v1-proto-client/pom.xml b/datastore-v1-proto-client/pom.xml
index 70b9590b0..eb7a28713 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.20.3-SNAPSHOT
+ 2.21.1
com.google.cloud
google-cloud-datastore-parent
- 2.20.3-SNAPSHOT
+ 2.21.1
jar
diff --git a/google-cloud-datastore-bom/pom.xml b/google-cloud-datastore-bom/pom.xml
index 281c581c9..c683a9474 100644
--- a/google-cloud-datastore-bom/pom.xml
+++ b/google-cloud-datastore-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-datastore-bom
- 2.20.3-SNAPSHOT
+ 2.21.1
pom
com.google.cloud
sdk-platform-java-config
- 3.32.0
+ 3.33.0
Google Cloud datastore BOM
@@ -52,22 +52,22 @@
com.google.cloud
google-cloud-datastore
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.111.3-SNAPSHOT
+ 0.112.1
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index b06df4c0f..29bb63d3d 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -2,7 +2,7 @@
4.0.0
google-cloud-datastore
- 2.20.3-SNAPSHOT
+ 2.21.1
jar
Google Cloud Datastore
https://github.com/googleapis/java-datastore
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-datastore-parent
- 2.20.3-SNAPSHOT
+ 2.21.1
google-cloud-datastore
diff --git a/grpc-google-cloud-datastore-admin-v1/pom.xml b/grpc-google-cloud-datastore-admin-v1/pom.xml
index 69da06680..373333ce3 100644
--- a/grpc-google-cloud-datastore-admin-v1/pom.xml
+++ b/grpc-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
grpc-google-cloud-datastore-admin-v1
GRPC library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.20.3-SNAPSHOT
+ 2.21.1
diff --git a/pom.xml b/pom.xml
index 407041f2b..72d70b386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-datastore-parent
pom
- 2.20.3-SNAPSHOT
+ 2.21.1
Google Cloud Datastore Parent
https://github.com/googleapis/java-datastore
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.32.0
+ 3.33.0
@@ -159,27 +159,27 @@
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.cloud
google-cloud-datastore
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.111.3-SNAPSHOT
+ 0.112.1
com.google.cloud.datastore
datastore-v1-proto-client
- 2.20.3-SNAPSHOT
+ 2.21.1
com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index f53996a6d..1c660d581 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.20.3-SNAPSHOT
+ 2.21.1
proto-google-cloud-datastore-admin-v1
Proto library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.20.3-SNAPSHOT
+ 2.21.1
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index 85f530c75..4740a89c4 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.111.3-SNAPSHOT
+ 0.112.1
proto-google-cloud-datastore-v1
PROTO library for proto-google-cloud-datastore-v1
com.google.cloud
google-cloud-datastore-parent
- 2.20.3-SNAPSHOT
+ 2.21.1
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 0f3c1919c..5a0ee2386 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
libraries-bom
- 26.41.0
+ 26.43.0
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 93710c03b..3d3b267eb 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-datastore
- 2.20.3-SNAPSHOT
+ 2.21.1
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index f04cdc885..7e4de0be6 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.41.0
+ 26.43.0
pom
import
diff --git a/versions.txt b/versions.txt
index 5d2ffbced..478c0b62e 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.20.2:2.20.3-SNAPSHOT
-google-cloud-datastore-bom:2.20.2:2.20.3-SNAPSHOT
-proto-google-cloud-datastore-v1:0.111.2:0.111.3-SNAPSHOT
-datastore-v1-proto-client:2.20.2:2.20.3-SNAPSHOT
-proto-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
-grpc-google-cloud-datastore-admin-v1:2.20.2:2.20.3-SNAPSHOT
+google-cloud-datastore:2.21.1:2.21.1
+google-cloud-datastore-bom:2.21.1:2.21.1
+proto-google-cloud-datastore-v1:0.112.1:0.112.1
+datastore-v1-proto-client:2.21.1:2.21.1
+proto-google-cloud-datastore-admin-v1:2.21.1:2.21.1
+grpc-google-cloud-datastore-admin-v1:2.21.1:2.21.1