Skip to content

Commit 80a8c90

Browse files
harshachintaharshachinta
committed
Merge remote-tracking branch 'new-origin/main' into autoscaler
2 parents 2d43eb8 + 84cd62f commit 80a8c90

File tree

51 files changed

+1661
-322
lines changed

Some content is hidden

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

51 files changed

+1661
-322
lines changed

‎.devcontainer/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Reference - https://github.com/microsoft/vscode-dev-containers/tree/main/containers/java-8/.devcontainer
2+
# [Choice] Debian OS version (use bullseye on local arm64/Apple Silicon): buster, bullseye
3+
# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
4+
ARG VARIANT="bullseye"
5+
FROM mcr.microsoft.com/vscode/devcontainers/java:11-${VARIANT}
6+
7+
# [Option] Install Maven
8+
ARG INSTALL_MAVEN="true"
9+
ARG MAVEN_VERSION=""
10+
# [Option] Install Gradle
11+
ARG INSTALL_GRADLE="false"
12+
ARG GRADLE_VERSION=""
13+
RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
14+
&& if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
15+
16+
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
17+
ARG NODE_VERSION="lts/*"
18+
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
19+
20+
# install gloud sdk
21+
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && apt-get update -y && apt-get install google-cloud-cli -y

‎.devcontainer/devcontainer.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"name": "Java 11",
3+
"build": {
4+
"dockerfile": "Dockerfile",
5+
"args": {
6+
// Use the VARIANT arg to pick a Debian OS version: buster, bullseye
7+
// Use bullseye when running on local arm64/Apple Silicon.
8+
"VARIANT": "bullseye",
9+
// Options
10+
"INSTALL_MAVEN": "true",
11+
"INSTALL_GRADLE": "false",
12+
"NODE_VERSION": "lts/*"
13+
}
14+
},
15+
16+
// Configure tool-specific properties.
17+
"customizations": {
18+
// Configure properties specific to VS Code.
19+
"vscode": {
20+
// Set *default* container specific settings.json values on container create.
21+
"settings": {
22+
"java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
23+
"java.configuration.runtimes": [{
24+
"default": true,
25+
"name": "JavaSE-11",
26+
"path": "/usr/local/sdkman/candidates/java/current"
27+
}]
28+
},
29+
30+
// Add the IDs of extensions you want installed when the container is created.
31+
"extensions": [
32+
"vscjava.vscode-java-pack",
33+
"ms-azuretools.vscode-docker"
34+
]
35+
}
36+
},
37+
38+
// Use 'postCreateCommand' to run commands after the container is created.
39+
"postCreateCommand": "bash .devcontainer/postCreate.sh",
40+
41+
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
42+
"remoteUser": "vscode"
43+
}

‎.devcontainer/postCreate.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
echo "Post Create Starting"
2+
3+
mvn clean install -B -V -ntp \
4+
-DskipTests=true \
5+
-Dmaven.javadoc.skip=true \
6+
-Dclirr.skip=true

‎.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
java: [11, 17]
2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
- uses: actions/setup-java@v3
3232
with:
3333
distribution: temurin
@@ -41,7 +41,7 @@ jobs:
4141
name: "units (8)"
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- uses: actions/setup-java@v3
4646
with:
4747
java-version: 8
@@ -58,7 +58,7 @@ jobs:
5858
windows:
5959
runs-on: windows-latest
6060
steps:
61-
- uses: actions/checkout@v3
61+
- uses: actions/checkout@v4
6262
- uses: actions/setup-java@v3
6363
with:
6464
java-version: 8
@@ -81,7 +81,7 @@ jobs:
8181
matrix:
8282
java: [17]
8383
steps:
84-
- uses: actions/checkout@v3
84+
- uses: actions/checkout@v4
8585
- uses: actions/setup-java@v3
8686
with:
8787
distribution: temurin
@@ -91,7 +91,7 @@ jobs:
9191
javadoc:
9292
runs-on: ubuntu-latest
9393
steps:
94-
- uses: actions/checkout@v3
94+
- uses: actions/checkout@v4
9595
- uses: actions/setup-java@v3
9696
with:
9797
distribution: temurin
@@ -103,7 +103,7 @@ jobs:
103103
lint:
104104
runs-on: ubuntu-latest
105105
steps:
106-
- uses: actions/checkout@v3
106+
- uses: actions/checkout@v4
107107
- uses: actions/setup-java@v3
108108
with:
109109
distribution: temurin
@@ -115,7 +115,7 @@ jobs:
115115
clirr:
116116
runs-on: ubuntu-latest
117117
steps:
118-
- uses: actions/checkout@v3
118+
- uses: actions/checkout@v4
119119
- uses: actions/setup-java@v3
120120
with:
121121
distribution: temurin

‎.github/workflows/integration-tests-against-emulator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- 9020:9020
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
- uses: stCarolas/setup-maven@v4
2121
with:
2222
maven-version: 3.8.1

‎.github/workflows/samples.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
checkstyle:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v2
8+
- uses: actions/checkout@v4
99
- uses: actions/setup-java@v1
1010
with:
1111
java-version: 8
@@ -16,7 +16,7 @@ jobs:
1616
name: "compile (8)"
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
- uses: actions/setup-java@v3
2121
with:
2222
# Java 11 to generate class file targeting Java 8
@@ -38,7 +38,7 @@ jobs:
3838
matrix:
3939
java: [11, 17]
4040
steps:
41-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v4
4242
- uses: actions/setup-java@v3
4343
with:
4444
java-version: ${{matrix.java}}

‎.kokoro/build.bat

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@
1515
:: downstream client libraries before they are released.
1616
:: See documentation in type-shell-output.bat
1717

18-
set JAVA8_HOME=%JAVA_HOME:"=%
19-
choco install -y openjdk11
20-
set JAVA11_HOME=C:\Program Files\Eclipse Adoptium\jdk-11.0.18.10-hotspot\
21-
2218
"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh

‎CHANGELOG.md

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

3+
## [6.47.0](https://github.com/googleapis/java-spanner/compare/v6.46.0...v6.47.0) (2023-09-12)
4+
5+
6+
### Features
7+
8+
* Add devcontainers for enabling github codespaces usage. ([#2605](https://github.com/googleapis/java-spanner/issues/2605)) ([a7d60f1](https://github.com/googleapis/java-spanner/commit/a7d60f13781f87054a1631ca511492c5c8334751))
9+
* Disable dynamic code loading properties by default ([#2606](https://github.com/googleapis/java-spanner/issues/2606)) ([d855ebb](https://github.com/googleapis/java-spanner/commit/d855ebbd2dec11cdd6cdbe326de81115632598cd))
10+
11+
12+
### Bug Fixes
13+
14+
* Add reflection configurations for com.google.rpc classes ([#2617](https://github.com/googleapis/java-spanner/issues/2617)) ([c42460a](https://github.com/googleapis/java-spanner/commit/c42460ae7b6bb5874cc18c7aecff34186dcbff2a))
15+
* Avoid unbalanced session pool creation ([#2442](https://github.com/googleapis/java-spanner/issues/2442)) ([db751ce](https://github.com/googleapis/java-spanner/commit/db751ceebc8b6981d00cd07ce4742196cc1dd50d))
16+
17+
18+
### Dependencies
19+
20+
* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.15.0 ([#2615](https://github.com/googleapis/java-spanner/issues/2615)) ([ac762fb](https://github.com/googleapis/java-spanner/commit/ac762fbf079db79eab5f2ebee971b850ac89eb11))
21+
22+
## [6.46.0](https://github.com/googleapis/java-spanner/compare/v6.45.3...v6.46.0) (2023-09-06)
23+
24+
25+
### Features
26+
27+
* Adding support for databoost ([#2505](https://github.com/googleapis/java-spanner/issues/2505)) ([dd3e9a0](https://github.com/googleapis/java-spanner/commit/dd3e9a0fe4846edcab9501b71c3d9e0fa24ed75b))
28+
* Support PostgreSQL for autoConfigEmulator ([#2601](https://github.com/googleapis/java-spanner/issues/2601)) ([fbf1df9](https://github.com/googleapis/java-spanner/commit/fbf1df9f3fb12faaead8634b88fd4843cbdedf5b))
29+
30+
31+
### Bug Fixes
32+
33+
* Fix kokoro windows java8 ci ([#2573](https://github.com/googleapis/java-spanner/issues/2573)) ([465df7b](https://github.com/googleapis/java-spanner/commit/465df7bad12fbea7dbcf6dbabb1b29d088c42665))
34+
35+
36+
### Documentation
37+
38+
* Add sample for transaction timeouts ([#2599](https://github.com/googleapis/java-spanner/issues/2599)) ([59cec9b](https://github.com/googleapis/java-spanner/commit/59cec9b9cdad169bd8de8ab7b264b04150dda7fb))
39+
340
## [6.45.3](https://github.com/googleapis/java-spanner/compare/v6.45.2...v6.45.3) (2023-08-17)
441

542

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.22.0</version>
22+
<version>26.23.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -42,28 +42,28 @@ If you are using Maven without the BOM, add this to your dependencies:
4242
<dependency>
4343
<groupId>com.google.cloud</groupId>
4444
<artifactId>google-cloud-spanner</artifactId>
45-
<version>6.44.0</version>
45+
<version>6.47.0</version>
4646
</dependency>
4747

4848
```
4949

5050
If you are using Gradle 5.x or later, add this to your dependencies:
5151

5252
```Groovy
53-
implementation platform('com.google.cloud:libraries-bom:26.22.0')
53+
implementation platform('com.google.cloud:libraries-bom:26.23.0')
5454
5555
implementation 'com.google.cloud:google-cloud-spanner'
5656
```
5757
If you are using Gradle without BOM, add this to your dependencies:
5858

5959
```Groovy
60-
implementation 'com.google.cloud:google-cloud-spanner:6.45.3'
60+
implementation 'com.google.cloud:google-cloud-spanner:6.47.0'
6161
```
6262

6363
If you are using SBT, add this to your dependencies:
6464

6565
```Scala
66-
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.45.3"
66+
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.47.0"
6767
```
6868
<!-- {x-version-update-end} -->
6969

@@ -431,7 +431,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
431431
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
432432
[stability-image]: https://img.shields.io/badge/stability-stable-green
433433
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
434-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.45.3
434+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.47.0
435435
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
436436
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
437437
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

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

Lines changed: 10 additions & 10 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.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -53,48 +53,48 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner-executor</artifactId>
61-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
61+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
6262
</dependency>
6363
<dependency>
6464
<groupId>com.google.cloud</groupId>
6565
<artifactId>google-cloud-spanner</artifactId>
6666
<type>test-jar</type>
67-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
67+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
72-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
72+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
77-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
77+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
82-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
82+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
87-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
87+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-v1</artifactId>
92-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
92+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
9393
</dependency>
9494
<dependency>
9595
<groupId>com.google.api.grpc</groupId>
9696
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
97-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
97+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9898
</dependency>
9999
</dependencies>
100100
</dependencyManagement>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

‎google-cloud-spanner/clirr-ignored-differences.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,18 @@
416416
<className>com/google/cloud/spanner/connection/Connection</className>
417417
<method>void setMaxPartitions(int)</method>
418418
</difference>
419+
<!-- Add an execute method that allows the driver to state what types should be allowed or not.
420+
This fixes the gap between what JDBC allows, and what is currently allowed in the Connection
421+
API:
422+
1. JDBC allows executeUpdate to be used for everything that does not return a ResultSet.
423+
2. Connection API requires executeUpdate to be used with something that returns an update
424+
count (i.e. no DDL and no client-side statements. -->
425+
<difference>
426+
<differenceType>7012</differenceType>
427+
<className>com/google/cloud/spanner/connection/Connection</className>
428+
<method>com.google.cloud.spanner.connection.StatementResult execute(com.google.cloud.spanner.Statement, java.util.Set)</method>
429+
</difference>
430+
419431
<!-- (Internal change, use stream timeout) -->
420432
<difference>
421433
<differenceType>7012</differenceType>

‎google-cloud-spanner/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner</artifactId>
6-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Spanner</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>Java idiomatic client for Google Cloud Spanner.</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-spanner-parent</artifactId>
14-
<version>6.45.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
14+
<version>6.47.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>

0 commit comments

Comments
 (0)