Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit a72f27e

Browse files
elharoelharo
authored
Merge branch 'master' into renovate/com.google.api.grpc-grpc-google-cloud-bigtable-v2-1.x
2 parents 139552f + 32240eb commit a72f27e

File tree

12 files changed

+53
-31
lines changed

12 files changed

+53
-31
lines changed

‎CHANGELOG.md‎

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

3+
## [1.63.0](https://www.github.com/googleapis/gax-java/compare/v1.62.0...v1.63.0) (2021-04-05)
4+
5+
6+
### Features
7+
8+
* add setLogicalTimeout helper to RetrySettings ([#1334](https://www.github.com/googleapis/gax-java/issues/1334)) ([97d3214](https://www.github.com/googleapis/gax-java/commit/97d32144e9de38a9e351dc34270aa41aef351151))
9+
* dynamic flow control for batcher part 2 ([#1310](https://www.github.com/googleapis/gax-java/issues/1310)) ([20f6ecf](https://www.github.com/googleapis/gax-java/commit/20f6ecf4807bb4dffd0fa80717302c1f46b1d789))
10+
* dynamic flow control p3: add FlowControllerEventStats ([#1332](https://www.github.com/googleapis/gax-java/issues/1332)) ([5329ea4](https://www.github.com/googleapis/gax-java/commit/5329ea43c024ca14cea1012c5ab46e694e199492))
11+
* support retry settings and retryable codes in call context ([#1238](https://www.github.com/googleapis/gax-java/issues/1238)) ([7f7aa25](https://www.github.com/googleapis/gax-java/commit/7f7aa252ce96413cb09e01cc2e76672b167b1baf))
12+
* wrap non-retryable RPCs in retry machinery ([#1328](https://www.github.com/googleapis/gax-java/issues/1328)) ([51c40ab](https://www.github.com/googleapis/gax-java/commit/51c40abd408ab0637f3b65cf5697a4ee85a544a4))
13+
14+
15+
### Bug Fixes
16+
17+
* add BetaApi tag to setLogicalTimeout ([#1335](https://www.github.com/googleapis/gax-java/issues/1335)) ([fc7169d](https://www.github.com/googleapis/gax-java/commit/fc7169d431baf2db90992241a0ef3d40c72567a5))
18+
* retain user RPC timeout if set via withTimeout ([#1324](https://www.github.com/googleapis/gax-java/issues/1324)) ([3fe1db9](https://www.github.com/googleapis/gax-java/commit/3fe1db913b134e4fddee4c769ee4497847d8e01f))
19+
20+
21+
### Documentation
22+
23+
* cloud rad java doc generation ([#1336](https://www.github.com/googleapis/gax-java/issues/1336)) ([751ccf3](https://www.github.com/googleapis/gax-java/commit/751ccf3cb351cd5a037104242cdb763a104d6bc3))
24+
325
## [1.62.0](https://www.github.com/googleapis/gax-java/compare/v1.61.0...v1.62.0) (2021-02-25)
426

527

‎README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ If you are using Maven, add this to your pom.xml file
3131
<dependency>
3232
<groupId>com.google.api</groupId>
3333
<artifactId>gax</artifactId>
34-
<version>1.62.0</version>
34+
<version>1.63.0</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.api</groupId>
3838
<artifactId>gax-grpc</artifactId>
39-
<version>1.62.0</version>
39+
<version>1.63.0</version>
4040
</dependency>
4141
```
4242

4343
If you are using Gradle, add this to your dependencies
4444

4545
```Groovy
46-
compile 'com.google.api:gax:1.62.0',
47-
'com.google.api:gax-grpc:1.62.0'
46+
compile 'com.google.api:gax:1.63.0',
47+
'com.google.api:gax-grpc:1.63.0'
4848
```
4949

5050
If you are using SBT, add this to your dependencies
5151

5252
```Scala
53-
libraryDependencies += "com.google.api" % "gax" % "1.62.0"
54-
libraryDependencies += "com.google.api" % "gax-grpc" % "1.62.0"
53+
libraryDependencies += "com.google.api" % "gax" % "1.63.0"
54+
libraryDependencies += "com.google.api" % "gax-grpc" % "1.63.0"
5555
```
5656
[//]: # ({x-version-update-end})
5757

‎benchmark/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project.version = "0.64.1-SNAPSHOT" // {x-version-update:benchmark:current}
1+
project.version = "0.65.0" // {x-version-update:benchmark:current}
22

33
buildscript {
44
repositories {

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ apply plugin: 'com.github.sherter.google-java-format'
2424
apply plugin: 'io.codearte.nexus-staging'
2525

2626
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
27-
project.version = "1.62.1-SNAPSHOT" // {x-version-update:gax:current}
27+
project.version = "1.63.0" // {x-version-update:gax:current}
2828

2929
ext {
3030
// Project names not used for release

‎dependencies.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
# Versions of oneself
1010
# {x-version-update-start:gax:current}
11-
version.gax=1.62.1-SNAPSHOT
11+
version.gax=1.63.0
1212
# {x-version-update-end}
1313
# {x-version-update-start:gax:current}
14-
version.gax_grpc=1.62.1-SNAPSHOT
14+
version.gax_grpc=1.63.0
1515
# {x-version-update-end}
1616
# {x-version-update-start:gax:current}
17-
version.gax_bom=1.62.1-SNAPSHOT
17+
version.gax_bom=1.63.0
1818
# {x-version-update-end}
1919
# {x-version-update-start:gax-httpjson:current}
20-
version.gax_httpjson=0.79.1-SNAPSHOT
20+
version.gax_httpjson=0.80.0
2121
# {x-version-update-end}
2222

2323
# Versions for dependencies which actual artifacts differ between Bazel and Gradle.

‎gax-bom/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212

1313
archivesBaseName = "gax-bom"
1414

15-
project.version = "1.62.1-SNAPSHOT" // {x-version-update:gax-bom:current}
15+
project.version = "1.63.0" // {x-version-update:gax-bom:current}
1616

1717
ext {
1818
mavenJavaDir = "$project.buildDir/publications/mavenJava"

‎gax-bom/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.api</groupId>
55
<artifactId>gax-bom</artifactId>
6-
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:gax-bom:current} -->
6+
<version>1.63.0</version><!-- {x-version-update:gax-bom:current} -->
77
<packaging>pom</packaging>
88
<name>GAX (Google Api eXtensions) for Java</name>
99
<description>Google Api eXtensions for Java</description>
@@ -33,34 +33,34 @@
3333
<dependency>
3434
<groupId>com.google.api</groupId>
3535
<artifactId>gax</artifactId>
36-
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
36+
<version>1.63.0</version><!-- {x-version-update:gax:current} -->
3737
</dependency>
3838
<dependency>
3939
<groupId>com.google.api</groupId>
4040
<artifactId>gax</artifactId>
41-
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
41+
<version>1.63.0</version><!-- {x-version-update:gax:current} -->
4242
<classifier>testlib</classifier>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.api</groupId>
4646
<artifactId>gax-grpc</artifactId>
47-
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
47+
<version>1.63.0</version><!-- {x-version-update:gax-grpc:current} -->
4848
</dependency>
4949
<dependency>
5050
<groupId>com.google.api</groupId>
5151
<artifactId>gax-grpc</artifactId>
52-
<version>1.62.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
52+
<version>1.63.0</version><!-- {x-version-update:gax-grpc:current} -->
5353
<classifier>testlib</classifier>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.google.api</groupId>
5757
<artifactId>gax-httpjson</artifactId>
58-
<version>0.79.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
58+
<version>0.80.0</version><!-- {x-version-update:gax-httpjson:current} -->
5959
</dependency>
6060
<dependency>
6161
<groupId>com.google.api</groupId>
6262
<artifactId>gax-httpjson</artifactId>
63-
<version>0.79.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
63+
<version>0.80.0</version><!-- {x-version-update:gax-httpjson:current} -->
6464
<classifier>testlib</classifier>
6565
</dependency>
6666
</dependencies>

‎gax-grpc/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax-grpc"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "1.62.1-SNAPSHOT" // {x-version-update:gax-grpc:current}
4+
project.version = "1.63.0" // {x-version-update:gax-grpc:current}
55

66
dependencies {
77
compile project(':gax'),

‎gax-httpjson/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax-httpjson"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "0.79.1-SNAPSHOT" // {x-version-update:gax-httpjson:current}
4+
project.version = "0.80.0" // {x-version-update:gax-httpjson:current}
55

66
dependencies {
77
compile project(':gax'),

‎gax/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "1.62.1-SNAPSHOT" // {x-version-update:gax:current}
4+
project.version = "1.63.0" // {x-version-update:gax:current}
55

66
dependencies {
77
compile libraries['maven.com_google_guava_guava'],

0 commit comments

Comments
 (0)