diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index b6755f81b..bee732f23 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -1,4 +1,4 @@
-name: Build
+name: Sonar
on:
push:
branches:
@@ -7,7 +7,7 @@ on:
types: [opened, synchronize, reopened]
jobs:
build:
- name: Build
+ name: Java 11 Gradle Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -33,4 +33,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- run: ./gradlew build sonarqube --info
\ No newline at end of file
+ run: ./gradlew build sonarqube --info
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea9e46133..73406f7a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# Changelog
+## [2.18.5](https://github.com/googleapis/gax-java/compare/v2.18.4...v2.18.5) (2022-07-25)
+
+
+### Bug Fixes
+
+* **deps:** update dependency com.google.api.grpc:grpc-google-common-protos to v2.9.2 ([#1735](https://github.com/googleapis/gax-java/issues/1735)) ([d7f00be](https://github.com/googleapis/gax-java/commit/d7f00beae84c093a732982aaeedd7d6a8752e52c))
+* **deps:** update dependency com.google.api.grpc:proto-google-common-protos to v2.9.2 ([#1736](https://github.com/googleapis/gax-java/issues/1736)) ([ee3d4ad](https://github.com/googleapis/gax-java/commit/ee3d4ad29a84da9113790dd03b8f0bbd89625a7c))
+* **deps:** update dependency com.google.auth:google-auth-library-credentials to v1.8.1 ([#1737](https://github.com/googleapis/gax-java/issues/1737)) ([24bc629](https://github.com/googleapis/gax-java/commit/24bc629aa1ffc0513ba766858935ead7ab18bf9e))
+* **deps:** update dependency com.google.auth:google-auth-library-oauth2-http to v1.8.1 ([#1738](https://github.com/googleapis/gax-java/issues/1738)) ([1030eb6](https://github.com/googleapis/gax-java/commit/1030eb6b1df5008f304d0989fd991f88f148cc2a))
+* **deps:** update dependency com.google.cloud:google-cloud-shared-config to v1.5.1 ([#1726](https://github.com/googleapis/gax-java/issues/1726)) ([bdffb86](https://github.com/googleapis/gax-java/commit/bdffb86c05235c4ad783ab7afd28724386465569))
+* **deps:** update dependency com.google.http-client:google-http-client-bom to v1.42.2 ([#1727](https://github.com/googleapis/gax-java/issues/1727)) ([030e9b3](https://github.com/googleapis/gax-java/commit/030e9b33ec6bd98122fba59a1bc39513444c3511))
+* **deps:** update dependency com.google.protobuf:protobuf-bom to v3.21.3 ([#1742](https://github.com/googleapis/gax-java/issues/1742)) ([9215e1f](https://github.com/googleapis/gax-java/commit/9215e1f58ebcc6eccef42c53981ab90865fe366a))
+* **deps:** update dependency io.grpc:grpc-bom to v1.48.0 ([#1741](https://github.com/googleapis/gax-java/issues/1741)) ([4735a4b](https://github.com/googleapis/gax-java/commit/4735a4b29b686ba510a25ad8458142870e50b1c5))
+* remove initialization of logger classes which is conflicting with slf4j ([#1733](https://github.com/googleapis/gax-java/issues/1733)) ([ccaf265](https://github.com/googleapis/gax-java/commit/ccaf26537a189dacb9b3bb58760a4c6f6cd48a87))
+
## [2.18.4](https://github.com/googleapis/gax-java/compare/v2.18.3...v2.18.4) (2022-07-11)
diff --git a/build.gradle b/build.gradle
index 1f8dbd635..f964e98ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
id 'java'
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
- id 'com.diffplug.eclipse.apt' version '3.36.2' apply false
+ id 'com.diffplug.eclipse.apt' version '3.37.1' apply false
id 'com.dorongold.task-tree' version '2.1.0' apply false
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
id 'com.github.sherter.google-java-format' version '0.9' apply false
@@ -13,7 +13,7 @@ plugins {
}
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
-project.version = "2.18.4" // {x-version-update:gax:current}
+project.version = "2.18.5" // {x-version-update:gax:current}
allprojects {
group = 'com.google.api'
diff --git a/dependencies.properties b/dependencies.properties
index cf2107985..b5699ec14 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -8,16 +8,16 @@
# Versions of oneself
# {x-version-update-start:gax:current}
-version.gax=2.18.4
+version.gax=2.18.5
# {x-version-update-end}
# {x-version-update-start:gax:current}
-version.gax_grpc=2.18.4
+version.gax_grpc=2.18.5
# {x-version-update-end}
# {x-version-update-start:gax:current}
-version.gax_bom=2.18.4
+version.gax_bom=2.18.5
# {x-version-update-end}
# {x-version-update-start:gax-httpjson:current}
-version.gax_httpjson=0.103.4
+version.gax_httpjson=0.103.5
# {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 85cec568b..41c573c7e 100644
--- a/gax-bom/build.gradle
+++ b/gax-bom/build.gradle
@@ -5,7 +5,7 @@ plugins {
archivesBaseName = 'gax-bom'
-project.version = "2.18.4" // {x-version-update:gax-bom:current}
+project.version = "2.18.5" // {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 a20415f01..3f1287b6a 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.4
+ 2.18.5
pom
GAX (Google Api eXtensions) for Java (BOM)
Google Api eXtensions for Java (BOM)
@@ -33,34 +33,34 @@
com.google.api
gax
- 2.18.4
+ 2.18.5
com.google.api
gax
- 2.18.4
+ 2.18.5
testlib
com.google.api
gax-grpc
- 2.18.4
+ 2.18.5
com.google.api
gax-grpc
- 2.18.4
+ 2.18.5
testlib
com.google.api
gax-httpjson
- 0.103.4
+ 0.103.5
com.google.api
gax-httpjson
- 0.103.4
+ 0.103.5
testlib
diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle
index dd712f2b7..a4c2ce7b1 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.4" // {x-version-update:gax-grpc:current}
+project.version = "2.18.5" // {x-version-update:gax-grpc:current}
dependencies {
api(project(':gax'),
diff --git a/gax-grpc/pom.xml b/gax-grpc/pom.xml
index e1f1d24a6..45004b783 100644
--- a/gax-grpc/pom.xml
+++ b/gax-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax-grpc
- 2.18.4
+ 2.18.5
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.4
+ 2.18.5
diff --git a/gax-grpc/src/main/resources/META-INF/native-image/com.google.api/gax-grpc/native-image.properties b/gax-grpc/src/main/resources/META-INF/native-image/com.google.api/gax-grpc/native-image.properties
index 116da7f46..33ea6695b 100644
--- a/gax-grpc/src/main/resources/META-INF/native-image/com.google.api/gax-grpc/native-image.properties
+++ b/gax-grpc/src/main/resources/META-INF/native-image/com.google.api/gax-grpc/native-image.properties
@@ -3,8 +3,6 @@ Args = --initialize-at-run-time=io.grpc.netty.shaded.io.netty.handler.ssl.OpenSs
io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateVerifier,\
io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethod,\
io.grpc.netty.shaded.io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod,\
- io.grpc.netty.shaded.io.netty.util.internal.logging.Slf4JLoggerFactory,\
- io.grpc.netty.shaded.io.netty.util.internal.logging.Log4JLogger,\
io.grpc.netty.shaded.io.grpc.netty,\
io.grpc.netty.shaded.io.netty.channel.epoll,\
io.grpc.netty.shaded.io.netty.channel.unix,\
diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle
index b980881b2..b827b3c75 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.4" // {x-version-update:gax-httpjson:current}
+project.version = "0.103.5" // {x-version-update:gax-httpjson:current}
dependencies {
api(project(':gax'),
diff --git a/gax-httpjson/pom.xml b/gax-httpjson/pom.xml
index b65f77837..3f7b1ee51 100644
--- a/gax-httpjson/pom.xml
+++ b/gax-httpjson/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax-httpjson
- 0.103.4
+ 0.103.5
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.4
+ 2.18.5
diff --git a/gax/build.gradle b/gax/build.gradle
index f8388950c..24800a59a 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.4" // {x-version-update:gax:current}
+project.version = "2.18.5" // {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 55e0f0d0a..b32dc63b1 100644
--- a/gax/pom.xml
+++ b/gax/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax
- 2.18.4
+ 2.18.5
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.4
+ 2.18.5
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4..249e5832f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fcea..8049c684f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c78733..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..53a6b238d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
diff --git a/pom.xml b/pom.xml
index 8f0099005..29c5903f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.api
gax-parent
pom
- 2.18.4
+ 2.18.5
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.0
+ 1.5.1
@@ -61,7 +61,7 @@
com.google.auth
google-auth-library-credentials
- 1.8.0
+ 1.8.1
org.threeten
@@ -71,7 +71,7 @@
com.google.auth
google-auth-library-oauth2-http
- 1.8.0
+ 1.8.1
com.google.code.findbugs
@@ -111,28 +111,28 @@
com.google.api
gax
- 2.18.4
+ 2.18.5
com.google.api
gax
- 2.18.4
+ 2.18.5
test-jar
com.google.api.grpc
proto-google-common-protos
- 2.9.1
+ 2.9.2
com.google.api.grpc
grpc-google-common-protos
- 2.9.1
+ 2.9.2
io.grpc
grpc-bom
- 1.47.0
+ 1.48.0
pom
import
@@ -149,14 +149,14 @@
com.google.http-client
google-http-client-bom
- 1.42.0
+ 1.42.2
pom
import
com.google.protobuf
protobuf-bom
- 3.21.2
+ 3.21.3
pom
import
diff --git a/versions.txt b/versions.txt
index 2ea2786d0..b86f45107 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,7 +1,7 @@
# Format:
# module:released-version:current-version
-gax:2.18.4:2.18.4
-gax-bom:2.18.4:2.18.4
-gax-grpc:2.18.4:2.18.4
-gax-httpjson:0.103.4:0.103.4
+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