From b778f0e2b9ec72b5f2280693791de7ec0c8a6883 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Tue, 20 Oct 2020 17:31:45 -0700 Subject: [PATCH 01/17] add yoshi-java to CODEOWNERS (#1205) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 88b3ef9f8..f45d2c83e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,4 +4,4 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -* @googleapis/actools-java +* @googleapis/actools-java @googleapis/yoshi-java From b9860fd8df6a5d932ca5ea924085ab441dc064bb Mon Sep 17 00:00:00 2001 From: Noah Dietz Date: Fri, 23 Oct 2020 08:45:53 -0700 Subject: [PATCH 02/17] chore: update actools-java perms in sync settings (#1229) --- .github/sync-repo-settings.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 46e96a14a..6ef791660 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -43,3 +43,5 @@ permissionRules: permission: push - team: actools permission: admin +- team: actools-java + permission: push From f76bdbec21dd6ac49633c0569d72bd0558a4d6e9 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 30 Oct 2020 17:47:51 +0000 Subject: [PATCH 03/17] test(deps): update JUnit (#1232) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 3bc066c7c..991a3740e 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -58,7 +58,7 @@ maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.6 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 # Testing maven artifacts -maven.junit_junit=junit:junit:4.13 +maven.junit_junit=junit:junit:4.13.1 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.21.0 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 maven.com_google_truth_truth=com.google.truth:truth:1.0 From 01568d8b6fcbc3108cc42ec8a4bbe4c3bf17e630 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 31 Oct 2020 22:34:23 -0700 Subject: [PATCH 04/17] chore: release 1.60.1-SNAPSHOT (#1223) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> --- benchmark/build.gradle | 2 +- 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 +- samples/pom.xml | 4 ++-- versions.txt | 10 +++++----- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 05512a18c..6aefddabb 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -1,4 +1,4 @@ -project.version = "0.62.0" // {x-version-update:benchmark:current} +project.version = "0.62.1-SNAPSHOT" // {x-version-update:benchmark:current} buildscript { repositories { diff --git a/build.gradle b/build.gradle index 96465fdb5..a7117ed94 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "1.60.0" // {x-version-update:gax:current} +project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax:current} ext { // Project names not used for release diff --git a/dependencies.properties b/dependencies.properties index 991a3740e..fba3aaded 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=1.60.0 +version.gax=1.60.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=1.60.0 +version.gax_grpc=1.60.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=1.60.0 +version.gax_bom=1.60.1-SNAPSHOT # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.77.0 +version.gax_httpjson=0.77.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 5767c592c..75c88c679 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -12,7 +12,7 @@ buildscript { archivesBaseName = "gax-bom" -project.version = "1.60.0" // {x-version-update:gax-bom:current} +project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax-bom:current} ext { mavenJavaDir = "$project.buildDir/publications/mavenJava" diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index 5cec70c7f..d0d2ab373 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 1.60.0 + 1.60.1-SNAPSHOT pom GAX (Google Api eXtensions) for Java Google Api eXtensions for Java @@ -33,34 +33,34 @@ com.google.api gax - 1.60.0 + 1.60.1-SNAPSHOT com.google.api gax - 1.60.0 + 1.60.1-SNAPSHOT testlib com.google.api gax-grpc - 1.60.0 + 1.60.1-SNAPSHOT com.google.api gax-grpc - 1.60.0 + 1.60.1-SNAPSHOT testlib com.google.api gax-httpjson - 0.77.0 + 0.77.1-SNAPSHOT com.google.api gax-httpjson - 0.77.0 + 0.77.1-SNAPSHOT testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index 63ac5685a..c1039ed46 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 = "1.60.0" // {x-version-update:gax-grpc:current} +project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax-grpc:current} dependencies { compile project(':gax'), diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 721ba1c0d..4d956a20c 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.77.0" // {x-version-update:gax-httpjson:current} +project.version = "0.77.1-SNAPSHOT" // {x-version-update:gax-httpjson:current} dependencies { compile project(':gax'), diff --git a/gax/build.gradle b/gax/build.gradle index 7c7c2a50e..fea557929 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 = "1.60.0" // {x-version-update:gax:current} +project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax:current} dependencies { compile libraries['maven.com_google_guava_guava'], diff --git a/samples/pom.xml b/samples/pom.xml index 4384e44dc..5ed78a235 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -14,13 +14,13 @@ com.google.api gax - 1.60.0 + 1.60.1-SNAPSHOT com.google.api gax-grpc - 1.60.0 + 1.60.1-SNAPSHOT com.google.auto.value diff --git a/versions.txt b/versions.txt index cb263cd26..8b03ba9b7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -gax:1.60.0:1.60.0 -gax-bom:1.60.0:1.60.0 -gax-grpc:1.60.0:1.60.0 -gax-httpjson:0.77.0:0.77.0 -benchmark:0.62.0:0.62.0 +gax:1.60.0:1.60.1-SNAPSHOT +gax-bom:1.60.0:1.60.1-SNAPSHOT +gax-grpc:1.60.0:1.60.1-SNAPSHOT +gax-httpjson:0.77.0:0.77.1-SNAPSHOT +benchmark:0.62.0:0.62.1-SNAPSHOT From 64806c474f1aab87ed62f59e9746aa22c5982e96 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 12:13:22 -0500 Subject: [PATCH 05/17] deps: update Guava to 30.0-android (#1237) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index fba3aaded..255c1e6c0 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -40,7 +40,7 @@ maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.24.0 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.24.0 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.24.0 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.8.6 -maven.com_google_guava_guava=com.google.guava:guava:29.0-android +maven.com_google_guava_guava=com.google.guava:guava:30.0-android maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.3.4 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 From d8b2bf7b59d83a11e2e0eba703ed758fd1adb0ce Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 15:02:07 -0500 Subject: [PATCH 06/17] deps: update api-common to 1.10.1 (#1240) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 255c1e6c0..f986408cf 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -46,7 +46,7 @@ maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_ maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2 -maven.com_google_api_api_common=com.google.api:api-common:1.9.3 +maven.com_google_api_api_common=com.google.api:api-common:1.10.1 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.4.1 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:0.13.0 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:0.13.0 From 1e7e13c07bf4c79d0b3cbfd0f15a4908278c1ffa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 10 Nov 2020 22:03:52 +0100 Subject: [PATCH 07/17] deps: update dependency com.google.auto.value:auto-value to v1.7.4 (#1031) Co-authored-by: Mira Leung Co-authored-by: Elliotte Rusty Harold Co-authored-by: Jeff Ching --- samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/pom.xml b/samples/pom.xml index 5ed78a235..6b3a1ff01 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -25,7 +25,7 @@ com.google.auto.value auto-value - 1.7 + 1.7.4 junit From 556fd07cff311cb9bf1b39cdedab816d08f67050 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 16:50:07 -0500 Subject: [PATCH 08/17] test(deps): update Truth to 1.0.1 (#1241) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index f986408cf..354e4af55 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -61,7 +61,7 @@ maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-ap maven.junit_junit=junit:junit:4.13.1 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.21.0 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 -maven.com_google_truth_truth=com.google.truth:truth:1.0 +maven.com_google_truth_truth=com.google.truth:truth:1.0.1 maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0 maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.8.15 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6 From 6232599506fda164e5675162e71809a78258efbd Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 17:14:09 -0500 Subject: [PATCH 09/17] deps: update threetenbp to 1.5.0 (#1243) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 354e4af55..533514dcc 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -47,7 +47,7 @@ maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations: maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2 maven.com_google_api_api_common=com.google.api:api-common:1.10.1 -maven.org_threeten_threetenbp=org.threeten:threetenbp:1.4.1 +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:0.13.0 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:0.13.0 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.34.2 From 6b53f0fe3a95346596c670f62d34267483a12c68 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 17:28:07 -0500 Subject: [PATCH 10/17] deps: update google-http-client to 1.38.0 (#1244) --- dependencies.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 533514dcc..1562bb70d 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -50,9 +50,9 @@ maven.com_google_api_api_common=com.google.api:api-common:1.10.1 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:0.13.0 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:0.13.0 -maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.34.2 -maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:google-http-client-jackson2:1.34.2 -maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.10.1 +maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.38.0 +maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:google-http-client-jackson2:1.38.0 +maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.11.3 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.6 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 From d9f3414b48e8f96e143115b28de088d77f6b8030 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 10 Nov 2020 14:52:07 -0800 Subject: [PATCH 11/17] ci: run bazel tests on GitHub actions (#1242) This will allow us to turn off Travis in this repo (Travis was running the bazel tests in addition to the gradle tests). --- .github/sync-repo-settings.yaml | 1 + .github/workflows/ci.yaml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 6ef791660..a1df4e47f 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -28,6 +28,7 @@ branchProtectionRules: requiresStrictStatusChecks: true # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: + - "bazel" - "linkage-monitor" - "units (7)" - "units (8)" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 025b8c088..52e017c24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,6 +23,30 @@ jobs: uses: codecov/codecov-action@v1 with: name: actions ${{ matrix.java }} + bazel: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - name: Install Bazel + run: | + wget -q "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY" + wget -q "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY.sha256" + sha256sum -c "$BAZEL_BINARY.sha256" + sudo dpkg -i "$BAZEL_BINARY" + env: + BAZEL_VERSION: 3.5.0 + BAZEL_BINARY: bazel_3.5.0-linux-x86_64.deb + - name: Run bazel tests + run: bazel --batch test //... --noshow_progress --test_output=errors + - name: coverage + uses: codecov/codecov-action@v1 + with: + name: actions bazel + linkage-monitor: runs-on: ubuntu-latest steps: From 60bb10326cd3a0092d69e8388eb5f7fed55a715c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 10 Nov 2020 18:34:07 -0500 Subject: [PATCH 12/17] deps: update autovalue annotations (#1246) --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 1562bb70d..ca68c27b2 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -45,7 +45,7 @@ maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.3.4 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 -maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2 +maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.4 maven.com_google_api_api_common=com.google.api:api-common:1.10.1 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:0.13.0 From 11dce0289bf29b34c0849aa26a2bbce6fdcb3c82 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 10 Nov 2020 16:00:06 -0800 Subject: [PATCH 13/17] ci: remove travis config. all tests are now running on GitHub actions (#1245) --- .travis.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d80ac127a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ -sudo: false -dist: trusty -language: java -addons: - # https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913 - hosts: - - fake-hostname-to-work-around-travis-bug - hostname: fake-hostname-to-work-around-travis-bug - -jobs: - include: - - name: Java 7 Gradle Build - jdk: openjdk7 - install: ./gradlew assemble - script: ./gradlew build install - after_success: - - bash <(curl -s https://codecov.io/bash) - - - name: Java 8 Gradle Build - jdk: openjdk8 - install: ./gradlew assemble - script: - - ./gradlew build install - after_success: - - bash <(curl -s https://codecov.io/bash) - - - name: Java 8 Bazel Build - jdk: openjdk8 - before_install: - - BAZEL_VERSION="3.5.0" - - BAZEL_BINARY="bazel_$BAZEL_VERSION-linux-x86_64.deb" - - wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY" - - wget "https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/$BAZEL_BINARY.sha256" - - sha256sum -c "$BAZEL_BINARY.sha256" - - sudo dpkg -i "$BAZEL_BINARY" - # The Bazel flags below are the best we can do to optimize build speed, since caching on Travis - # is suboptimal for various reasons (see https://kevin.burke.dev/kevin/bazel-tests-on-travis-ci/). - script: - - bazel --batch test //... --noshow_progress --test_output=errors From 570cc7cfbb9ba0345733c523113b0f9755ecdca8 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 16 Nov 2020 13:09:34 +0000 Subject: [PATCH 14/17] update iam (#1248) --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index ca68c27b2..71eb4250f 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -48,8 +48,8 @@ maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.4 maven.com_google_api_api_common=com.google.api:api-common:1.10.1 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:0.13.0 -maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:0.13.0 +maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.0.3 +maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.0.3 maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.38.0 maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:google-http-client-jackson2:1.38.0 maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.11.3 From d455da2cd73f1e015d7570e8d634864a38bdb042 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 16 Nov 2020 18:20:58 +0000 Subject: [PATCH 15/17] deps: update auth libaries (#1251) @chingor13 --- dependencies.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 71eb4250f..71e64fa94 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -34,8 +34,8 @@ version.io_grpc=1.32.2 # 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:1.17.0 maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:1.17.0 -maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.21.0 -maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.21.0 +maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:0.22.0 +maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:0.22.0 maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.24.0 maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.24.0 maven.io_opencensus_opencensus_contrib_http_util=io.opencensus:opencensus-contrib-http-util:0.24.0 From 656b613d2fe73e5bd19d43d4a2d8d0c6bb9ad5f2 Mon Sep 17 00:00:00 2001 From: mohanli-ml <67390330+mohanli-ml@users.noreply.github.com> Date: Thu, 19 Nov 2020 13:39:32 -0800 Subject: [PATCH 16/17] fix: check Compute Engine environment for DirectPath (#1250) --- .../InstantiatingGrpcChannelProvider.java | 28 ++++++++++++++++++- .../InstantiatingGrpcChannelProviderTest.java | 12 ++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) 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 cde961903..8754104cf 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 @@ -44,10 +44,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.io.CharStreams; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.alts.ComputeEngineChannelBuilder; import java.io.IOException; +import java.io.InputStreamReader; import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; @@ -74,6 +76,8 @@ public final class InstantiatingGrpcChannelProvider implements TransportChannelP static final long DIRECT_PATH_KEEP_ALIVE_TIMEOUT_SECONDS = 20; // reduce the thundering herd problem of too many channels trying to (re)connect at the same time static final int MAX_POOL_SIZE = 1000; + static final String GCE_PRODUCTION_NAME_PRIOR_2016 = "Google"; + static final String GCE_PRODUCTION_NAME_AFTER_2016 = "Google Compute Engine"; private final int processorCount; private final Executor executor; @@ -234,6 +238,26 @@ private boolean isDirectPathEnabled(String serviceAddress) { return false; } + // DirectPath should only be used on Compute Engine. + // Notice Windows is supported for now. + static boolean isOnComputeEngine() { + String osName = System.getProperty("os.name"); + if ("Linux".equals(osName)) { + String cmd = "cat /sys/class/dmi/id/product_name"; + try { + Process process = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", cmd}); + process.waitFor(); + String result = + CharStreams.toString(new InputStreamReader(process.getInputStream(), "UTF-8")); + return result.contains(GCE_PRODUCTION_NAME_PRIOR_2016) + || result.contains(GCE_PRODUCTION_NAME_AFTER_2016); + } catch (IOException | InterruptedException e) { + return false; + } + } + return false; + } + private ManagedChannel createSingleChannel() throws IOException { GrpcHeaderInterceptor headerInterceptor = new GrpcHeaderInterceptor(headerProvider.getHeaders()); @@ -250,7 +274,9 @@ private ManagedChannel createSingleChannel() throws IOException { ManagedChannelBuilder builder; // TODO(weiranf): Add API in ComputeEngineCredentials to check default service account. - if (isDirectPathEnabled(serviceAddress) && credentials instanceof ComputeEngineCredentials) { + if (isDirectPathEnabled(serviceAddress) + && credentials instanceof ComputeEngineCredentials + && isOnComputeEngine()) { builder = ComputeEngineChannelBuilder.forAddress(serviceAddress, port); // Set default keepAliveTime and keepAliveTimeout when directpath environment is enabled. // Will be overridden by user defined values if any. diff --git a/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java b/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java index f72754ae1..16d04e0d5 100644 --- a/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java +++ b/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java @@ -219,7 +219,11 @@ public void testWithGCECredentials() throws IOException { ApiFunction channelConfigurator = new ApiFunction() { public ManagedChannelBuilder apply(ManagedChannelBuilder channelBuilder) { - assertThat(channelBuilder instanceof ComputeEngineChannelBuilder).isTrue(); + if (InstantiatingGrpcChannelProvider.isOnComputeEngine()) { + assertThat(channelBuilder instanceof ComputeEngineChannelBuilder).isTrue(); + } else { + assertThat(channelBuilder instanceof ComputeEngineChannelBuilder).isFalse(); + } return channelBuilder; } }; @@ -234,7 +238,11 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder channelBuilder) { .withEndpoint("localhost:8080"); assertThat(provider.needsCredentials()).isTrue(); - provider = provider.withCredentials(ComputeEngineCredentials.create()); + if (InstantiatingGrpcChannelProvider.isOnComputeEngine()) { + provider = provider.withCredentials(ComputeEngineCredentials.create()); + } else { + provider = provider.withCredentials(CloudShellCredentials.create(3000)); + } assertThat(provider.needsCredentials()).isFalse(); provider.getTransportChannel().shutdownNow(); From 7e15b60b1d1c1314e3c1215ab8094f34dd1bbae2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Nov 2020 13:46:26 -0800 Subject: [PATCH 17/17] chore: release 1.60.1 (#1239) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 12 ++++++------ benchmark/build.gradle | 2 +- 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 +- samples/pom.xml | 4 ++-- versions.txt | 10 +++++----- 12 files changed, 48 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8eec6e1a..033247d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +### [1.60.1](https://www.github.com/googleapis/gax-java/compare/v1.60.0...v1.60.1) (2020-11-19) + + +### Bug Fixes + +* check Compute Engine environment for DirectPath ([#1250](https://www.github.com/googleapis/gax-java/issues/1250)) ([656b613](https://www.github.com/googleapis/gax-java/commit/656b613d2fe73e5bd19d43d4a2d8d0c6bb9ad5f2)) + + +### Dependencies + +* update api-common to 1.10.1 ([#1240](https://www.github.com/googleapis/gax-java/issues/1240)) ([d8b2bf7](https://www.github.com/googleapis/gax-java/commit/d8b2bf7b59d83a11e2e0eba703ed758fd1adb0ce)) +* update auth libaries ([#1251](https://www.github.com/googleapis/gax-java/issues/1251)) ([d455da2](https://www.github.com/googleapis/gax-java/commit/d455da2cd73f1e015d7570e8d634864a38bdb042)) +* update autovalue annotations ([#1246](https://www.github.com/googleapis/gax-java/issues/1246)) ([60bb103](https://www.github.com/googleapis/gax-java/commit/60bb10326cd3a0092d69e8388eb5f7fed55a715c)) +* update dependency com.google.auto.value:auto-value to v1.7.4 ([#1031](https://www.github.com/googleapis/gax-java/issues/1031)) ([1e7e13c](https://www.github.com/googleapis/gax-java/commit/1e7e13c07bf4c79d0b3cbfd0f15a4908278c1ffa)) +* update google-http-client to 1.38.0 ([#1244](https://www.github.com/googleapis/gax-java/issues/1244)) ([6b53f0f](https://www.github.com/googleapis/gax-java/commit/6b53f0fe3a95346596c670f62d34267483a12c68)) +* update Guava to 30.0-android ([#1237](https://www.github.com/googleapis/gax-java/issues/1237)) ([64806c4](https://www.github.com/googleapis/gax-java/commit/64806c474f1aab87ed62f59e9746aa22c5982e96)) +* update threetenbp to 1.5.0 ([#1243](https://www.github.com/googleapis/gax-java/issues/1243)) ([6232599](https://www.github.com/googleapis/gax-java/commit/6232599506fda164e5675162e71809a78258efbd)) + ## [1.60.0](https://www.github.com/googleapis/gax-java/compare/v1.59.1...v1.60.0) (2020-10-19) diff --git a/README.md b/README.md index 5688f52d6..7c6b149cf 100644 --- a/README.md +++ b/README.md @@ -31,27 +31,27 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 1.60.0 + 1.60.1 com.google.api gax-grpc - 1.60.0 + 1.60.1 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:1.60.0', - 'com.google.api:gax-grpc:1.60.0' +compile 'com.google.api:gax:1.60.1', + 'com.google.api:gax-grpc:1.60.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "1.60.0" -libraryDependencies += "com.google.api" % "gax-grpc" % "1.60.0" +libraryDependencies += "com.google.api" % "gax" % "1.60.1" +libraryDependencies += "com.google.api" % "gax-grpc" % "1.60.1" ``` [//]: # ({x-version-update-end}) diff --git a/benchmark/build.gradle b/benchmark/build.gradle index 6aefddabb..d04cf4bd2 100644 --- a/benchmark/build.gradle +++ b/benchmark/build.gradle @@ -1,4 +1,4 @@ -project.version = "0.62.1-SNAPSHOT" // {x-version-update:benchmark:current} +project.version = "0.62.1" // {x-version-update:benchmark:current} buildscript { repositories { diff --git a/build.gradle b/build.gradle index a7117ed94..0758a2daf 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'com.github.sherter.google-java-format' apply plugin: 'io.codearte.nexus-staging' // TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync) -project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax:current} +project.version = "1.60.1" // {x-version-update:gax:current} ext { // Project names not used for release diff --git a/dependencies.properties b/dependencies.properties index 71e64fa94..459fbf253 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=1.60.1-SNAPSHOT +version.gax=1.60.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=1.60.1-SNAPSHOT +version.gax_grpc=1.60.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=1.60.1-SNAPSHOT +version.gax_bom=1.60.1 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.77.1-SNAPSHOT +version.gax_httpjson=0.77.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 75c88c679..97fe3310d 100644 --- a/gax-bom/build.gradle +++ b/gax-bom/build.gradle @@ -12,7 +12,7 @@ buildscript { archivesBaseName = "gax-bom" -project.version = "1.60.1-SNAPSHOT" // {x-version-update:gax-bom:current} +project.version = "1.60.1" // {x-version-update:gax-bom:current} ext { mavenJavaDir = "$project.buildDir/publications/mavenJava" diff --git a/gax-bom/pom.xml b/gax-bom/pom.xml index d0d2ab373..e22132695 100644 --- a/gax-bom/pom.xml +++ b/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 1.60.1-SNAPSHOT + 1.60.1 pom GAX (Google Api eXtensions) for Java Google Api eXtensions for Java @@ -33,34 +33,34 @@ com.google.api gax - 1.60.1-SNAPSHOT + 1.60.1 com.google.api gax - 1.60.1-SNAPSHOT + 1.60.1 testlib com.google.api gax-grpc - 1.60.1-SNAPSHOT + 1.60.1 com.google.api gax-grpc - 1.60.1-SNAPSHOT + 1.60.1 testlib com.google.api gax-httpjson - 0.77.1-SNAPSHOT + 0.77.1 com.google.api gax-httpjson - 0.77.1-SNAPSHOT + 0.77.1 testlib diff --git a/gax-grpc/build.gradle b/gax-grpc/build.gradle index c1039ed46..92e5f79eb 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 = "1.60.1-SNAPSHOT" // {x-version-update:gax-grpc:current} +project.version = "1.60.1" // {x-version-update:gax-grpc:current} dependencies { compile project(':gax'), diff --git a/gax-httpjson/build.gradle b/gax-httpjson/build.gradle index 4d956a20c..ceeb4b6b5 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.77.1-SNAPSHOT" // {x-version-update:gax-httpjson:current} +project.version = "0.77.1" // {x-version-update:gax-httpjson:current} dependencies { compile project(':gax'), diff --git a/gax/build.gradle b/gax/build.gradle index fea557929..380a26bce 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 = "1.60.1-SNAPSHOT" // {x-version-update:gax:current} +project.version = "1.60.1" // {x-version-update:gax:current} dependencies { compile libraries['maven.com_google_guava_guava'], diff --git a/samples/pom.xml b/samples/pom.xml index 6b3a1ff01..b907aebc1 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -14,13 +14,13 @@ com.google.api gax - 1.60.1-SNAPSHOT + 1.60.1 com.google.api gax-grpc - 1.60.1-SNAPSHOT + 1.60.1 com.google.auto.value diff --git a/versions.txt b/versions.txt index 8b03ba9b7..41946bd36 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -gax:1.60.0:1.60.1-SNAPSHOT -gax-bom:1.60.0:1.60.1-SNAPSHOT -gax-grpc:1.60.0:1.60.1-SNAPSHOT -gax-httpjson:0.77.0:0.77.1-SNAPSHOT -benchmark:0.62.0:0.62.1-SNAPSHOT +gax:1.60.1:1.60.1 +gax-bom:1.60.1:1.60.1 +gax-grpc:1.60.1:1.60.1 +gax-httpjson:0.77.1:0.77.1 +benchmark:0.62.1:0.62.1