diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index def4dadcd00..23f541cc598 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "7d4f70a613b9a7668e371ee3aa174fdf897de141" + "sha": "2e0ebed3c7e8967245cf7c857fc7f9232ce9bb93" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4dca4132c6d63788c6675e1b1e11e7b9225f8694" + "sha": "79ab0b44a2cc7d803d07c107f9faf07729fc4012" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 17f6568f292..d6d851ac90a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -29,7 +29,7 @@ echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index c91e5a56937..0fb8c8436cc 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true @@ -86,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi \ No newline at end of file +fi diff --git a/CHANGELOG.md b/CHANGELOG.md index f3dad539aa7..19430ad31f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [4.0.2](https://www.github.com/googleapis/java-spanner/compare/v4.0.1...v4.0.2) (2021-02-23) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-monitoring to v2.0.13 ([#901](https://www.github.com/googleapis/java-spanner/issues/901)) ([10749c7](https://www.github.com/googleapis/java-spanner/commit/10749c7a074d33c853b0f11a0e6c6ee5f09e75c9)) +* update dependency com.google.cloud:google-cloud-trace to v1.2.12 ([#896](https://www.github.com/googleapis/java-spanner/issues/896)) ([84ee6e0](https://www.github.com/googleapis/java-spanner/commit/84ee6e0d442a29893e1ac77fa7882ed0407c9a7d)) + ### [4.0.1](https://www.github.com/googleapis/java-spanner/compare/v4.0.0...v4.0.1) (2021-02-22) diff --git a/README.md b/README.md index e19e2fe2add..ca81e94dc2a 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,12 @@ compile 'com.google.cloud:google-cloud-spanner' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-spanner:4.0.0' +compile 'com.google.cloud:google-cloud-spanner:4.0.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "4.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "4.0.1" ``` ## Authentication diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 5f9869bbca4..148024f05d5 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 4.0.1 + 4.0.2 pom com.google.cloud @@ -64,43 +64,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 com.google.api.grpc proto-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 com.google.cloud google-cloud-spanner - 4.0.1 + 4.0.2 com.google.cloud google-cloud-spanner test-jar - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 59c6c3c6dac..a7c67c7fb8f 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 4.0.1 + 4.0.2 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 google-cloud-spanner diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java index 5a9dec72edc..6aa754d5f1b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpcTest.java @@ -511,16 +511,17 @@ public void testAdminRequestsLimitExceededRetryAlgorithm() { @Test public void testDefaultUserAgent() { final SpannerOptions options = createSpannerOptions(); - final Spanner spanner = options.getService(); - final DatabaseClient databaseClient = - spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); + try (final Spanner spanner = options.getService()) { + final DatabaseClient databaseClient = + spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); - try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { - rs.next(); - } + try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { + rs.next(); + } - assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) - .contains(defaultUserAgent); + assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) + .contains(defaultUserAgent); + } } @Test @@ -536,16 +537,17 @@ public Map getHeaders() { }; final SpannerOptions options = createSpannerOptions().toBuilder().setHeaderProvider(userAgentHeaderProvider).build(); - final Spanner spanner = options.getService(); - final DatabaseClient databaseClient = - spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); + try (Spanner spanner = options.getService()) { + final DatabaseClient databaseClient = + spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]")); - try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { - rs.next(); - } + try (final ResultSet rs = databaseClient.singleUse().executeQuery(SELECT1AND2)) { + rs.next(); + } - assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) - .contains("test-agent " + defaultUserAgent); + assertThat(seenHeaders.get(Key.of("user-agent", Metadata.ASCII_STRING_MARSHALLER))) + .contains("test-agent " + defaultUserAgent); + } } @SuppressWarnings("rawtypes") diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 49b808c4e69..6d20666acf3 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index f858f6820b5..63b90d7cd97 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index fc3ccbc1c60..2028a3f8a3d 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/pom.xml b/pom.xml index 7ad17728e2c..3b51bd9286f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 4.0.1 + 4.0.2 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -71,37 +71,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 com.google.api.grpc proto-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 com.google.cloud google-cloud-spanner - 4.0.1 + 4.0.2 @@ -121,7 +121,7 @@ com.google.truth truth - 1.1 + 1.1.2 test diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index b81c7d1b287..c40ef138cbd 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 4.0.1 + 4.0.2 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 8b8cf153f45..19887df1cc9 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 4.0.1 + 4.0.2 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index bb6b2cf4aa3..4d5051968be 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 4.0.1 + 4.0.2 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 4.0.1 + 4.0.2 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 9b7f7029a9b..e5b48757984 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -22,8 +22,8 @@ 1.8 UTF-8 0.28.3 - 1.2.11 - 2.0.12 + 1.2.12 + 2.0.13 @@ -99,7 +99,7 @@ com.google.truth truth - 1.1 + 1.1.2 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 17f49744d1d..e2ec09c0d91 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -22,8 +22,8 @@ 1.8 UTF-8 0.28.3 - 1.2.11 - 2.0.12 + 1.2.12 + 2.0.13 @@ -31,7 +31,7 @@ com.google.cloud google-cloud-spanner - 4.0.1 + 4.0.2 @@ -98,7 +98,7 @@ com.google.truth truth - 1.1 + 1.1.2 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 642eec6ea62..b1b2be8e87b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -110,7 +110,7 @@ com.google.truth truth - 1.1 + 1.1.2 test diff --git a/synth.metadata b/synth.metadata index da820a34902..e4f6aa5fa20 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-spanner.git", - "sha": "864f2a27a102de20ac57e3382a6068d4cd844e0b" + "sha": "9a590000794caef8d7fc00d9083654fe2f0931a3" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1aeca92e4a38f47134cb955f52ea76f84f09ff88" + "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" } } ], diff --git a/versions.txt b/versions.txt index 7bc2981e725..dd100eacb33 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:4.0.1:4.0.1 -proto-google-cloud-spanner-v1:4.0.1:4.0.1 -proto-google-cloud-spanner-admin-database-v1:4.0.1:4.0.1 -grpc-google-cloud-spanner-v1:4.0.1:4.0.1 -grpc-google-cloud-spanner-admin-instance-v1:4.0.1:4.0.1 -grpc-google-cloud-spanner-admin-database-v1:4.0.1:4.0.1 -google-cloud-spanner:4.0.1:4.0.1 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:4.0.2:4.0.2 +proto-google-cloud-spanner-v1:4.0.2:4.0.2 +proto-google-cloud-spanner-admin-database-v1:4.0.2:4.0.2 +grpc-google-cloud-spanner-v1:4.0.2:4.0.2 +grpc-google-cloud-spanner-admin-instance-v1:4.0.2:4.0.2 +grpc-google-cloud-spanner-admin-database-v1:4.0.2:4.0.2 +google-cloud-spanner:4.0.2:4.0.2 \ No newline at end of file