Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit c1add12

Browse files
olavloiteolavloite
committed
Merge branch 'master' into fail-on-same-token
2 parents 23c401f + fc305b7 commit c1add12

68 files changed

Lines changed: 2748 additions & 599 deletions

File tree

Some content is hidden

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

‎.github/readme/synth.metadata/synth.metadata‎

Lines changed: 2 additions & 2 deletions
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": "13c297b210939a04cab8a8fd547bb34e4d549da7"
7+
"sha": "7af19514dfae5f87ba50572d8867568d2c09daab"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "94686b06034ff6e11217236fcaa217ec6e24bc39"
14+
"sha": "78437c732a60c64895778697b078497b0988346c"
1515
}
1616
}
1717
]

‎.github/release-please.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ branches:
44
- branch: 3.1.x
55
releaseType: java-yoshi
66
bumpMinorPreMajor: true
7+
- branch: 4.0.x
8+
releaseType: java-yoshi
9+
bumpMinorPreMajor: true

‎.github/sync-repo-settings.yaml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ branchProtectionRules:
3434
- "linkage-monitor"
3535
- "lint"
3636
- "clirr"
37-
- "units (7)"
3837
- "units (8)"
3938
- "units (11)"
4039
- "Kokoro - Test: Integration"
@@ -66,11 +65,39 @@ branchProtectionRules:
6665
- "units (11)"
6766
- "Kokoro - Test: Integration"
6867
- "cla/google"
68+
69+
# Identifies the protection rule pattern. Name of the branch to be protected.
70+
# Defaults to `master`
71+
- pattern: 4.0.x
72+
# Can admins overwrite branch protection.
73+
# Defaults to `true`
74+
isAdminEnforced: true
75+
# Number of approving reviews required to update matching branches.
76+
# Defaults to `1`
77+
requiredApprovingReviewCount: 1
78+
# Are reviews from code owners required to update matching branches.
79+
# Defaults to `false`
80+
requiresCodeOwnerReviews: true
81+
# Require up to date branches
82+
requiresStrictStatusChecks: false
83+
# List of required status check contexts that must pass for commits to be accepted to matching branches.
84+
requiredStatusCheckContexts:
85+
- "dependencies (8)"
86+
- "dependencies (11)"
87+
- "linkage-monitor"
88+
- "lint"
89+
- "clirr"
90+
- "units (7)"
91+
- "units (8)"
92+
- "units (11)"
93+
- "Kokoro - Test: Integration"
94+
- "cla/google"
95+
6996
# List of explicit permissions to add (additive only)
7097
permissionRules:
7198
- team: yoshi-admins
7299
permission: admin
73100
- team: yoshi-java-admins
74101
permission: admin
75102
- team: yoshi-java
76-
permission: push
103+
permission: push

‎.github/workflows/auto-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
return;
1717
}
1818
19-
// only approve PRs like "chore(master): release <release version>"
20-
if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
19+
// only approve PRs like "chore: release <release version>"
20+
if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
2121
return;
2222
}
2323

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [7, 8, 11]
12+
java: [8, 11]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-java@v1
@@ -80,4 +80,4 @@ jobs:
8080
- run: java -version
8181
- run: .kokoro/build.sh
8282
env:
83-
JOB_TYPE: clirr
83+
JOB_TYPE: clirr

‎.kokoro/nightly/java7.cfg‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.kokoro/presubmit/java7.cfg‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## [5.2.0](https://www.github.com/googleapis/java-spanner/compare/v5.1.0...v5.2.0) (2021-03-18)
4+
5+
6+
### Features
7+
8+
* add autoConfigEmulator connection option ([#931](https://www.github.com/googleapis/java-spanner/issues/931)) ([32fdd60](https://www.github.com/googleapis/java-spanner/commit/32fdd606f392bc97dab7f37b1c566b3954839f7e))
9+
10+
11+
### Bug Fixes
12+
13+
* all throwables should be ignored in shutdown hook ([#950](https://www.github.com/googleapis/java-spanner/issues/950)) ([213dddc](https://www.github.com/googleapis/java-spanner/commit/213dddcb4f84e19be2f98115493208e3af819485)), closes [#949](https://www.github.com/googleapis/java-spanner/issues/949)
14+
15+
16+
### Dependencies
17+
18+
* update dependency com.google.cloud:google-cloud-monitoring to v2.1.0 ([#953](https://www.github.com/googleapis/java-spanner/issues/953)) ([f991c87](https://www.github.com/googleapis/java-spanner/commit/f991c875d7ec62d19d048576263c5714d4d48a3f))
19+
* update dependency com.google.cloud:google-cloud-trace to v1.3.0 ([#947](https://www.github.com/googleapis/java-spanner/issues/947)) ([c1d560b](https://www.github.com/googleapis/java-spanner/commit/c1d560ba4e799953aff6ba146f6f1b679a4b75b7))
20+
* update dependency org.openjdk.jmh:jmh-generator-annprocess to v1.28 ([#924](https://www.github.com/googleapis/java-spanner/issues/924)) ([693fe5d](https://www.github.com/googleapis/java-spanner/commit/693fe5d4df3d279edb8f6f7f9879366980fd81d8))
21+
322
## [5.1.0](https://www.github.com/googleapis/java-spanner/compare/v5.0.0...v5.1.0) (2021-03-10)
423

524

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,9 @@ Code Samples must be bundled in separate Maven modules, and guarded by a
5757
Maven profile with the name `enable-samples`.
5858

5959
The samples must be separate from the primary project for a few reasons:
60-
1. Primary projects have a minimum Java version of Java 7 whereas samples have
61-
a minimum Java version of Java 8. Due to this we need the ability to
62-
selectively exclude samples from a build run.
63-
2. Many code samples depend on external GCP services and need
60+
1. Many code samples depend on external GCP services and need
6461
credentials to access the service.
65-
3. Code samples are not released as Maven artifacts and must be excluded from
62+
2. Code samples are not released as Maven artifacts and must be excluded from
6663
release builds.
6764

6865
### Building

‎README.md‎

Lines changed: 3 additions & 3 deletions
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>19.0.0</version>
20+
<version>19.2.0</version>
2121
<type>pom</type>
2222
<scope>import</scope>
2323
</dependency>
@@ -38,14 +38,14 @@ 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>5.0.0</version>
41+
<version>5.1.0</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:19.0.0')
48+
implementation platform('com.google.cloud:libraries-bom:19.2.0')
4949
5050
compile 'com.google.cloud:google-cloud-spanner'
5151
```

0 commit comments

Comments
 (0)