From 01d6bfdaab56c1fcf95b0f487cd1ac6875dff290 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 17 Sep 2020 07:57:24 +0200 Subject: [PATCH 1/6] chore(deps): update dependency com.google.cloud:google-cloud-spanner to v2 (#434) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0edf5be11b0..c478a9cfe56 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-spanner - 1.61.0 + 2.0.0 From dce3ee79664cc528415db08b3268d719ea720ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Thu, 17 Sep 2020 15:44:54 +0200 Subject: [PATCH 2/6] fix: do not close delegate rs in callback runnable (#425) * fix: do not close delegate rs in callback runnable * test: add test case to show infinite loop * test: add stress test --- .../cloud/spanner/AsyncResultSetImpl.java | 2 +- .../spanner/AsyncResultSetImplStressTest.java | 41 +++++++++++++++++++ .../cloud/spanner/AsyncResultSetImplTest.java | 22 ++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java index 442556b56d7..1cb768ea85a 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AsyncResultSetImpl.java @@ -275,7 +275,7 @@ public void run() { switch (response) { case DONE: state = State.DONE; - closeDelegateResultSet(); + cursorReturnedDoneOrException = true; return; case PAUSE: state = State.PAUSED; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplStressTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplStressTest.java index 44a05712594..71447d46e7e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplStressTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplStressTest.java @@ -284,6 +284,47 @@ public CallbackResponse cursorReady(AsyncResultSet resultSet) { } } + @Test + public void returnDoneBeforeEnd() throws Exception { + ExecutorProvider executorProvider = SpannerOptions.createDefaultAsyncExecutorProvider(); + final Random random = new Random(); + for (Executor executor : + new Executor[] { + MoreExecutors.directExecutor(), createExecService(), createExecService(32) + }) { + for (int bufferSize = 1; bufferSize < resultSetSize * 2; bufferSize *= 2) { + for (int i = 0; i < TEST_RUNS; i++) { + try (AsyncResultSetImpl impl = + new AsyncResultSetImpl(executorProvider, createResultSet(), bufferSize)) { + ApiFuture res = + impl.setCallback( + executor, + new ReadyCallback() { + @Override + public CallbackResponse cursorReady(AsyncResultSet resultSet) { + switch (resultSet.tryNext()) { + case DONE: + return CallbackResponse.DONE; + case NOT_READY: + return random.nextBoolean() + ? CallbackResponse.DONE + : CallbackResponse.CONTINUE; + case OK: + return random.nextInt(resultSetSize) <= 2 + ? CallbackResponse.DONE + : CallbackResponse.CONTINUE; + default: + throw new IllegalStateException(); + } + } + }); + assertThat(res.get(10L, TimeUnit.SECONDS)).isNull(); + } + } + } + } + } + @Test public void pauseResume() throws Exception { ExecutorProvider executorProvider = SpannerOptions.createDefaultAsyncExecutorProvider(); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplTest.java index 78da23ca433..682802d85eb 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncResultSetImplTest.java @@ -440,4 +440,26 @@ public CallbackResponse cursorReady(AsyncResultSet resultSet) { assertThat(callbackCounter.get()).isEqualTo(1); } } + + @Test + public void callbackReturnsDoneBeforeEnd_shouldStopIteration() throws Exception { + Executor executor = Executors.newSingleThreadExecutor(); + ResultSet delegate = mock(ResultSet.class); + when(delegate.next()).thenReturn(true, true, true, false); + when(delegate.getCurrentRowAsStruct()).thenReturn(mock(Struct.class)); + try (AsyncResultSetImpl rs = + new AsyncResultSetImpl(simpleProvider, delegate, AsyncResultSetImpl.DEFAULT_BUFFER_SIZE)) { + rs.setCallback( + executor, + new ReadyCallback() { + @Override + public CallbackResponse cursorReady(AsyncResultSet resultSet) { + // Not calling resultSet.tryNext() means that it will also never return DONE. + // Instead the callback indicates that it does not want any more rows. + return CallbackResponse.DONE; + } + }); + rs.getResult().get(10L, TimeUnit.SECONDS); + } + } } From 9bce4d639cb8e0d8dba7601b55caf801c23f9ecc Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 12:04:53 +1000 Subject: [PATCH 3/6] chore: release 2.0.1-SNAPSHOT (#435) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 84493dafc4d..71739d06ca4 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 - 2.0.0 + 2.0.1-SNAPSHOT pom com.google.cloud @@ -64,43 +64,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.cloud google-cloud-spanner - 2.0.0 + 2.0.1-SNAPSHOT com.google.cloud google-cloud-spanner test-jar - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index f8a0de5762e..6785d8267f1 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 - 2.0.0 + 2.0.1-SNAPSHOT jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index d0c2294404d..fdab1e12fb9 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 - 2.0.0 + 2.0.1-SNAPSHOT grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 1aa06bd9f68..0e29f7ba185 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 - 2.0.0 + 2.0.1-SNAPSHOT grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 86abf818346..c3b930639b9 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 - 2.0.0 + 2.0.1-SNAPSHOT grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 3e540e6dff4..b3fdc6ca7b0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 2.0.0 + 2.0.1-SNAPSHOT Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -70,37 +70,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 2.0.0 + 2.0.1-SNAPSHOT com.google.cloud google-cloud-spanner - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index fcaa66f8479..c2674bdc6df 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 - 2.0.0 + 2.0.1-SNAPSHOT proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 9b4e69a7835..79162f4a0e0 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 - 2.0.0 + 2.0.1-SNAPSHOT proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index e87438bc353..31799c01a19 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 - 2.0.0 + 2.0.1-SNAPSHOT proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 17acf2c3269..ed1f0533ce7 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-spanner - 2.0.0 + 2.0.1-SNAPSHOT diff --git a/versions.txt b/versions.txt index ab95fe243cb..345afe0404f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.0 -proto-google-cloud-spanner-v1:2.0.0:2.0.0 -proto-google-cloud-spanner-admin-database-v1:2.0.0:2.0.0 -grpc-google-cloud-spanner-v1:2.0.0:2.0.0 -grpc-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.0 -grpc-google-cloud-spanner-admin-database-v1:2.0.0:2.0.0 -google-cloud-spanner:2.0.0:2.0.0 \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.1-SNAPSHOT +proto-google-cloud-spanner-v1:2.0.0:2.0.1-SNAPSHOT +proto-google-cloud-spanner-admin-database-v1:2.0.0:2.0.1-SNAPSHOT +grpc-google-cloud-spanner-v1:2.0.0:2.0.1-SNAPSHOT +grpc-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.1-SNAPSHOT +grpc-google-cloud-spanner-admin-database-v1:2.0.0:2.0.1-SNAPSHOT +google-cloud-spanner:2.0.0:2.0.1-SNAPSHOT \ No newline at end of file From fa5d3a57a996ad5a04b1ef7a5bab31ce5e40023f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 18 Sep 2020 04:05:30 +0200 Subject: [PATCH 4/6] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.6 (#431) --- google-cloud-spanner/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 6785d8267f1..869e097abae 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -24,7 +24,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + 0.8.6 From c36e41bfaaf8026d2f6601ed12bfaa0d7a4ea802 Mon Sep 17 00:00:00 2001 From: Thiago Nunes Date: Fri, 18 Sep 2020 15:39:46 +1000 Subject: [PATCH 5/6] fix: re-adds method used in internal testing (#438) We had removed a method from GapicSpannerRpc that was used in the internal testing infrastructure. We are adding this back for the time being. --- .../google/cloud/spanner/spi/v1/GapicSpannerRpc.java | 8 ++++++++ .../cloud/spanner/spi/v1/GapicSpannerRpcTest.java | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 50af8b0667b..48160736a38 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -1408,6 +1408,14 @@ private static T get(final Future future) throws SpannerException { } } + // Before removing this method, please verify with a code owner that it is not used + // in any internal testing infrastructure. + @VisibleForTesting + @Deprecated + GrpcCallContext newCallContext(@Nullable Map options, String resource) { + return newCallContext(options, resource, null, null); + } + @VisibleForTesting GrpcCallContext newCallContext( @Nullable Map options, 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 18270dfdd46..3e1585a658e 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 @@ -93,6 +93,7 @@ /** Tests that opening and closing multiple Spanner instances does not leak any threads. */ @RunWith(JUnit4.class) public class GapicSpannerRpcTest { + private static final Statement SELECT1AND2 = Statement.of("SELECT 1 AS COL1 UNION ALL SELECT 2 AS COL1"); private static final ResultSetMetadata SELECT1AND2_METADATA = @@ -380,6 +381,7 @@ public void testNoCallCredentials() { } private static final class TimeoutHolder { + private Duration timeout; } @@ -454,6 +456,14 @@ public Long run(TransactionContext transaction) throws Exception { } } + @Test + public void testNewCallContextWithNullRequestAndNullMethod() { + SpannerOptions options = SpannerOptions.newBuilder().setProjectId("some-project").build(); + GapicSpannerRpc rpc = new GapicSpannerRpc(options); + assertThat(rpc.newCallContext(optionsMap, "/some/resource", null, null)).isNotNull(); + rpc.shutdown(); + } + @SuppressWarnings("rawtypes") private SpannerOptions createSpannerOptions() { String endpoint = address.getHostString() + ":" + server.getPort(); From 0093f7aaa1941ce1a3e674a20b827c03716571d2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 16:15:58 +1000 Subject: [PATCH 6/6] chore: release 2.0.1 (#437) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ README.md | 4 ++-- google-cloud-spanner-bom/pom.xml | 18 +++++++++--------- google-cloud-spanner/pom.xml | 4 ++-- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- grpc-google-cloud-spanner-v1/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- proto-google-cloud-spanner-v1/pom.xml | 4 ++-- samples/snapshot/pom.xml | 2 +- versions.txt | 14 +++++++------- 13 files changed, 49 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 202cf8c61ac..d7f478282e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [2.0.1](https://www.github.com/googleapis/java-spanner/compare/v2.0.0...v2.0.1) (2020-09-18) + + +### Bug Fixes + +* do not close delegate rs in callback runnable ([#425](https://www.github.com/googleapis/java-spanner/issues/425)) ([dce3ee7](https://www.github.com/googleapis/java-spanner/commit/dce3ee79664cc528415db08b3268d719ea720ded)) +* re-adds method used in internal testing ([#438](https://www.github.com/googleapis/java-spanner/issues/438)) ([c36e41b](https://www.github.com/googleapis/java-spanner/commit/c36e41bfaaf8026d2f6601ed12bfaa0d7a4ea802)) + ## [2.0.0](https://www.github.com/googleapis/java-spanner/compare/v1.61.0...v2.0.0) (2020-09-16) diff --git a/README.md b/README.md index a93dcb4c581..79217260c17 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-spanner:2.0.0' +compile 'com.google.cloud:google-cloud-spanner:2.0.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "2.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "2.0.1" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index 71739d06ca4..eb6d87e0488 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 - 2.0.1-SNAPSHOT + 2.0.1 pom com.google.cloud @@ -64,43 +64,43 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.cloud google-cloud-spanner - 2.0.1-SNAPSHOT + 2.0.1 com.google.cloud google-cloud-spanner test-jar - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index 869e097abae..a135d1ff4e8 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 - 2.0.1-SNAPSHOT + 2.0.1 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,7 +11,7 @@ com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 google-cloud-spanner diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index fdab1e12fb9..2d44f93769b 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 - 2.0.1-SNAPSHOT + 2.0.1 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 0e29f7ba185..1467dd6efe3 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 - 2.0.1-SNAPSHOT + 2.0.1 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index c3b930639b9..222d4b65481 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 - 2.0.1-SNAPSHOT + 2.0.1 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/pom.xml b/pom.xml index b3fdc6ca7b0..1a18a6388e8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 2.0.1-SNAPSHOT + 2.0.1 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -70,37 +70,37 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 2.0.1-SNAPSHOT + 2.0.1 com.google.cloud google-cloud-spanner - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index c2674bdc6df..f096f9a5fdf 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 - 2.0.1-SNAPSHOT + 2.0.1 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 79162f4a0e0..1687f79c928 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 - 2.0.1-SNAPSHOT + 2.0.1 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 31799c01a19..04eac082570 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 - 2.0.1-SNAPSHOT + 2.0.1 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ed1f0533ce7..d085222e6ca 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-spanner - 2.0.1-SNAPSHOT + 2.0.1 diff --git a/versions.txt b/versions.txt index 345afe0404f..56bbc5754f4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,10 +1,10 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.1-SNAPSHOT -proto-google-cloud-spanner-v1:2.0.0:2.0.1-SNAPSHOT -proto-google-cloud-spanner-admin-database-v1:2.0.0:2.0.1-SNAPSHOT -grpc-google-cloud-spanner-v1:2.0.0:2.0.1-SNAPSHOT -grpc-google-cloud-spanner-admin-instance-v1:2.0.0:2.0.1-SNAPSHOT -grpc-google-cloud-spanner-admin-database-v1:2.0.0:2.0.1-SNAPSHOT -google-cloud-spanner:2.0.0:2.0.1-SNAPSHOT \ No newline at end of file +proto-google-cloud-spanner-admin-instance-v1:2.0.1:2.0.1 +proto-google-cloud-spanner-v1:2.0.1:2.0.1 +proto-google-cloud-spanner-admin-database-v1:2.0.1:2.0.1 +grpc-google-cloud-spanner-v1:2.0.1:2.0.1 +grpc-google-cloud-spanner-admin-instance-v1:2.0.1:2.0.1 +grpc-google-cloud-spanner-admin-database-v1:2.0.1:2.0.1 +google-cloud-spanner:2.0.1:2.0.1 \ No newline at end of file