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

Commit 7abb3f8

Browse files
thiagotnunesthiagotnunes
committed
Merge branch 'master' of github.com:googleapis/java-spanner into rpc-priorities
2 parents 3abfd4e + a2e5803 commit 7abb3f8

50 files changed

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

‎.github/release-please.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ branches:
77
- branch: 4.0.x
88
releaseType: java-yoshi
99
bumpMinorPreMajor: true
10+
- branch: 5.2.x
11+
releaseType: java-yoshi
12+
bumpMinorPreMajor: true
13+

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,33 @@ branchProtectionRules:
9393
- "Kokoro - Test: Integration"
9494
- "cla/google"
9595

96+
# Identifies the protection rule pattern. Name of the branch to be protected.
97+
# Defaults to `master`
98+
- pattern: 5.2.x
99+
# Can admins overwrite branch protection.
100+
# Defaults to `true`
101+
isAdminEnforced: true
102+
# Number of approving reviews required to update matching branches.
103+
# Defaults to `1`
104+
requiredApprovingReviewCount: 1
105+
# Are reviews from code owners required to update matching branches.
106+
# Defaults to `false`
107+
requiresCodeOwnerReviews: true
108+
# Require up to date branches
109+
requiresStrictStatusChecks: false
110+
# List of required status check contexts that must pass for commits to be accepted to matching branches.
111+
requiredStatusCheckContexts:
112+
- "dependencies (8)"
113+
- "dependencies (11)"
114+
- "linkage-monitor"
115+
- "lint"
116+
- "clirr"
117+
- "units (7)"
118+
- "units (8)"
119+
- "units (11)"
120+
- "Kokoro - Test: Integration"
121+
- "cla/google"
122+
96123
# List of explicit permissions to add (additive only)
97124
permissionRules:
98125
- team: yoshi-admins

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ samples)
7979

8080
if [[ -f ${SAMPLES_DIR}/pom.xml ]]
8181
then
82+
for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
83+
[[ -f "$FILE" ]] || continue
84+
source "$FILE"
85+
done
86+
8287
pushd ${SAMPLES_DIR}
8388
mvn -B \
8489
-Penable-samples \

‎.kokoro/nightly/java7.cfg‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java7"
7+
}

‎.kokoro/presubmit/java7.cfg‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java7"
7+
}

‎.kokoro/release/publish_javadoc.sh‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then
2424
exit 1
2525
fi
2626

27-
if [[ -z "${STAGING_BUCKET_V2}" ]]; then
28-
echo "Need to set STAGING_BUCKET_V2 environment variable"
29-
exit 1
30-
fi
31-
3227
# work from the git root directory
3328
pushd $(dirname "$0")/../../
3429

‎.repo-metadata.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
88
"release_level": "ga",
99
"language": "java",
10+
"min_java_version": 8,
1011
"repo": "googleapis/java-spanner",
1112
"repo_short": "java-spanner",
1213
"distribution_name": "com.google.cloud:google-cloud-spanner",
@@ -15,3 +16,4 @@
1516
"requires_billing": true,
1617
"codeowner_team": "@googleapis/api-spanner-java"
1718
}
19+

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,12 @@ 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. Many code samples depend on external GCP services and need
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
6164
credentials to access the service.
62-
2. Code samples are not released as Maven artifacts and must be excluded from
65+
3. Code samples are not released as Maven artifacts and must be excluded from
6366
release builds.
6467

6568
### Building

0 commit comments

Comments
 (0)