From ee75c2701e403f9d9d9d77ca06f0d43cf5a10823 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 2 Dec 2021 14:54:31 -0800 Subject: [PATCH 1/8] chore: update doclet version (#1572) Same as https://github.com/googleapis/java-shared-config/pull/368 Co-authored-by: Neenu Shaji Co-authored-by: Chanseok Oh --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 703a82a6e..96c1d1f67 100644 --- a/build.gradle +++ b/build.gradle @@ -326,7 +326,7 @@ task javadocCombinedV3(type: Javadoc) { options.addStringOption('encoding', 'UTF-8') options.addStringOption('doclet', 'com.microsoft.doclet.DocFxDoclet') options.addStringOption('projectname', 'gax') - options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + '/java-docfx-doclet-1.3.0.jar')] + options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + '/java-docfx-doclet-1.4.0.jar')] // Newer Gradle 6 passes -notimestamp by default, which the doclet above doesn't understand: // https://github.com/gradle/gradle/issues/11898 options.noTimestamp false From d7cb38e643847cfb5bd017b0077ecd2478abd094 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:34:26 +0000 Subject: [PATCH 2/8] chore: release 2.7.2-SNAPSHOT (#1575) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-httpjson/build.gradle | 2 +- gax/build.gradle | 2 +- versions.txt | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 96c1d1f67..c3ceb19f6 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.7.1" // {x-version-update:gax:current} +project.version = "2.7.2-SNAPSHOT" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index 305d003a1..3a23ecb85 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.7.1 +version.gax=2.7.2-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.7.1 +version.gax_grpc=2.7.2-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.7.1 +version.gax_bom=2.7.2-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.92.1 +version.gax_httpjson=0.92.2-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 85a728d61..944888d62 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.7.1" // {x-version-update:gax-bom:current} +project.version = "2.7.2-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 a744ed93b..8b4b258e9 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.7.1 + 2.7.2-SNAPSHOT pom GAX (Google Api eXtensions) for Java Google Api eXtensions for Java @@ -33,34 +33,34 @@ com.google.api gax - 2.7.1 + 2.7.2-SNAPSHOT com.google.api gax - 2.7.1 + 2.7.2-SNAPSHOT testlib com.google.api gax-grpc - 2.7.1 + 2.7.2-SNAPSHOT com.google.api gax-grpc - 2.7.1 + 2.7.2-SNAPSHOT testlib com.google.api gax-httpjson - 0.92.1 + 0.92.2-SNAPSHOT com.google.api gax-httpjson - 0.92.1 + 0.92.2-SNAPSHOT testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index 11b2de195..5441d61fe 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.7.1" // {x-version-update:gax-grpc:current} +project.version = "2.7.2-SNAPSHOT" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 0212433ab..c77ffcd6f 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.92.1" // {x-version-update:gax-httpjson:current} +project.version = "0.92.2-SNAPSHOT" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax/build.gradle b/gax/build.gradle index 3e3a1f41e..986e7d59d 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.7.1" // {x-version-update:gax:current} +project.version = "2.7.2-SNAPSHOT" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/versions.txt b/versions.txt index 3bec864a5..874fd1eb8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.7.1:2.7.1 -gax-bom:2.7.1:2.7.1 -gax-grpc:2.7.1:2.7.1 -gax-httpjson:0.92.1:0.92.1 +gax:2.7.1:2.7.2-SNAPSHOT +gax-bom:2.7.1:2.7.2-SNAPSHOT +gax-grpc:2.7.1:2.7.2-SNAPSHOT +gax-httpjson:0.92.1:0.92.2-SNAPSHOT From 65aed624f42acf2c3f067399025a1a81b8adbd80 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Tue, 7 Dec 2021 11:17:19 -0500 Subject: [PATCH 3/8] chore: refactor code (#1576) --- .../com/google/api/gax/grpc/ChannelPool.java | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java index d6b85275b..fe74fae1b 100644 --- a/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java +++ b/gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelPool.java @@ -45,7 +45,7 @@ import javax.annotation.Nullable; /** - * A {@link ManagedChannel} that will send requests round robin via a set of channels. + * A {@link ManagedChannel} that will send requests round-robin via a set of channels. * *

Package-private for internal use. */ @@ -57,14 +57,14 @@ class ChannelPool extends ManagedChannel { private final AtomicInteger indexTicker = new AtomicInteger(); private final String authority; // if set, ChannelPool will manage the life cycle of channelRefreshExecutorService - @Nullable private ScheduledExecutorService channelRefreshExecutorService; + @Nullable private final ScheduledExecutorService channelRefreshExecutorService; /** * Factory method to create a non-refreshing channel pool * * @param poolSize number of channels in the pool * @param channelFactory method to create the channels - * @return ChannelPool of non refreshing channels + * @return ChannelPool of non-refreshing channels */ static ChannelPool create(int poolSize, final ChannelFactory channelFactory) throws IOException { List channels = new ArrayList<>(); @@ -163,10 +163,7 @@ public boolean isShutdown() { return false; } } - if (channelRefreshExecutorService != null && !channelRefreshExecutorService.isShutdown()) { - return false; - } - return true; + return channelRefreshExecutorService == null || channelRefreshExecutorService.isShutdown(); } /** {@inheritDoc} */ @@ -177,10 +174,7 @@ public boolean isTerminated() { return false; } } - if (channelRefreshExecutorService != null && !channelRefreshExecutorService.isTerminated()) { - return false; - } - return true; + return channelRefreshExecutorService == null || channelRefreshExecutorService.isTerminated(); } /** {@inheritDoc} */ @@ -214,7 +208,7 @@ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedE } /** - * Performs a simple round robin on the list of {@link ManagedChannel}s in the {@code channels} + * Performs a simple round-robin on the list of {@link ManagedChannel}s in the {@code channels} * list. * * @return A {@link ManagedChannel} that can be used for a single RPC call. @@ -232,12 +226,7 @@ private ManagedChannel getNextChannel() { * However, the implementation should attempt to spread load evenly. */ ManagedChannel getChannel(int affinity) { - int index = affinity % channels.size(); - index = Math.abs(index); - // If index is the most negative int, abs(index) is still negative. - if (index < 0) { - index = 0; - } + int index = Math.abs(affinity % channels.size()); return channels.get(index); } } From 762bdc7a518959443221216001e775a82661c29a Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Thu, 9 Dec 2021 16:35:06 -0800 Subject: [PATCH 4/8] chore: remove usages of internal Mockito APIs (#1578) --- .../api/gax/rpc/ApiResultRetryAlgorithmTest.java | 5 +++-- .../java/com/google/api/gax/rpc/RetryingTest.java | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java b/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java index e1ef46dbd..4e04c1a0b 100644 --- a/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java +++ b/gax/src/test/java/com/google/api/gax/rpc/ApiResultRetryAlgorithmTest.java @@ -36,11 +36,11 @@ import com.google.api.gax.rpc.StatusCode.Code; import com.google.api.gax.rpc.testing.FakeStatusCode; +import com.google.common.collect.Sets; import java.util.Collections; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.internal.util.collections.Sets; @RunWith(JUnit4.class) public class ApiResultRetryAlgorithmTest { @@ -78,7 +78,8 @@ public void testShouldRetryWithContextWithoutRetryableCodes() { public void testShouldRetryWithContextWithRetryableCodes() { ApiCallContext context = mock(ApiCallContext.class); when(context.getRetryableCodes()) - .thenReturn(Sets.newSet(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)); + .thenReturn( + Sets.newHashSet(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)); StatusCode unavailable = mock(StatusCode.class); when(unavailable.getCode()).thenReturn(Code.UNAVAILABLE); diff --git a/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java b/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java index 30198bcb7..b58bd2c2c 100644 --- a/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java +++ b/gax/src/test/java/com/google/api/gax/rpc/RetryingTest.java @@ -44,6 +44,7 @@ import com.google.api.gax.rpc.testing.FakeStatusCode; import com.google.api.gax.rpc.testing.FakeTransportChannel; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.google.common.truth.Truth; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.UncheckedExecutionException; @@ -54,7 +55,6 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.Mockito; -import org.mockito.internal.util.collections.Sets; import org.threeten.bp.Duration; @RunWith(JUnit4.class) @@ -138,7 +138,7 @@ public void retryUsingContext() { FAILING_RETRY_SETTINGS, FakeCallContext.createDefault() .withRetrySettings(FAST_RETRY_SETTINGS) - .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL))); + .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL))); } @Test(expected = ApiException.class) @@ -179,7 +179,7 @@ public void retryUsingContextTotalTimeoutExceeded() { FAILING_RETRY_SETTINGS, FakeCallContext.createDefault() .withRetrySettings(retrySettings) - .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL))); + .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL))); fail("missing expected exception"); } catch (ApiException e) { assertEquals(Code.INTERNAL, e.getStatusCode().getCode()); @@ -212,7 +212,7 @@ public void retryUsingContextMaxAttemptsExceeded() { FAILING_RETRY_SETTINGS, FakeCallContext.createDefault() .withRetrySettings(FAST_RETRY_SETTINGS.toBuilder().setMaxAttempts(2).build()) - .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL))); + .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL))); fail("missing expected exception"); } catch (ApiException e) { assertEquals(Code.INTERNAL, e.getStatusCode().getCode()); @@ -244,7 +244,7 @@ public void retryUsingContextWithinMaxAttempts() { FAILING_RETRY_SETTINGS, FakeCallContext.createDefault() .withRetrySettings(FAST_RETRY_SETTINGS.toBuilder().setMaxAttempts(3).build()) - .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL))); + .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL))); } @Test @@ -278,7 +278,7 @@ public void retryUsingContextWithOnlyMaxAttempts() { FAILING_RETRY_SETTINGS, FakeCallContext.createDefault() .withRetrySettings(retrySettings) - .withRetryableCodes(Sets.newSet(StatusCode.Code.INTERNAL))); + .withRetryableCodes(Sets.newHashSet(StatusCode.Code.INTERNAL))); Mockito.verify(callInt, Mockito.times(3)) .futureCall(Mockito.any(), Mockito.any()); } @@ -363,7 +363,7 @@ public void retryUsingContextNoRecover() { FakeCallContext.createDefault() .withRetrySettings(FAST_RETRY_SETTINGS) .withRetryableCodes( - Sets.newSet(Code.UNAVAILABLE, Code.DEADLINE_EXCEEDED, Code.UNKNOWN))); + Sets.newHashSet(Code.UNAVAILABLE, Code.DEADLINE_EXCEEDED, Code.UNKNOWN))); Assert.fail("Callable should have thrown an exception"); } catch (ApiException expected) { Truth.assertThat(expected).isSameInstanceAs(throwable); From 0a10f5fe77ab26b3ac7d4c590360945ead72eca1 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 10 Dec 2021 11:52:18 -0500 Subject: [PATCH 5/8] deps: upgrade common-protos to 2.7.0 (#1579) --- dependencies.properties | 4 ++-- .../java/com/google/api/gax/rpc/RequestUrlParamsEncoder.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 3a23ecb85..15ec47871 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -32,8 +32,8 @@ version.io_grpc=1.42.1 # It should be constructed the following way: # 1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion. # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character -maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.4.1 -maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.4.1 +maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.7.0 +maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.7.0 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.2.1 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.2.1 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0 diff --git a/gax/src/main/java/com/google/api/gax/rpc/RequestUrlParamsEncoder.java b/gax/src/main/java/com/google/api/gax/rpc/RequestUrlParamsEncoder.java index bd84bd794..6bb1da250 100644 --- a/gax/src/main/java/com/google/api/gax/rpc/RequestUrlParamsEncoder.java +++ b/gax/src/main/java/com/google/api/gax/rpc/RequestUrlParamsEncoder.java @@ -109,7 +109,7 @@ public String encode(RequestT request) { // Not sure if we need this at all. private boolean isValid(String name, String value) { try { - // hoping that encode/decode do not loose information in the middle + // hoping that encode/decode do not lose information in the middle // (at least for practical use cases) return !validateExtractedParameters || name.equals(URLEncoder.encode(URLDecoder.decode(name, STR_ENCODING), STR_ENCODING)) From 7915f850313ddfdf35332d976d2567f31c2aa8a7 Mon Sep 17 00:00:00 2001 From: Mohan Li <67390330+mohanli-ml@users.noreply.github.com> Date: Wed, 5 Jan 2022 09:46:40 -0800 Subject: [PATCH 6/8] feat: update DirectPath xds scheme (#1585) --- .../google/api/gax/grpc/InstantiatingGrpcChannelProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java index d441a0c9a..1aeb6b179 100644 --- a/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java +++ b/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java @@ -339,7 +339,8 @@ && isOnComputeEngine()) { isDirectPathXdsEnabled = Boolean.parseBoolean(envProvider.getenv(DIRECT_PATH_ENV_ENABLE_XDS)); if (isDirectPathXdsEnabled) { // google-c2p resolver target must not have a port number - builder = ComputeEngineChannelBuilder.forTarget("google-c2p:///" + serviceAddress); + builder = + ComputeEngineChannelBuilder.forTarget("google-c2p-experimental:///" + serviceAddress); } else { builder = ComputeEngineChannelBuilder.forAddress(serviceAddress, port); builder.defaultServiceConfig(directPathServiceConfig); From eb0e9d106a64af5f583d75d7291cdc17652fd5e7 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 5 Jan 2022 21:14:51 -0500 Subject: [PATCH 7/8] deps: update dependency com.google.api.grpc:proto-google-common-protos to v2.7.1 (#1587) deps: update dependency com.google.http-client:google-http-client-bom to v1.41.0 deps: update dependency com.google.protobuf:protobuf-bom to v3.19.2 --- dependencies.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 15ec47871..8d89ce27e 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,7 +23,7 @@ version.gax_httpjson=0.92.2-SNAPSHOT # 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.19.1 +version.com_google_protobuf=3.19.2 version.google_java_format=1.1 version.io_grpc=1.42.1 @@ -32,8 +32,8 @@ version.io_grpc=1.42.1 # It should be constructed the following way: # 1) Take full artifact id (including the group and classifier (if any) portions) and remove version portion. # 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character -maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.7.0 -maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.7.0 +maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.7.1 +maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.7.1 maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.2.1 maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.2.1 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.28.0 @@ -66,8 +66,8 @@ maven.com_google_api_api_common=com.google.api:api-common:2.0.5 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.5.0 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.0.9 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.0.9 -maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.40.1 -maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.40.1 +maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.41.0 +maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.41.0 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 From 8b0ae718652540afafc9d4609168f2920fbb4667 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 21:55:35 -0500 Subject: [PATCH 8/8] chore: release 2.8.0 (#1580) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 15 +++++++++++++++ README.md | 12 ++++++------ build.gradle | 2 +- dependencies.properties | 8 ++++---- gax-bom/build.gradle | 2 +- gax-bom/pom.xml | 14 +++++++------- gax-grpc/build.gradle | 2 +- gax-httpjson/build.gradle | 2 +- gax/build.gradle | 2 +- versions.txt | 8 ++++---- 10 files changed, 41 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 313d9ec99..5eafc06c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.8.0](https://www.github.com/googleapis/gax-java/compare/v2.7.1...v2.8.0) (2022-01-06) + + +### Features + +* update DirectPath xds scheme ([#1585](https://www.github.com/googleapis/gax-java/issues/1585)) ([7915f85](https://www.github.com/googleapis/gax-java/commit/7915f850313ddfdf35332d976d2567f31c2aa8a7)) + + +### Dependencies + +* update dependency com.google.api.grpc:proto-google-common-protos to v2.7.1 ([#1587](https://www.github.com/googleapis/gax-java/issues/1587)) ([eb0e9d1](https://www.github.com/googleapis/gax-java/commit/eb0e9d106a64af5f583d75d7291cdc17652fd5e7)) +* update dependency com.google.http-client:google-http-client-bom to v1.41.0 ([eb0e9d1](https://www.github.com/googleapis/gax-java/commit/eb0e9d106a64af5f583d75d7291cdc17652fd5e7)) +* update dependency com.google.protobuf:protobuf-bom to v3.19.2 ([eb0e9d1](https://www.github.com/googleapis/gax-java/commit/eb0e9d106a64af5f583d75d7291cdc17652fd5e7)) +* upgrade common-protos to 2.7.0 ([#1579](https://www.github.com/googleapis/gax-java/issues/1579)) ([0a10f5f](https://www.github.com/googleapis/gax-java/commit/0a10f5fe77ab26b3ac7d4c590360945ead72eca1)) + ### [2.7.1](https://www.github.com/googleapis/gax-java/compare/v2.7.0...v2.7.1) (2021-12-02) diff --git a/README.md b/README.md index d56f177a4..b165e405e 100644 --- a/README.md +++ b/README.md @@ -29,27 +29,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.7.1 + 2.8.0 com.google.api gax-grpc - 2.7.1 + 2.8.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.7.1', - 'com.google.api:gax-grpc:2.7.1' +compile 'com.google.api:gax:2.8.0', + 'com.google.api:gax-grpc:2.8.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.7.1" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.7.1" +libraryDependencies += "com.google.api" % "gax" % "2.8.0" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.8.0" ``` [//]: # ({x-version-update-end}) diff --git a/build.gradle b/build.gradle index c3ceb19f6..33be12418 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { } // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "2.7.2-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.8.0" // {x-version-update:gax:current} allprojects { group = 'com.google.api' diff --git a/dependencies.properties b/dependencies.properties index 8d89ce27e..d792afc9c 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.7.2-SNAPSHOT +version.gax=2.8.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.7.2-SNAPSHOT +version.gax_grpc=2.8.0 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.7.2-SNAPSHOT +version.gax_bom=2.8.0 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.92.2-SNAPSHOT +version.gax_httpjson=0.93.0 # {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 944888d62..3d1e6fe5c 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -5,7 +5,7 @@ plugins { archivesBaseName = 'gax-bom' -project.version = "2.7.2-SNAPSHOT" // {x-version-update:gax-bom:current} +project.version = "2.8.0" // {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 8b4b258e9..60ae6d101 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.7.2-SNAPSHOT + 2.8.0 pom GAX (Google Api eXtensions) for Java Google Api eXtensions for Java @@ -33,34 +33,34 @@ com.google.api gax - 2.7.2-SNAPSHOT + 2.8.0 com.google.api gax - 2.7.2-SNAPSHOT + 2.8.0 testlib com.google.api gax-grpc - 2.7.2-SNAPSHOT + 2.8.0 com.google.api gax-grpc - 2.7.2-SNAPSHOT + 2.8.0 testlib com.google.api gax-httpjson - 0.92.2-SNAPSHOT + 0.93.0 com.google.api gax-httpjson - 0.92.2-SNAPSHOT + 0.93.0 testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index 5441d61fe..0238f1601 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.7.2-SNAPSHOT" // {x-version-update:gax-grpc:current} +project.version = "2.8.0" // {x-version-update:gax-grpc:current} dependencies { api(project(':gax'), diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index c77ffcd6f..8eb32344b 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.92.2-SNAPSHOT" // {x-version-update:gax-httpjson:current} +project.version = "0.93.0" // {x-version-update:gax-httpjson:current} dependencies { api(project(':gax'), diff --git a/gax/build.gradle b/gax/build.gradle index 986e7d59d..3da8697cf 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.7.2-SNAPSHOT" // {x-version-update:gax:current} +project.version = "2.8.0" // {x-version-update:gax:current} dependencies { api(libraries['maven.com_google_api_api_common'], diff --git a/versions.txt b/versions.txt index 874fd1eb8..88aa601ae 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -gax:2.7.1:2.7.2-SNAPSHOT -gax-bom:2.7.1:2.7.2-SNAPSHOT -gax-grpc:2.7.1:2.7.2-SNAPSHOT -gax-httpjson:0.92.1:0.92.2-SNAPSHOT +gax:2.8.0:2.8.0 +gax-bom:2.8.0:2.8.0 +gax-grpc:2.8.0:2.8.0 +gax-httpjson:0.93.0:0.93.0