From f508f245a59b2086c4b56d55f0cb25e9e7c29136 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 Dec 2022 21:20:03 +0100 Subject: [PATCH 01/10] fix(deps): update dependency com.google.protobuf:protobuf-bom to v3.21.10 (#1912) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21aa2f40c..8dfcb762f 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ com.google.protobuf protobuf-bom - 3.21.9 + 3.21.10 pom import From af157d02dde808c2faa53435189c23f797dfeb81 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 Dec 2022 21:21:27 +0100 Subject: [PATCH 02/10] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.21.10 (#1910) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 521a851da..637642887 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.105.0 # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.21.9 +version.com_google_protobuf=3.21.10 version.google_java_format=1.15.0 version.io_grpc=1.51.0 From 7504e37163d39d10bd8388101e9ce614e2839aca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 Dec 2022 21:21:57 +0100 Subject: [PATCH 03/10] fix(deps): update dependency com.google.api.grpc:proto-google-common-protos to v2.11.0 (#1907) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dfcb762f..a3dbee137 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ com.google.api.grpc proto-google-common-protos - 2.10.0 + 2.11.0 com.google.api.grpc From f0a769cd0cd3d1ec2c341773fad34b5955045e98 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 2 Dec 2022 14:53:49 -0500 Subject: [PATCH 04/10] chore: Update README about maven migration (#1913) * chore: Update README about maven migration * chore: Update gradle references to maven in CONTRIBUTING.md * chore: Update CONTRIBUTING.md * chore: Update README.md --- CONTRIBUTING.md | 8 +------- README.md | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2ab6d62b1..f39ea3e17 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,13 +24,7 @@ use Github pull requests for this purpose. To build GAX: ```sh -./gradlew build -``` - -To install GAX into the local maven repository: - -```sh -./gradlew publishToMavenLocal +mvn clean install ``` ### The small print diff --git a/README.md b/README.md index 92eb4b47c..a0d1aa77a 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,13 @@ a high risk of diamond dependency problems, because google-cloud-java uses beta library which can change in breaking ways between versions. See [VERSIONING](#versioning) for more information. +> For new and existing Developers/ Contributors: +> +> In December 2022, gax-java's build tool has been migrated from gradle to maven. +> Gradle related files are no longer being maintained and will be eventually removed. +> +> The artifact coordinates in Maven Central (`{{ group_id }}:{{ artifact_id }}`) remain the same. + Quickstart ---------- From bd1714e484eef8aa8f09632eee976c9da26da5f1 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 2 Dec 2022 15:13:33 -0500 Subject: [PATCH 05/10] fix: Watchdog controls lifecycle of the future, not executor (#1890) --- .../java/com/google/api/gax/rpc/Watchdog.java | 16 +++++++++++++--- .../com/google/api/gax/rpc/WatchdogProvider.java | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java index 83d729933..8ca97876c 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java +++ b/gax/src/main/java/com/google/api/gax/rpc/Watchdog.java @@ -36,9 +36,11 @@ import java.util.Map.Entry; import java.util.concurrent.CancellationException; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nonnull; @@ -61,6 +63,7 @@ * */ public final class Watchdog implements Runnable, BackgroundResource { + private static final Logger LOG = Logger.getLogger(Watchdog.class.getName()); // Dummy value to convert the ConcurrentHashMap into a Set @@ -138,12 +141,12 @@ public void shutdown() { @Override public boolean isShutdown() { - return executor.isShutdown(); + return future.isCancelled(); } @Override public boolean isTerminated() { - return executor.isTerminated(); + return future.isDone(); } @Override @@ -153,7 +156,14 @@ public void shutdownNow() { @Override public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { - return executor.awaitTermination(duration, unit); + try { + future.get(duration, unit); + return true; + } catch (ExecutionException | CancellationException e) { + return true; + } catch (TimeoutException e) { + return false; + } } @Override diff --git a/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java b/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java index e01ed3c20..db3fb20bb 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java +++ b/gax/src/main/java/com/google/api/gax/rpc/WatchdogProvider.java @@ -49,5 +49,6 @@ public interface WatchdogProvider { Watchdog getWatchdog(); + /** Return true if the watchdog should be automatically unscheduled. */ boolean shouldAutoClose(); } From fb4a18034ac8b5eac0fb61e1b2748af7748f7dbb Mon Sep 17 00:00:00 2001 From: Blake Li Date: Fri, 2 Dec 2022 21:58:07 +0000 Subject: [PATCH 06/10] test: Add unit tests for Watchdog (#1919) --- .../com/google/api/gax/rpc/WatchdogTest.java | 81 +++++++++++++++++-- 1 file changed, 73 insertions(+), 8 deletions(-) diff --git a/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java b/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java index 0b161018f..e20218452 100644 --- a/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java +++ b/gax/src/test/java/com/google/api/gax/rpc/WatchdogTest.java @@ -44,6 +44,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -195,14 +196,7 @@ public void testMultiple() throws Exception { @SuppressWarnings("unchecked") public void testWatchdogBeingClosed() { ScheduledFuture future = Mockito.mock(ScheduledFuture.class); - ScheduledExecutorService mockExecutor = Mockito.mock(ScheduledExecutorService.class); - Mockito.when( - mockExecutor.scheduleAtFixedRate( - Mockito.any(Watchdog.class), - Mockito.anyLong(), - Mockito.anyLong(), - Mockito.any(TimeUnit.class))) - .thenReturn(future); + ScheduledExecutorService mockExecutor = getMockExecutorService(future); Watchdog underTest = Watchdog.create(clock, checkInterval, mockExecutor); assertThat(underTest).isInstanceOf(BackgroundResource.class); @@ -219,6 +213,77 @@ public void testWatchdogBeingClosed() { Mockito.verifyNoMoreInteractions(mockExecutor); } + @Test + public void awaitTermination_shouldReturnTrueIfFutureIsDone() throws Exception { + int duration = 1000; + TimeUnit timeUnit = TimeUnit.MILLISECONDS; + ScheduledFuture future = Mockito.mock(ScheduledFuture.class); + ScheduledExecutorService mockExecutor = getMockExecutorService(future); + Watchdog watchdog = Watchdog.create(clock, checkInterval, mockExecutor); + watchdog.shutdown(); + + boolean actual = watchdog.awaitTermination(duration, timeUnit); + + assertThat(actual).isTrue(); + } + + @Test + public void awaitTermination_shouldReturnFalseIfGettingFutureTimedOut() throws Exception { + int duration = 1000; + TimeUnit timeUnit = TimeUnit.MILLISECONDS; + ScheduledFuture future = Mockito.mock(ScheduledFuture.class); + Mockito.doThrow(new TimeoutException()).when(future).get(duration, timeUnit); + ScheduledExecutorService mockExecutor = getMockExecutorService(future); + Watchdog watchdog = Watchdog.create(clock, checkInterval, mockExecutor); + + boolean actual = watchdog.awaitTermination(duration, timeUnit); + + assertThat(actual).isFalse(); + } + + @Test + public void awaitTermination_shouldReturnTrueIfFutureIsAlreadyCancelled() throws Exception { + int duration = 1000; + TimeUnit timeUnit = TimeUnit.MILLISECONDS; + ScheduledFuture future = Mockito.mock(ScheduledFuture.class); + Mockito.doThrow(new CancellationException()).when(future).get(duration, timeUnit); + ScheduledExecutorService mockExecutor = getMockExecutorService(future); + Watchdog watchdog = Watchdog.create(clock, checkInterval, mockExecutor); + + boolean actual = watchdog.awaitTermination(duration, timeUnit); + + assertThat(actual).isTrue(); + } + + @Test + public void awaitTermination_shouldReturnFalseIfGettingFutureThrowsExecutionException() + throws Exception { + int duration = 1000; + TimeUnit timeUnit = TimeUnit.MILLISECONDS; + ScheduledFuture future = Mockito.mock(ScheduledFuture.class); + Mockito.doThrow(new ExecutionException(new RuntimeException())) + .when(future) + .get(duration, timeUnit); + ScheduledExecutorService mockExecutor = getMockExecutorService(future); + Watchdog watchdog = Watchdog.create(clock, checkInterval, mockExecutor); + + boolean actual = watchdog.awaitTermination(duration, timeUnit); + + assertThat(actual).isTrue(); + } + + private ScheduledExecutorService getMockExecutorService(ScheduledFuture future) { + ScheduledExecutorService mockExecutor = Mockito.mock(ScheduledExecutorService.class); + Mockito.when( + mockExecutor.scheduleAtFixedRate( + Mockito.any(Watchdog.class), + Mockito.anyLong(), + Mockito.anyLong(), + Mockito.any(TimeUnit.class))) + .thenReturn(future); + return mockExecutor; + } + static class AccumulatingObserver implements ResponseObserver { SettableApiFuture controller = SettableApiFuture.create(); Queue responses = Queues.newLinkedBlockingDeque(); From d4ba37da333e78a2e4918cec2794481f5cedefc6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 16:58:29 -0500 Subject: [PATCH 07/10] chore(main): release 2.20.1-SNAPSHOT (#1904) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-grpc/pom.xml | 4 ++-- gax-httpjson/build.gradle | 2 +- gax-httpjson/pom.xml | 4 ++-- gax/build.gradle | 2 +- gax/pom.xml | 4 ++-- pom.xml | 6 +++--- versions.txt | 8 ++++---- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 9576e341c..df65dcc43 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.0" // {x-version-update:gax:current} +project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index 637642887..8aa69e0a1 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.20.0 +version.gax=2.20.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.20.0 +version.gax_grpc=2.20.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.20.0 +version.gax_bom=2.20.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.105.0 +version.gax_httpjson=0.105.1-SNAPSHOT # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle index f67965be2..b0cb7cad6 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.20.0" // {x-version-update:gax-bom:current} +project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax-bom:current} def mavenJavaDir = "$buildDir/publications/mavenJava" def mavenJavaBomOutputFile = file(mavenJavaDir + '/pom-default.xml') diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index 2bbfc1868..5b80cd7ed 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.20.0 + 2.20.1-SNAPSHOT pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -42,34 +42,34 @@ com.google.api gax - 2.20.0 + 2.20.1-SNAPSHOT com.google.api gax - 2.20.0 + 2.20.1-SNAPSHOT testlib com.google.api gax-grpc - 2.20.0 + 2.20.1-SNAPSHOT com.google.api gax-grpc - 2.20.0 + 2.20.1-SNAPSHOT testlib com.google.api gax-httpjson - 0.105.0 + 0.105.1-SNAPSHOT com.google.api gax-httpjson - 0.105.0 + 0.105.1-SNAPSHOT testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index a51edcc13..b1232d32d 100644 --- a/gax-grpc/build.gradle +++ b/gax-grpc/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-grpc' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.0" // {x-version-update:gax-grpc:current} +project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml index dc5db8887..8aab328f3 100644 --- a/gax-grpc/pom.xml +++ b/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.20.0 + 2.20.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 7985c661f..06853d61e 100644 --- a/gax-httpjson/build.gradle +++ b/gax-httpjson/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-httpjson' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "0.105.0" // {x-version-update:gax-httpjson:current} +project.version = "0.105.1-SNAPSHOT" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml index 7bddcb7fb..505d57752 100644 --- a/gax-httpjson/pom.xml +++ b/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.105.0 + 0.105.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/gax/build.gradle b/gax/build.gradle index 1c7f9a379..0dd58c56b 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.0" // {x-version-update:gax:current} +project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/gax/pom.xml b/gax/pom.xml index 5d3e027cc..09c144058 100644 --- a/gax/pom.xml +++ b/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.20.0 + 2.20.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.0 + 2.20.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index a3dbee137..bb23089fb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api gax-parent pom - 2.20.0 + 2.20.1-SNAPSHOT GAX (Google Api eXtensions) for Java (Parent) https://github.com/googleapis/gax-java Google Api eXtensions for Java (Parent) @@ -123,12 +123,12 @@ com.google.api gax - 2.20.0 + 2.20.1-SNAPSHOT com.google.api gax - 2.20.0 + 2.20.1-SNAPSHOT test-jar testlib diff --git a/versions.txt b/versions.txt index 3c4f62e47..0824165f1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.20.0:2.20.0 -gax-bom:2.20.0:2.20.0 -gax-grpc:2.20.0:2.20.0 -gax-httpjson:0.105.0:0.105.0 +gax:2.20.0:2.20.1-SNAPSHOT +gax-bom:2.20.0:2.20.1-SNAPSHOT +gax-grpc:2.20.0:2.20.1-SNAPSHOT +gax-httpjson:0.105.0:0.105.1-SNAPSHOT From 772c2213dfa10120b6efccf411550e77df3f9de7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Dec 2022 22:59:04 +0100 Subject: [PATCH 08/10] fix(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.5.5 (#1911) --- gax-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index 5b80cd7ed..4c04babfd 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -11,7 +11,7 @@ com.google.cloud google-cloud-shared-config - 1.5.4 + 1.5.5 diff --git a/pom.xml b/pom.xml index bb23089fb..458daae14 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-shared-config - 1.5.4 + 1.5.5 From d27d8485d3da4de00253c1f5df435516d1af8d8e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Dec 2022 23:15:54 +0100 Subject: [PATCH 09/10] fix(deps): update dependency com.google.api.grpc:grpc-google-common-protos to v2.11.0 (#1906) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 458daae14..2b63c0dd4 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ com.google.api.grpc grpc-google-common-protos - 2.10.0 + 2.11.0 io.grpc From 582b650df0074cdbad986f12f3ff1f62ae09491a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 22:26:14 +0000 Subject: [PATCH 10/10] chore(main): release 2.20.1 (#1920) :robot: I have created a release *beep* *boop* --- ## [2.20.1](https://togithub.com/googleapis/gax-java/compare/v2.20.0...v2.20.1) (2022-12-02) ### Bug Fixes * **deps:** Update dependency com.google.api.grpc:grpc-google-common-protos to v2.11.0 ([#1906](https://togithub.com/googleapis/gax-java/issues/1906)) ([d27d848](https://togithub.com/googleapis/gax-java/commit/d27d8485d3da4de00253c1f5df435516d1af8d8e)) * **deps:** Update dependency com.google.api.grpc:proto-google-common-protos to v2.11.0 ([#1907](https://togithub.com/googleapis/gax-java/issues/1907)) ([7504e37](https://togithub.com/googleapis/gax-java/commit/7504e37163d39d10bd8388101e9ce614e2839aca)) * **deps:** Update dependency com.google.cloud:google-cloud-shared-config to v1.5.5 ([#1911](https://togithub.com/googleapis/gax-java/issues/1911)) ([772c221](https://togithub.com/googleapis/gax-java/commit/772c2213dfa10120b6efccf411550e77df3f9de7)) * **deps:** Update dependency com.google.protobuf:protobuf-bom to v3.21.10 ([#1912](https://togithub.com/googleapis/gax-java/issues/1912)) ([f508f24](https://togithub.com/googleapis/gax-java/commit/f508f245a59b2086c4b56d55f0cb25e9e7c29136)) * Watchdog controls lifecycle of the future, not executor ([#1890](https://togithub.com/googleapis/gax-java/issues/1890)) ([bd1714e](https://togithub.com/googleapis/gax-java/commit/bd1714e484eef8aa8f09632eee976c9da26da5f1)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- CHANGELOG.md | 11 +++++++++++ build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-grpc/pom.xml | 4 ++-- gax-httpjson/build.gradle | 2 +- gax-httpjson/pom.xml | 4 ++-- gax/build.gradle | 2 +- gax/pom.xml | 4 ++-- pom.xml | 6 +++--- versions.txt | 8 ++++---- 13 files changed, 40 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b9731451..dc948dcd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [2.20.1](https://github.com/googleapis/gax-java/compare/v2.20.0...v2.20.1) (2022-12-02) + + +### Bug Fixes + +* **deps:** Update dependency com.google.api.grpc:grpc-google-common-protos to v2.11.0 ([#1906](https://github.com/googleapis/gax-java/issues/1906)) ([d27d848](https://github.com/googleapis/gax-java/commit/d27d8485d3da4de00253c1f5df435516d1af8d8e)) +* **deps:** Update dependency com.google.api.grpc:proto-google-common-protos to v2.11.0 ([#1907](https://github.com/googleapis/gax-java/issues/1907)) ([7504e37](https://github.com/googleapis/gax-java/commit/7504e37163d39d10bd8388101e9ce614e2839aca)) +* **deps:** Update dependency com.google.cloud:google-cloud-shared-config to v1.5.5 ([#1911](https://github.com/googleapis/gax-java/issues/1911)) ([772c221](https://github.com/googleapis/gax-java/commit/772c2213dfa10120b6efccf411550e77df3f9de7)) +* **deps:** Update dependency com.google.protobuf:protobuf-bom to v3.21.10 ([#1912](https://github.com/googleapis/gax-java/issues/1912)) ([f508f24](https://github.com/googleapis/gax-java/commit/f508f245a59b2086c4b56d55f0cb25e9e7c29136)) +* Watchdog controls lifecycle of the future, not executor ([#1890](https://github.com/googleapis/gax-java/issues/1890)) ([bd1714e](https://github.com/googleapis/gax-java/commit/bd1714e484eef8aa8f09632eee976c9da26da5f1)) + ## [2.20.0](https://github.com/googleapis/gax-java/compare/v2.19.5...v2.20.0) (2022-11-30) diff --git a/build.gradle b/build.gradle index df65dcc43..9fd95105b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.20.1" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index 8aa69e0a1..a9c319bda 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.20.1-SNAPSHOT +version.gax=2.20.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.20.1-SNAPSHOT +version.gax_grpc=2.20.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.20.1-SNAPSHOT +version.gax_bom=2.20.1 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.105.1-SNAPSHOT +version.gax_httpjson=0.105.1 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle index b0cb7cad6..6dfd30ff5 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax-bom:current} +project.version = "2.20.1" // {x-version-update:gax-bom:current} def mavenJavaDir = "$buildDir/publications/mavenJava" def mavenJavaBomOutputFile = file(mavenJavaDir + '/pom-default.xml') diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index 4c04babfd..1681cf4f9 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.20.1-SNAPSHOT + 2.20.1 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -42,34 +42,34 @@ com.google.api gax - 2.20.1-SNAPSHOT + 2.20.1 com.google.api gax - 2.20.1-SNAPSHOT + 2.20.1 testlib com.google.api gax-grpc - 2.20.1-SNAPSHOT + 2.20.1 com.google.api gax-grpc - 2.20.1-SNAPSHOT + 2.20.1 testlib com.google.api gax-httpjson - 0.105.1-SNAPSHOT + 0.105.1 com.google.api gax-httpjson - 0.105.1-SNAPSHOT + 0.105.1 testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index b1232d32d..5c5c86807 100644 --- a/gax-grpc/build.gradle +++ b/gax-grpc/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-grpc' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax-grpc:current} +project.version = "2.20.1" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml index 8aab328f3..ad7addccd 100644 --- a/gax-grpc/pom.xml +++ b/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.20.1-SNAPSHOT + 2.20.1 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 06853d61e..d16bf0fed 100644 --- a/gax-httpjson/build.gradle +++ b/gax-httpjson/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = 'gax-httpjson' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "0.105.1-SNAPSHOT" // {x-version-update:gax-httpjson:current} +project.version = "0.105.1" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml index 505d57752..32fcdc5f1 100644 --- a/gax-httpjson/pom.xml +++ b/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.105.1-SNAPSHOT + 0.105.1 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/gax/build.gradle b/gax/build.gradle index 0dd58c56b..f92a8cf9f 100644 --- a/gax/build.gradle +++ b/gax/build.gradle @@ -1,7 +1,7 @@ archivesBaseName = "gax" // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.20.1-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.20.1" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/gax/pom.xml b/gax/pom.xml index 09c144058..09f587cb3 100644 --- a/gax/pom.xml +++ b/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.20.1-SNAPSHOT + 2.20.1 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.20.1-SNAPSHOT + 2.20.1 diff --git a/pom.xml b/pom.xml index 2b63c0dd4..1d9d752b1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.api gax-parent pom - 2.20.1-SNAPSHOT + 2.20.1 GAX (Google Api eXtensions) for Java (Parent) https://github.com/googleapis/gax-java Google Api eXtensions for Java (Parent) @@ -123,12 +123,12 @@ com.google.api gax - 2.20.1-SNAPSHOT + 2.20.1 com.google.api gax - 2.20.1-SNAPSHOT + 2.20.1 test-jar testlib diff --git a/versions.txt b/versions.txt index 0824165f1..35a770fde 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.20.0:2.20.1-SNAPSHOT -gax-bom:2.20.0:2.20.1-SNAPSHOT -gax-grpc:2.20.0:2.20.1-SNAPSHOT -gax-httpjson:0.105.0:0.105.1-SNAPSHOT +gax:2.20.1:2.20.1 +gax-bom:2.20.1:2.20.1 +gax-grpc:2.20.1:2.20.1 +gax-httpjson:0.105.1:0.105.1