From d48836735f22441dc29cb41f683ef0afd9f5310d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:37:52 +1000 Subject: [PATCH 1/6] chore(java): remove dependencyDashboardLabel config from renovate.json (#1220) (#617) Source-Link: https://github.com/googleapis/synthtool/commit/0752ff727a19a467dffed335d5e59303689cf0d1 Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- renovate.json | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5607b418e..9fb406b3b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:b328758e5113c392d3eccad613c2b18097eaebcb4d8bf77fab0326a6cad90bc7 \ No newline at end of file + digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a diff --git a/renovate.json b/renovate.json index d469dda30..537169564 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } From b255c5434141a900dca30c1e5dbe465b10b88718 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 28 Sep 2021 21:04:12 +0200 Subject: [PATCH 2/6] deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.12.5 (#622) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-spanner-bom](https://togithub.com/googleapis/java-spanner) | `6.12.2` -> `6.12.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-spanner-bom/6.12.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-spanner-bom/6.12.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-spanner-bom/6.12.5/compatibility-slim/6.12.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-spanner-bom/6.12.5/confidence-slim/6.12.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-spanner ### [`v6.12.5`](https://togithub.com/googleapis/java-spanner/blob/master/CHANGELOG.md#​6125-httpswwwgithubcomgoogleapisjava-spannercomparev6124v6125-2021-09-27) [Compare Source](https://togithub.com/googleapis/java-spanner/compare/v6.12.2...v6.12.5)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-spanner-jdbc). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b385e0c5..29c1231c5 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ com.google.cloud google-cloud-spanner-bom - 6.12.2 + 6.12.5 pom import From af42e65147b5776ce965613085efb074d607f832 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:11:42 -0700 Subject: [PATCH 3/6] chore: release 2.4.5-SNAPSHOT (#618) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: release 2.4.5-SNAPSHOT * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- clirr-ignored-differences.xml | 136 ---------------------------------- pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- versions.txt | 2 +- 4 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 clirr-ignored-differences.xml diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml deleted file mode 100644 index 0962d5e12..000000000 --- a/clirr-ignored-differences.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void addTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - boolean removeTransactionRetryListener(com.google.cloud.spanner.connection.TransactionRetryListener) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - java.util.Iterator getTransactionRetryListenersFromConnection() - - - 8001 - com/google/cloud/spanner/jdbc/ConnectionOptions$Builder - - - 8001 - com/google/cloud/spanner/jdbc/ConnectionOptions$ConnectionProperty - - - 8001 - com/google/cloud/spanner/jdbc/StatementResult$ClientSideStatementType - - - 8001 - com/google/cloud/spanner/jdbc/StatementResult$ResultType - - - 8001 - com/google/cloud/spanner/jdbc/UnitOfWork$Type - - - 8001 - com/google/cloud/spanner/jdbc/UnitOfWork$UnitOfWorkState - - - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - com.google.cloud.spanner.connection.AutocommitDmlMode getAutocommitDmlMode() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - java.lang.String getOptimizerVersion() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - com.google.cloud.spanner.TimestampBound getReadOnlyStaleness() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - com.google.cloud.spanner.connection.TransactionMode getTransactionMode() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - boolean isInTransaction() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - boolean isTransactionStarted() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setAutocommitDmlMode(com.google.cloud.spanner.connection.AutocommitDmlMode) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setOptimizerVersion(java.lang.String) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setReadOnlyStaleness(com.google.cloud.spanner.TimestampBound) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setTransactionMode(com.google.cloud.spanner.connection.TransactionMode) - - - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - com.google.cloud.spanner.CommitResponse getCommitResponse() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - boolean isReturnCommitStats() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setReturnCommitStats(boolean) - - - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - java.lang.String getTransactionTag() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setTransactionTag(java.lang.String) - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - java.lang.String getStatementTag() - - - 7012 - com/google/cloud/spanner/jdbc/CloudSpannerJdbcConnection - void setStatementTag(java.lang.String) - - diff --git a/pom.xml b/pom.xml index 29c1231c5..45099c412 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-spanner-jdbc - 2.4.4 + 2.4.5-SNAPSHOT jar Google Cloud Spanner JDBC https://github.com/googleapis/java-spanner-jdbc diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index bd86a0c1e..82d1061a1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-spanner-jdbc - 2.4.4 + 2.4.5-SNAPSHOT diff --git a/versions.txt b/versions.txt index dff9eb842..546bce02c 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-spanner-jdbc:2.4.4:2.4.4 +google-cloud-spanner-jdbc:2.4.4:2.4.5-SNAPSHOT From 8cac50b3b493e0e930e5d8a884fe4d99d5abf9f8 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 28 Sep 2021 17:04:12 -0400 Subject: [PATCH 4/6] build: configure release-please should tag releases (#624) --- .github/release-please.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 127277a02..cbc451149 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,7 +1,9 @@ releaseType: java-yoshi bumpMinorPreMajor: true +handleGHRelease: true branches: - branch: 1.21.x releaseType: java-yoshi bumpMinorPreMajor: true + handleGHRelease: true From 4fb5313af788247d537a9c8f0db6c139bbacca4e Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 29 Sep 2021 10:32:13 -0400 Subject: [PATCH 5/6] chore: change branch master to main in github configurations (#628) --- .github/blunderbuss.yml | 2 +- .github/sync-repo-settings.yaml | 8 ++++---- .github/workflows/integration-tests-against-emulator.yaml | 2 +- README.md | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index f3e67a049..ff884f273 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_issues: - thiagotnunes assign_prs_by: diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 8a024006a..c6354959c 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -11,11 +11,11 @@ squashMergeAllowed: true # Defaults to `false` mergeCommitAllowed: false -# Rules for master branch protection +# Rules for main branch protection branchProtectionRules: # Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master +# Defaults to `main` +- pattern: main # Can admins overwrite branch protection. # Defaults to `true` isAdminEnforced: true @@ -39,7 +39,7 @@ branchProtectionRules: - "cla/google" # Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` +# Defaults to `main` - pattern: 1.21.x # Can admins overwrite branch protection. # Defaults to `true` diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml index b9b595434..8ee7c4d5d 100644 --- a/.github/workflows/integration-tests-against-emulator.yaml +++ b/.github/workflows/integration-tests-against-emulator.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: Integration tests against emulator jobs: diff --git a/README.md b/README.md index 9a086c957..e7c6e9e6c 100644 --- a/README.md +++ b/README.md @@ -236,10 +236,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ -[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/master/troubleshooting/readme.md#troubleshooting -[contributing]: https://github.com/googleapis/java-spanner-jdbc/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-spanner-jdbc/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-spanner-jdbc/blob/master/LICENSE +[troubleshooting]: https://github.com/googleapis/google-cloud-common/blob/main/troubleshooting/readme.md#troubleshooting +[contributing]: https://github.com/googleapis/java-spanner-jdbc/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-spanner-jdbc/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-spanner-jdbc/blob/main/LICENSE [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM From cda08778088de7724745f77d06c0d523f83f4ed5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 29 Sep 2021 14:38:33 +0000 Subject: [PATCH 6/6] chore: release 2.4.5 (#625) :robot: I have created a release \*beep\* \*boop\* --- ### [2.4.5](https://www.github.com/googleapis/java-spanner-jdbc/compare/v2.4.4...v2.4.5) (2021-09-29) ### Dependencies * update dependency com.google.cloud:google-cloud-spanner-bom to v6.12.5 ([#622](https://www.github.com/googleapis/java-spanner-jdbc/issues/622)) ([b255c54](https://www.github.com/googleapis/java-spanner-jdbc/commit/b255c5434141a900dca30c1e5dbe465b10b88718)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c44e24c39..f6987230b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.4.5](https://www.github.com/googleapis/java-spanner-jdbc/compare/v2.4.4...v2.4.5) (2021-09-29) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-spanner-bom to v6.12.5 ([#622](https://www.github.com/googleapis/java-spanner-jdbc/issues/622)) ([b255c54](https://www.github.com/googleapis/java-spanner-jdbc/commit/b255c5434141a900dca30c1e5dbe465b10b88718)) + ### [2.4.4](https://www.github.com/googleapis/java-spanner-jdbc/compare/v2.4.3...v2.4.4) (2021-09-23) diff --git a/pom.xml b/pom.xml index 45099c412..29ece9c34 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 google-cloud-spanner-jdbc - 2.4.5-SNAPSHOT + 2.4.5 jar Google Cloud Spanner JDBC https://github.com/googleapis/java-spanner-jdbc diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 82d1061a1..9690dee55 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-spanner-jdbc - 2.4.5-SNAPSHOT + 2.4.5 diff --git a/versions.txt b/versions.txt index 546bce02c..20257f9e9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-spanner-jdbc:2.4.4:2.4.5-SNAPSHOT +google-cloud-spanner-jdbc:2.4.5:2.4.5