diff --git a/.github/release-please.yml b/.github/release-please.yml index 541dd8bc79e..c36c6b48209 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -22,3 +22,7 @@ branches: bumpMinorPreMajor: true handleGHRelease: true branch: 6.4.4-sp + - releaseType: java-backport + bumpMinorPreMajor: true + handleGHRelease: true + branch: 6.14.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 941d178b3f8..9ae42dea9c4 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -92,6 +92,23 @@ branchProtectionRules: - 'Kokoro - Test: Integration' - cla/google - checkstyle + - pattern: 6.14.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - checkstyle + - compile (8) + - compile (11) permissionRules: - team: yoshi-admins permission: admin diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a54d4b44be..70d9ef26177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [6.15.0](https://www.github.com/googleapis/java-spanner/compare/v6.14.0...v6.15.0) (2021-10-27) + + +### Features + +* next release from main branch is 6.15.0 ([#1518](https://www.github.com/googleapis/java-spanner/issues/1518)) ([9e5e27e](https://www.github.com/googleapis/java-spanner/commit/9e5e27eee8ba9906900bb2868183b1ec88f19ecf)) + ## [6.14.0](https://www.github.com/googleapis/java-spanner/compare/v6.13.0...v6.14.0) (2021-10-25) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 3d9db44023c..40eb18fb165 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.14.0 + 6.15.0 pom com.google.cloud @@ -54,43 +54,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 com.google.cloud google-cloud-spanner - 6.14.0 + 6.15.0 com.google.cloud google-cloud-spanner test-jar - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 0b110f4a0a4..a3e671f08f2 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.14.0 + 6.15.0 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 9908058de37..96e2796fa28 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 99aeb7cd43f..79f54368312 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index f37c72aadf3..056454a3fb2 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/pom.xml b/pom.xml index ab56795501f..a8959e5bea2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.14.0 + 6.15.0 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -62,37 +62,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 com.google.cloud google-cloud-spanner - 6.14.0 + 6.15.0 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index c7df8eb8796..4bec41080c9 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.14.0 + 6.15.0 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index e7086bbbead..7056658862b 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.14.0 + 6.15.0 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 72c1229c01c..f99aa560715 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.14.0 + 6.15.0 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.14.0 + 6.15.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 6c22d293eff..b218e8e5768 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.13.0 + 6.14.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f05c416264a..2c20f7133f8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 6.14.0 + 6.15.0 diff --git a/versions.txt b/versions.txt index ef14e5ba025..146858423a3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.14.0:6.14.0 -proto-google-cloud-spanner-v1:6.14.0:6.14.0 -proto-google-cloud-spanner-admin-database-v1:6.14.0:6.14.0 -grpc-google-cloud-spanner-v1:6.14.0:6.14.0 -grpc-google-cloud-spanner-admin-instance-v1:6.14.0:6.14.0 -grpc-google-cloud-spanner-admin-database-v1:6.14.0:6.14.0 -google-cloud-spanner:6.14.0:6.14.0 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:6.15.0:6.15.0 +proto-google-cloud-spanner-v1:6.15.0:6.15.0 +proto-google-cloud-spanner-admin-database-v1:6.15.0:6.15.0 +grpc-google-cloud-spanner-v1:6.15.0:6.15.0 +grpc-google-cloud-spanner-admin-instance-v1:6.15.0:6.15.0 +grpc-google-cloud-spanner-admin-database-v1:6.15.0:6.15.0 +google-cloud-spanner:6.15.0:6.15.0 \ No newline at end of file