Skip to content

Commit 4060866

Browse files
olavloiteolavloite
committed
Merge branch 'main' into lazy-decode-bytes
2 parents dd73f39 + 3a167f6 commit 4060866

File tree

27 files changed

+4649
-44
lines changed

27 files changed

+4649
-44
lines changed

‎.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ integration-staging)
9696
-Denforcer.skip=true \
9797
-Dmaven.main.skip=true \
9898
-Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \
99-
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/gaurav-test-instance \
99+
-Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-testing-east1 \
100100
-Dspanner.gce.config.project_id=span-cloud-testing \
101101
-fae \
102102
verify

‎.kokoro/nightly/integration-staging.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ env_vars: {
2323

2424
env_vars: {
2525
key: "GOOGLE_APPLICATION_CREDENTIALS"
26-
value: "secret_manager/java-it-service-account"
26+
value: "secret_manager/java-client-testing"
2727
}
2828

2929
env_vars: {
3030
key: "SECRET_MANAGER_KEYS"
31-
value: "java-it-service-account"
31+
value: "java-client-testing"
3232
}

‎CHANGELOG.md

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

3+
## [6.35.0](https://github.com/googleapis/java-spanner/compare/v6.34.1...v6.35.0) (2023-01-12)
4+
5+
6+
### Features
7+
8+
* Add support for new cloud client test framework in google-cloud-spanner-executor ([#2217](https://github.com/googleapis/java-spanner/issues/2217)) ([d75ebc1](https://github.com/googleapis/java-spanner/commit/d75ebc1387de7ba0e0a32dfcdd564392d43ff555))
9+
* **spanner:** Add samples for fine grained access control ([#2172](https://github.com/googleapis/java-spanner/issues/2172)) ([77969e3](https://github.com/googleapis/java-spanner/commit/77969e35feee4dee3460fcdc45227e9a9d924d74))
10+
11+
12+
### Bug Fixes
13+
14+
* Retry on RST_STREAM internal error ([#2111](https://github.com/googleapis/java-spanner/issues/2111)) ([d5372e6](https://github.com/googleapis/java-spanner/commit/d5372e662624831abc694d81acecf797d32d86e3))
15+
16+
17+
### Dependencies
18+
19+
* Update dependency com.google.cloud:google-cloud-monitoring to v3.8.0 ([#2192](https://github.com/googleapis/java-spanner/issues/2192)) ([fe7e755](https://github.com/googleapis/java-spanner/commit/fe7e755a798b584bf79d16d1f419b1ca7f957172))
20+
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.1.1 ([#2222](https://github.com/googleapis/java-spanner/issues/2222)) ([7d3bcca](https://github.com/googleapis/java-spanner/commit/7d3bcca4e5846d823106f724fef42d2ef3a1c822))
21+
* Update dependency com.google.cloud:google-cloud-trace to v2.7.0 ([#2193](https://github.com/googleapis/java-spanner/issues/2193)) ([da2b924](https://github.com/googleapis/java-spanner/commit/da2b924e037dd366d171c481c6db799de7cacc22))
22+
* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.19 ([#2180](https://github.com/googleapis/java-spanner/issues/2180)) ([43b54e9](https://github.com/googleapis/java-spanner/commit/43b54e92b4df3ec6474b8ba7fef61b5b613e6ab0))
23+
* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.19 ([#2181](https://github.com/googleapis/java-spanner/issues/2181)) ([b42eb38](https://github.com/googleapis/java-spanner/commit/b42eb3866e1fd74f9a9ad2a9dc3d100ac0893f38))
24+
325
## [6.34.1](https://github.com/googleapis/java-spanner/compare/v6.34.0...v6.34.1) (2022-12-13)
426

527

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If you are using Maven without BOM, add this to your dependencies:
4949
If you are using Gradle 5.x or later, add this to your dependencies:
5050

5151
```Groovy
52-
implementation platform('com.google.cloud:libraries-bom:26.2.0')
52+
implementation platform('com.google.cloud:libraries-bom:26.3.0')
5353
5454
implementation 'com.google.cloud:google-cloud-spanner'
5555
```

‎google-cloud-spanner-bom/pom.xml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -53,43 +53,48 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
57+
</dependency>
58+
<dependency>
59+
<groupId>com.google.cloud</groupId>
60+
<artifactId>google-cloud-spanner-executor</artifactId>
61+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
5762
</dependency>
5863
<dependency>
5964
<groupId>com.google.cloud</groupId>
6065
<artifactId>google-cloud-spanner</artifactId>
6166
<type>test-jar</type>
62-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
67+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6368
</dependency>
6469
<dependency>
6570
<groupId>com.google.api.grpc</groupId>
6671
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
72+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6873
</dependency>
6974
<dependency>
7075
<groupId>com.google.api.grpc</groupId>
7176
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
77+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7378
</dependency>
7479
<dependency>
7580
<groupId>com.google.api.grpc</groupId>
7681
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
82+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7883
</dependency>
7984
<dependency>
8085
<groupId>com.google.api.grpc</groupId>
8186
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
87+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8388
</dependency>
8489
<dependency>
8590
<groupId>com.google.api.grpc</groupId>
8691
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
92+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8893
</dependency>
8994
<dependency>
9095
<groupId>com.google.api.grpc</groupId>
9196
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.34.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
97+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9398
</dependency>
9499
</dependencies>
95100
</dependencyManagement>

‎google-cloud-spanner-executor/assembly-descriptor.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
4+
<id>jar-with-dependencies</id>
5+
<formats>
6+
<format>jar</format>
7+
</formats>
8+
<includeBaseDirectory>false</includeBaseDirectory>
9+
<dependencySets>
10+
<dependencySet>
11+
<outputDirectory>/</outputDirectory>
12+
<useProjectArtifact>false</useProjectArtifact>
13+
<unpack>true</unpack>
14+
<unpackOptions>
15+
<excludes>
16+
<exclude>io.grpc.LoadBalancerProvider</exclude>
17+
</excludes>
18+
</unpackOptions>
19+
</dependencySet>
20+
</dependencySets>
21+
<fileSets>
22+
<fileSet>
23+
<directory>${project.build.outputDirectory}</directory>
24+
<outputDirectory>.</outputDirectory>
25+
</fileSet>
26+
</fileSets>
27+
</assembly>

‎google-cloud-spanner-executor/pom.xml

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.google.cloud</groupId>
7+
<artifactId>google-cloud-spanner-executor</artifactId>
8+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
9+
<packaging>jar</packaging>
10+
<name>Google Cloud Spanner Executor</name>
11+
12+
<parent>
13+
<groupId>com.google.cloud</groupId>
14+
<artifactId>google-cloud-spanner-parent</artifactId>
15+
<version>6.35.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
16+
</parent>
17+
18+
<properties>
19+
<maven.compiler.target>1.8</maven.compiler.target>
20+
<maven.compiler.source>1.8</maven.compiler.source>
21+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22+
</properties>
23+
24+
<dependencies>
25+
<dependency>
26+
<groupId>com.google.cloud</groupId>
27+
<artifactId>google-cloud-spanner</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>io.grpc</groupId>
31+
<artifactId>grpc-api</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>io.grpc</groupId>
35+
<artifactId>grpc-netty-shaded</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>io.grpc</groupId>
39+
<artifactId>grpc-stub</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.google.api</groupId>
43+
<artifactId>api-common</artifactId>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.protobuf</groupId>
47+
<artifactId>protobuf-java</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>com.google.protobuf</groupId>
51+
<artifactId>protobuf-java-util</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>com.google.api.grpc</groupId>
55+
<artifactId>proto-google-common-protos</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>com.google.cloud</groupId>
59+
<artifactId>google-cloud-core</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>com.google.auth</groupId>
63+
<artifactId>google-auth-library-oauth2-http</artifactId>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.http-client</groupId>
67+
<artifactId>google-http-client</artifactId>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.google.api.grpc</groupId>
71+
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
72+
</dependency>
73+
<dependency>
74+
<groupId>com.google.api.grpc</groupId>
75+
<artifactId>proto-google-cloud-spanner-v1</artifactId>
76+
</dependency>
77+
<dependency>
78+
<groupId>com.google.api.grpc</groupId>
79+
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.google.api.grpc</groupId>
83+
<artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
84+
<version>1.0.0</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>com.google.guava</groupId>
88+
<artifactId>guava</artifactId>
89+
</dependency>
90+
<dependency>
91+
<groupId>com.google.api</groupId>
92+
<artifactId>gax</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>com.google.api</groupId>
96+
<artifactId>gax-grpc</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.threeten</groupId>
100+
<artifactId>threetenbp</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>com.google.code.findbugs</groupId>
104+
<artifactId>jsr305</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>com.google.auth</groupId>
108+
<artifactId>google-auth-library-credentials</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>io.grpc</groupId>
112+
<artifactId>grpc-services</artifactId>
113+
</dependency>
114+
<dependency>
115+
<groupId>commons-cli</groupId>
116+
<artifactId>commons-cli</artifactId>
117+
<version>1.5.0</version>
118+
</dependency>
119+
<dependency>
120+
<groupId>commons-io</groupId>
121+
<artifactId>commons-io</artifactId>
122+
<version>2.11.0</version>
123+
</dependency>
124+
125+
<dependency>
126+
<groupId>org.jetbrains</groupId>
127+
<artifactId>annotations</artifactId>
128+
<version>RELEASE</version>
129+
<scope>compile</scope>
130+
</dependency>
131+
</dependencies>
132+
<build>
133+
<finalName>google-spanner-cloud-executor</finalName>
134+
<plugins>
135+
<plugin>
136+
<artifactId>maven-assembly-plugin</artifactId>
137+
<version>3.4.2</version>
138+
<configuration>
139+
<descriptors>
140+
<descriptor>assembly-descriptor.xml</descriptor>
141+
</descriptors>
142+
<archive>
143+
<manifest>
144+
<mainClass>com.google.cloud.executor.spanner.WorkerProxy</mainClass>
145+
</manifest>
146+
</archive>
147+
</configuration>
148+
<executions>
149+
<execution>
150+
<id>make-assembly</id>
151+
<phase>package</phase>
152+
<goals>
153+
<goal>single</goal>
154+
</goals>
155+
</execution>
156+
</executions>
157+
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-failsafe-plugin</artifactId>
161+
<version>3.0.0-M7</version>
162+
</plugin>
163+
</plugins>
164+
</build>
165+
</project>

0 commit comments

Comments
 (0)