Skip to content

Commit d95feb6

Browse files
olavloiteolavloite
committed
Merge branch 'master' into buffer-async
2 parents 51b665d + 0b1a4f0 commit d95feb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1744
-1794
lines changed

Diff for: ‎.github/readme/synth.metadata/synth.metadata

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-spanner.git",
7-
"sha": "28909c095eeb7c790a9ca2c373190d64355db538"
7+
"sha": "60ac388942c3cb96c41b353d53a4613787eae990"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "6726988c677bb78385868bfc48dbfa2fe981d44a"
14+
"sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1"
1515
}
1616
}
1717
]

Diff for: ‎.github/release-please.yml

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
releaseType: java-yoshi
22
bumpMinorPreMajor: true
33
branches:
4-
- branch: 3.1.x
5-
releaseType: java-yoshi
6-
bumpMinorPreMajor: true
7-
- branch: 3.3.x
8-
releaseType: java-yoshi
9-
bumpMinorPreMajor: true
10-
- branch: 4.0.x
11-
releaseType: java-yoshi
12-
bumpMinorPreMajor: true
13-
- branch: 5.2.x
14-
releaseType: java-yoshi
15-
bumpMinorPreMajor: true
16-
4+
- branch: 3.1.x
5+
releaseType: java-yoshi
6+
bumpMinorPreMajor: true
7+
- branch: 3.3.x
8+
releaseType: java-yoshi
9+
bumpMinorPreMajor: true
10+
- branch: 4.0.x
11+
releaseType: java-yoshi
12+
bumpMinorPreMajor: true
13+
- branch: 5.2.x
14+
releaseType: java-yoshi
15+
bumpMinorPreMajor: true
16+
- releaseType: java-lts
17+
bumpMinorPreMajor: true
18+
branch: 3.3.3-sp

Diff for: ‎.github/sync-repo-settings.yaml

+90-144
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,95 @@
1-
2-
# Whether or not rebase-merging is enabled on this repository.
3-
# Defaults to `true`
41
rebaseMergeAllowed: false
5-
6-
# Whether or not squash-merging is enabled on this repository.
7-
# Defaults to `true`
82
squashMergeAllowed: true
9-
10-
# Whether or not PRs are merged with a merge commit on this repository.
11-
# Defaults to `false`
123
mergeCommitAllowed: false
13-
14-
# Rules for master branch protection
154
branchProtectionRules:
16-
# Identifies the protection rule pattern. Name of the branch to be protected.
17-
# Defaults to `master`
18-
- pattern: master
19-
# Can admins overwrite branch protection.
20-
# Defaults to `true`
21-
isAdminEnforced: true
22-
# Number of approving reviews required to update matching branches.
23-
# Defaults to `1`
24-
requiredApprovingReviewCount: 1
25-
# Are reviews from code owners required to update matching branches.
26-
# Defaults to `false`
27-
requiresCodeOwnerReviews: true
28-
# Require up to date branches
29-
requiresStrictStatusChecks: false
30-
# List of required status check contexts that must pass for commits to be accepted to matching branches.
31-
requiredStatusCheckContexts:
32-
- "dependencies (8)"
33-
- "dependencies (11)"
34-
- "linkage-monitor"
35-
- "lint"
36-
- "clirr"
37-
- "units (8)"
38-
- "units (11)"
39-
- "Kokoro - Test: Integration"
40-
- "cla/google"
41-
42-
# Identifies the protection rule pattern. Name of the branch to be protected.
43-
# Defaults to `master`
44-
- pattern: 3.1.x
45-
# Can admins overwrite branch protection.
46-
# Defaults to `true`
47-
isAdminEnforced: true
48-
# Number of approving reviews required to update matching branches.
49-
# Defaults to `1`
50-
requiredApprovingReviewCount: 1
51-
# Are reviews from code owners required to update matching branches.
52-
# Defaults to `false`
53-
requiresCodeOwnerReviews: true
54-
# Require up to date branches
55-
requiresStrictStatusChecks: false
56-
# List of required status check contexts that must pass for commits to be accepted to matching branches.
57-
requiredStatusCheckContexts:
58-
- "dependencies (8)"
59-
- "dependencies (11)"
60-
- "lint"
61-
- "units (7)"
62-
- "units (8)"
63-
- "units (11)"
64-
- "Kokoro - Test: Integration"
65-
- "cla/google"
66-
67-
# Identifies the protection rule pattern. Name of the branch to be protected.
68-
# Defaults to `master`
69-
- pattern: 3.3.x
70-
# Can admins overwrite branch protection.
71-
# Defaults to `true`
72-
isAdminEnforced: true
73-
# Number of approving reviews required to update matching branches.
74-
# Defaults to `1`
75-
requiredApprovingReviewCount: 1
76-
# Are reviews from code owners required to update matching branches.
77-
# Defaults to `false`
78-
requiresCodeOwnerReviews: true
79-
# Require up to date branches
80-
requiresStrictStatusChecks: false
81-
# List of required status check contexts that must pass for commits to be accepted to matching branches.
82-
requiredStatusCheckContexts:
83-
- "dependencies (8)"
84-
- "dependencies (11)"
85-
- "lint"
86-
- "units (7)"
87-
- "units (8)"
88-
- "units (11)"
89-
- "Kokoro - Test: Integration"
90-
- "cla/google"
91-
92-
# Identifies the protection rule pattern. Name of the branch to be protected.
93-
# Defaults to `master`
94-
- pattern: 4.0.x
95-
# Can admins overwrite branch protection.
96-
# Defaults to `true`
97-
isAdminEnforced: true
98-
# Number of approving reviews required to update matching branches.
99-
# Defaults to `1`
100-
requiredApprovingReviewCount: 1
101-
# Are reviews from code owners required to update matching branches.
102-
# Defaults to `false`
103-
requiresCodeOwnerReviews: true
104-
# Require up to date branches
105-
requiresStrictStatusChecks: false
106-
# List of required status check contexts that must pass for commits to be accepted to matching branches.
107-
requiredStatusCheckContexts:
108-
- "dependencies (8)"
109-
- "dependencies (11)"
110-
- "lint"
111-
- "units (7)"
112-
- "units (8)"
113-
- "units (11)"
114-
- "Kokoro - Test: Integration"
115-
- "cla/google"
116-
117-
# Identifies the protection rule pattern. Name of the branch to be protected.
118-
# Defaults to `master`
119-
- pattern: 5.2.x
120-
# Can admins overwrite branch protection.
121-
# Defaults to `true`
122-
isAdminEnforced: true
123-
# Number of approving reviews required to update matching branches.
124-
# Defaults to `1`
125-
requiredApprovingReviewCount: 1
126-
# Are reviews from code owners required to update matching branches.
127-
# Defaults to `false`
128-
requiresCodeOwnerReviews: true
129-
# Require up to date branches
130-
requiresStrictStatusChecks: false
131-
# List of required status check contexts that must pass for commits to be accepted to matching branches.
132-
requiredStatusCheckContexts:
133-
- "dependencies (8)"
134-
- "dependencies (11)"
135-
- "lint"
136-
- "units (7)"
137-
- "units (8)"
138-
- "units (11)"
139-
- "Kokoro - Test: Integration"
140-
- "cla/google"
141-
142-
# List of explicit permissions to add (additive only)
5+
- pattern: master
6+
isAdminEnforced: true
7+
requiredApprovingReviewCount: 1
8+
requiresCodeOwnerReviews: true
9+
requiresStrictStatusChecks: false
10+
requiredStatusCheckContexts:
11+
- dependencies (8)
12+
- dependencies (11)
13+
- linkage-monitor
14+
- lint
15+
- clirr
16+
- units (8)
17+
- units (11)
18+
- 'Kokoro - Test: Integration'
19+
- cla/google
20+
- pattern: 3.1.x
21+
isAdminEnforced: true
22+
requiredApprovingReviewCount: 1
23+
requiresCodeOwnerReviews: true
24+
requiresStrictStatusChecks: false
25+
requiredStatusCheckContexts:
26+
- dependencies (8)
27+
- dependencies (11)
28+
- lint
29+
- units (7)
30+
- units (8)
31+
- units (11)
32+
- 'Kokoro - Test: Integration'
33+
- cla/google
34+
- pattern: 3.3.x
35+
isAdminEnforced: true
36+
requiredApprovingReviewCount: 1
37+
requiresCodeOwnerReviews: true
38+
requiresStrictStatusChecks: false
39+
requiredStatusCheckContexts:
40+
- dependencies (8)
41+
- dependencies (11)
42+
- lint
43+
- units (7)
44+
- units (8)
45+
- units (11)
46+
- 'Kokoro - Test: Integration'
47+
- cla/google
48+
- pattern: 4.0.x
49+
isAdminEnforced: true
50+
requiredApprovingReviewCount: 1
51+
requiresCodeOwnerReviews: true
52+
requiresStrictStatusChecks: false
53+
requiredStatusCheckContexts:
54+
- dependencies (8)
55+
- dependencies (11)
56+
- lint
57+
- units (7)
58+
- units (8)
59+
- units (11)
60+
- 'Kokoro - Test: Integration'
61+
- cla/google
62+
- pattern: 5.2.x
63+
isAdminEnforced: true
64+
requiredApprovingReviewCount: 1
65+
requiresCodeOwnerReviews: true
66+
requiresStrictStatusChecks: false
67+
requiredStatusCheckContexts:
68+
- dependencies (8)
69+
- dependencies (11)
70+
- lint
71+
- units (7)
72+
- units (8)
73+
- units (11)
74+
- 'Kokoro - Test: Integration'
75+
- cla/google
76+
- pattern: 3.3.3-sp
77+
isAdminEnforced: true
78+
requiredApprovingReviewCount: 1
79+
requiresCodeOwnerReviews: true
80+
requiresStrictStatusChecks: false
81+
requiredStatusCheckContexts:
82+
- dependencies (8)
83+
- dependencies (11)
84+
- lint
85+
- units (8)
86+
- units (11)
87+
- 'Kokoro - Test: Integration'
88+
- cla/google
14389
permissionRules:
144-
- team: yoshi-admins
145-
permission: admin
146-
- team: yoshi-java-admins
147-
permission: admin
148-
- team: yoshi-java
149-
permission: push
90+
- team: yoshi-admins
91+
permission: admin
92+
- team: yoshi-java-admins
93+
permission: admin
94+
- team: yoshi-java
95+
permission: push

Diff for: ‎.github/workflows/ci.yaml

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ jobs:
1919
- run: .kokoro/build.sh
2020
env:
2121
JOB_TYPE: test
22-
- name: coverage
23-
uses: codecov/codecov-action@v1
24-
with:
25-
name: actions ${{matrix.java}}
2622
windows:
2723
runs-on: windows-latest
2824
steps:
@@ -80,4 +76,4 @@ jobs:
8076
- run: java -version
8177
- run: .kokoro/build.sh
8278
env:
83-
JOB_TYPE: clirr
79+
JOB_TYPE: clirr

Diff for: ‎CHANGELOG.md

+39
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Changelog
22

3+
### [6.4.4](https://www.github.com/googleapis/java-spanner/compare/v6.4.3...v6.4.4) (2021-05-17)
4+
5+
6+
### Bug Fixes
7+
8+
* re-adds test verifyStatementsInFile ([#1181](https://www.github.com/googleapis/java-spanner/issues/1181)) ([7a715b4](https://www.github.com/googleapis/java-spanner/commit/7a715b429ba2a9561d24ba66404142bdc9de5a4f))
9+
10+
### [6.4.3](https://www.github.com/googleapis/java-spanner/compare/v6.4.2...v6.4.3) (2021-05-16)
11+
12+
13+
### Bug Fixes
14+
15+
* re-adds test utility method for connection ([#1178](https://www.github.com/googleapis/java-spanner/issues/1178)) ([0e0dcb7](https://www.github.com/googleapis/java-spanner/commit/0e0dcb7cdc412e54c26d5e8f0176ac1917fa4c59))
16+
17+
### [6.4.2](https://www.github.com/googleapis/java-spanner/compare/v6.4.1...v6.4.2) (2021-05-14)
18+
19+
20+
### Dependencies
21+
22+
* update dependency com.google.cloud:google-cloud-monitoring to v2.2.3 ([#1170](https://www.github.com/googleapis/java-spanner/issues/1170)) ([3bb6885](https://www.github.com/googleapis/java-spanner/commit/3bb688519774d2865701c6ffea5687513a8c7776))
23+
* update dependency com.google.cloud:google-cloud-trace to v1.3.4 ([#1171](https://www.github.com/googleapis/java-spanner/issues/1171)) ([6faa310](https://www.github.com/googleapis/java-spanner/commit/6faa310a5c7f035c39eeaa65eb73584f535a4aeb))
24+
25+
### [6.4.1](https://www.github.com/googleapis/java-spanner/compare/v6.4.0...v6.4.1) (2021-05-13)
26+
27+
28+
### Documentation
29+
30+
* close Spanner instance when it is no longer needed ([#1116](https://www.github.com/googleapis/java-spanner/issues/1116)) ([85bd0cf](https://www.github.com/googleapis/java-spanner/commit/85bd0cf11eab7b2ec47a082a4c2c0c4d9cea01d4))
31+
32+
33+
### Dependencies
34+
35+
* update dependency com.google.cloud:google-cloud-monitoring to v2.2.2 ([#1158](https://www.github.com/googleapis/java-spanner/issues/1158)) ([63eed2e](https://www.github.com/googleapis/java-spanner/commit/63eed2e66fb063358e8b123ba5f919663b70bbe4))
36+
* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#1152](https://www.github.com/googleapis/java-spanner/issues/1152)) ([2e7f18a](https://www.github.com/googleapis/java-spanner/commit/2e7f18a52ef2ed5de6a87169eeefd570844a4c55))
37+
* update dependency org.openjdk.jmh:jmh-core to v1.30 ([#1137](https://www.github.com/googleapis/java-spanner/issues/1137)) ([699a426](https://www.github.com/googleapis/java-spanner/commit/699a4260e3b1a4cf53fc690910aeeadac293e469))
38+
* update dependency org.openjdk.jmh:jmh-core to v1.31 ([#1160](https://www.github.com/googleapis/java-spanner/issues/1160)) ([43a0fb9](https://www.github.com/googleapis/java-spanner/commit/43a0fb97352d928e16ec5138ed2ea494ebaae343))
39+
* update dependency org.openjdk.jmh:jmh-generator-annprocess to v1.30 ([#1138](https://www.github.com/googleapis/java-spanner/issues/1138)) ([ad6649d](https://www.github.com/googleapis/java-spanner/commit/ad6649df03a1a193dd524a84fe9dc1a72ed14e09))
40+
* update dependency org.openjdk.jmh:jmh-generator-annprocess to v1.31 ([#1161](https://www.github.com/googleapis/java-spanner/issues/1161)) ([4d17da2](https://www.github.com/googleapis/java-spanner/commit/4d17da25977dde0cc1032192045d9ee26d3fae09))
41+
342
## [6.4.0](https://www.github.com/googleapis/java-spanner/compare/v6.3.3...v6.4.0) (2021-04-29)
443

544

Diff for: ‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
1717
<dependency>
1818
<groupId>com.google.cloud</groupId>
1919
<artifactId>libraries-bom</artifactId>
20-
<version>20.3.0</version>
20+
<version>20.4.0</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies:
3838
<dependency>
3939
<groupId>com.google.cloud</groupId>
4040
<artifactId>google-cloud-spanner</artifactId>
41-
<version>6.4.0</version>
41+
<version>6.4.3</version>
4242
</dependency>
4343

4444
```
4545

4646
If you are using Gradle 5.x or later, add this to your dependencies
4747
```Groovy
48-
implementation platform('com.google.cloud:libraries-bom:20.3.0')
48+
implementation platform('com.google.cloud:libraries-bom:20.4.0')
4949
5050
compile 'com.google.cloud:google-cloud-spanner'
5151
```
5252
If you are using Gradle without BOM, add this to your dependencies
5353
```Groovy
54-
compile 'com.google.cloud:google-cloud-spanner:4.0.3'
54+
compile 'com.google.cloud:google-cloud-spanner:6.4.3'
5555
```
5656

5757
If you are using SBT, add this to your dependencies
5858
```Scala
59-
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "4.0.3"
59+
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.4.3"
6060
```
6161

6262
## Authentication

0 commit comments

Comments
 (0)