diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73406f7a4..47a38c3e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## [2.18.6](https://github.com/googleapis/gax-java/compare/v2.18.5...v2.18.6) (2022-07-29)
+
+
+### Bug Fixes
+
+* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.2 ([#1746](https://github.com/googleapis/gax-java/issues/1746)) ([8163f8a](https://github.com/googleapis/gax-java/commit/8163f8aa822881d8cd6f1f72aca66b50fbd2e66a))
+* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.3 ([#1748](https://github.com/googleapis/gax-java/issues/1748)) ([f2b7cb2](https://github.com/googleapis/gax-java/commit/f2b7cb2b6b783095547b798da054b6879d3764f1))
+* **deps:** update dependency com.google.protobuf:protobuf-bom to v3.21.4 ([#1747](https://github.com/googleapis/gax-java/issues/1747)) ([0b2b1ef](https://github.com/googleapis/gax-java/commit/0b2b1efcf38ff9f253e426af8c21722d646c8627))
+* Exclude error_prone_annotations from guava. ([#1750](https://github.com/googleapis/gax-java/issues/1750)) ([e1c91a4](https://github.com/googleapis/gax-java/commit/e1c91a40bcf413af5210da1d43e409d44dcf13bd))
+
## [2.18.5](https://github.com/googleapis/gax-java/compare/v2.18.4...v2.18.5) (2022-07-25)
diff --git a/build.gradle b/build.gradle
index f964e98ea..8f435be2d 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.18.5" // {x-version-update:gax:current}
+project.version = "2.18.6" // {x-version-update:gax:current}
allprojects {
group = 'com.google.api'
diff --git a/dependencies.properties b/dependencies.properties
index b5699ec14..dae839c69 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -8,24 +8,24 @@
# Versions of oneself
# {x-version-update-start:gax:current}
-version.gax=2.18.5
+version.gax=2.18.6
# {x-version-update-end}
# {x-version-update-start:gax:current}
-version.gax_grpc=2.18.5
+version.gax_grpc=2.18.6
# {x-version-update-end}
# {x-version-update-start:gax:current}
-version.gax_bom=2.18.5
+version.gax_bom=2.18.6
# {x-version-update-end}
# {x-version-update-start:gax-httpjson:current}
-version.gax_httpjson=0.103.5
+version.gax_httpjson=0.103.6
# {x-version-update-end}
# 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.1
-version.google_java_format=1.1
-version.io_grpc=1.47.0
+version.com_google_protobuf=3.21.4
+version.google_java_format=1.15.0
+version.io_grpc=1.48.0
# Maven artifacts.
# Note, the actual name of each property matters (bazel build scripts depend on it).
diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle
index 41c573c7e..59541c154 100644
--- a/gax-bom/build.gradle
+++ b/gax-bom/build.gradle
@@ -5,7 +5,7 @@ plugins {
archivesBaseName = 'gax-bom'
-project.version = "2.18.5" // {x-version-update:gax-bom:current}
+project.version = "2.18.6" // {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 3f1287b6a..e5343e957 100644
--- a/gax-bom/pom.xml
+++ b/gax-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.api
gax-bom
- 2.18.5
+ 2.18.6
pom
GAX (Google Api eXtensions) for Java (BOM)
Google Api eXtensions for Java (BOM)
@@ -33,34 +33,34 @@
com.google.api
gax
- 2.18.5
+ 2.18.6
com.google.api
gax
- 2.18.5
+ 2.18.6
testlib
com.google.api
gax-grpc
- 2.18.5
+ 2.18.6
com.google.api
gax-grpc
- 2.18.5
+ 2.18.6
testlib
com.google.api
gax-httpjson
- 0.103.5
+ 0.103.6
com.google.api
gax-httpjson
- 0.103.5
+ 0.103.6
testlib
diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle
index a4c2ce7b1..09081468e 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.18.5" // {x-version-update:gax-grpc:current}
+project.version = "2.18.6" // {x-version-update:gax-grpc:current}
dependencies {
api(project(':gax'),
diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml
index 45004b783..50ced70a9 100644
--- a/gax-grpc/pom.xml
+++ b/gax-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax-grpc
- 2.18.5
+ 2.18.6
jar
GAX (Google Api eXtensions) for Java (gRPC)
Google Api eXtensions for Java (gRPC)
@@ -11,7 +11,7 @@
com.google.api
gax-parent
- 2.18.5
+ 2.18.6
diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle
index b827b3c75..2e18d983d 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.103.5" // {x-version-update:gax-httpjson:current}
+project.version = "0.103.6" // {x-version-update:gax-httpjson:current}
dependencies {
api(project(':gax'),
diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml
index 3f7b1ee51..7f757ef1b 100644
--- a/gax-httpjson/pom.xml
+++ b/gax-httpjson/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax-httpjson
- 0.103.5
+ 0.103.6
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.18.5
+ 2.18.6
diff --git a/gax/build.gradle b/gax/build.gradle
index 24800a59a..04838ad94 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.18.5" // {x-version-update:gax:current}
+project.version = "2.18.6" // {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 b32dc63b1..3fe8402b5 100644
--- a/gax/pom.xml
+++ b/gax/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax
- 2.18.5
+ 2.18.6
jar
GAX (Google Api eXtensions) for Java (Core)
Google Api eXtensions for Java (Core)
@@ -11,7 +11,7 @@
com.google.api
gax-parent
- 2.18.5
+ 2.18.6
diff --git a/pom.xml b/pom.xml
index 29c5903f2..0501a5f2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.api
gax-parent
pom
- 2.18.5
+ 2.18.6
GAX (Google Api eXtensions) for Java (Parent)
https://github.com/googleapis/gax-java
Google Api eXtensions for Java (Parent)
@@ -12,7 +12,7 @@
com.google.cloud
google-cloud-shared-config
- 1.5.1
+ 1.5.3
@@ -82,6 +82,12 @@
com.google.guava
guava
31.1-jre
+
+
+ com.google.errorprone
+ error_prone_annotations
+
+
io.opencensus
@@ -111,12 +117,12 @@
com.google.api
gax
- 2.18.5
+ 2.18.6
com.google.api
gax
- 2.18.5
+ 2.18.6
test-jar
@@ -156,7 +162,7 @@
com.google.protobuf
protobuf-bom
- 3.21.3
+ 3.21.4
pom
import
diff --git a/renovate.json b/renovate.json
index f45d8f110..9591c029d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,30 @@
{
"extends": [
"config:base"
+ ],
+ "regexManagers": [
+ {
+ "fileMatch": ["^dependencies\\.properties$"],
+ "matchStrings": ["=(?.*?):(?.*?)\\n"],
+ "datasourceTemplate": "maven"
+ },
+ {
+ "fileMatch": ["^dependencies\\.properties$"],
+ "matchStrings": ["version\\.com_google_protobuf=(?.*?)\\n"],
+ "depNameTemplate": "com.google.protobuf:protobuf-java",
+ "datasourceTemplate": "maven"
+ },
+ {
+ "fileMatch": ["^dependencies\\.properties$"],
+ "matchStrings": ["version\\.google_java_format=(?.*?)\\n"],
+ "depNameTemplate": "com.google.googlejavaformat:google-java-format",
+ "datasourceTemplate": "maven"
+ },
+ {
+ "fileMatch": ["^dependencies\\.properties$"],
+ "matchStrings": ["version\\.io_grpc=(?.*?)\\n"],
+ "depNameTemplate": "io.grpc:grpc-core",
+ "datasourceTemplate": "maven"
+ }
]
}
diff --git a/versions.txt b/versions.txt
index b86f45107..db2c3eaa8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
# Format:
# module:released-version:current-version
-gax:2.18.5:2.18.5
-gax-bom:2.18.5:2.18.5
-gax-grpc:2.18.5:2.18.5
-gax-httpjson:0.103.5:0.103.5
+gax:2.18.6:2.18.6
+gax-bom:2.18.6:2.18.6
+gax-grpc:2.18.6:2.18.6
+gax-httpjson:0.103.6:0.103.6