Merge branch 'master' into grpc_channel

googleapis · May 25, 2021 · 8126d35 · 8126d35
2 parents dca05d3 + 687c3cf
commit 8126d35
Show file tree

Hide file tree

Showing 27 changed files with 189 additions and 199 deletions.
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1,2 +1,9 @@
 releaseType: java-yoshi
 bumpMinorPreMajor: true
+branches:
+  - releaseType: java-lts
+    bumpMinorPreMajor: true
+    branch: 1.63.0-sp
+  - releaseType: java-lts
+    bumpMinorPreMajor: true
+    branch: 1.64.0-sp
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -1,49 +1,54 @@
-# Whether or not rebase-merging is enabled on this repository.
-# Defaults to `true`
 rebaseMergeAllowed: false
-
-# Whether or not squash-merging is enabled on this repository.
-# Defaults to `true`
 squashMergeAllowed: true
-
-# Whether or not PRs are merged with a merge commit on this repository.
-# Defaults to `false`
 mergeCommitAllowed: false
-
-# Rules for master branch protection
 branchProtectionRules:
-# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `master`
-- pattern: master
-  # Can admins overwrite branch protection.
-  # Defaults to `true`
-  isAdminEnforced: true
-  # Number of approving reviews required to update matching branches.
-  # Defaults to `1`
-  requiredApprovingReviewCount: 1
-  # Are reviews from code owners required to update matching branches.
-  # Defaults to `false`
-  requiresCodeOwnerReviews: true
-  # Require up to date branches
-  requiresStrictStatusChecks: true
-  # List of required status check contexts that must pass for commits to be accepted to matching branches.
-  requiredStatusCheckContexts:
-    - "bazel"
-    - "linkage-monitor (8)"
-    - "linkage-monitor (11)"
-    - "units (7)"
-    - "units (8)"
-    - "units (11)"
-    - "cla/google"
-# List of explicit permissions to add (additive only)
+  - pattern: master
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
+    requiredStatusCheckContexts:
+      - bazel
+      - linkage-monitor (8)
+      - linkage-monitor (11)
+      - units (7)
+      - units (8)
+      - units (11)
+      - cla/google
+  - pattern: 1.63.0-sp
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
+    requiredStatusCheckContexts:
+      - bazel
+      - linkage-monitor (8)
+      - linkage-monitor (11)
+      - units (7)
+      - units (8)
+      - units (11)
+      - cla/google
+  - pattern: 1.64.0-sp
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
+    requiredStatusCheckContexts:
+      - bazel
+      - linkage-monitor (8)
+      - linkage-monitor (11)
+      - units (7)
+      - units (8)
+      - units (11)
+      - cla/google
 permissionRules:
-- team: yoshi-admins
-  permission: admin
-- team: yoshi-java-admins
-  permission: admin
-- team: yoshi-java
-  permission: push
-- team: actools
-  permission: admin
-- team: actools-java
-  permission: push
+  - team: yoshi-admins
+    permission: admin
+  - team: yoshi-java-admins
+    permission: admin
+  - team: yoshi-java
+    permission: push
+  - team: actools
+    permission: admin
+  - team: actools-java
+    permission: push
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -19,10 +19,7 @@ jobs:
       - run: .kokoro/build.sh
         env:
           JOB_TYPE: test
-      - name: coverage
-        uses: codecov/codecov-action@v1
-        with:
-          name: actions ${{ matrix.java }}
+
   bazel:
     runs-on: ubuntu-latest
     container: gcr.io/gapic-images/googleapis-bazel:20210105
@@ -65,11 +62,6 @@ jobs:
           path: ~/.cache/bazel/*/*/*/gax-java/bazel-out/*/testlogs/*
           retention-days: 5
 
-      - name: coverage
-        uses: codecov/codecov-action@v1
-        with:
-          name: actions bazel
-
   linkage-monitor:
     runs-on: ubuntu-latest
     strategy:

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -25,8 +25,3 @@ echo $JOB_TYPE
 
 ./gradlew assemble
 ./gradlew build install
-
-if [ "${REPORT_COVERAGE}" == "true" ]
-then
-  bash ${KOKORO_GFILE_DIR}/codecov.sh
-fi
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
@@ -36,10 +36,13 @@ VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
 # build the docs
 ./gradlew javadocCombinedV3
 
-# copy README to tmp_docs dir and rename index.md
-cp README.md tmp_docs/index.md
+# copy README to docfx-yml dir and rename index.md
+cp README.md tmp_docs/docfx-yml/index.md
 
-pushd tmp_docs
+# copy CHANGELOG to docfx-yml dir and rename history.md
+cp CHANGELOG.md tmp_docs/docfx-yml/history.md
+
+pushd tmp_docs/docfx-yml/
 
 # create metadata
 python3 -m docuploader create-metadata \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Changelog
 
+## [1.64.0](https://www.github.com/googleapis/gax-java/compare/v1.63.4...v1.64.0) (2021-05-10)
+
+
+### Features
+
+* release 1.64.0 ([#1375](https://www.github.com/googleapis/gax-java/issues/1375)) ([499682e](https://www.github.com/googleapis/gax-java/commit/499682ec3b96ddeaac75f6e71cc3bc85a854da97))
+
+### [1.63.4](https://www.github.com/googleapis/gax-java/compare/v1.63.3...v1.63.4) (2021-05-07)
+
+
+### Bug Fixes
+
+* Make x-goog-api-client header report rest-based transport clients with `rest/` token instead of `httpson/`. ([#1370](https://www.github.com/googleapis/gax-java/issues/1370)) ([b1b0b49](https://www.github.com/googleapis/gax-java/commit/b1b0b498ba188a51b17d179988074bcf34fb7590))
+
+### [1.63.3](https://www.github.com/googleapis/gax-java/compare/v1.63.2...v1.63.3) (2021-05-04)
+
+
+### Bug Fixes
+
+* fix flaky tests and non blocking semaphore ([#1365](https://www.github.com/googleapis/gax-java/issues/1365)) ([fc8e520](https://www.github.com/googleapis/gax-java/commit/fc8e520acfaf843ac61e806bdb4b5fe393d0b447))
+* Remove a flacky test in FlowControllerTest ([#1360](https://www.github.com/googleapis/gax-java/issues/1360)) ([2cca0bf](https://www.github.com/googleapis/gax-java/commit/2cca0bf9e96271dd52e8bffa00b8f2d45d358d35))
+
+### [1.63.2](https://www.github.com/googleapis/gax-java/compare/v1.63.1...v1.63.2) (2021-04-30)
+
+
+### Bug Fixes
+
+* Remove default value handling ([#1353](https://www.github.com/googleapis/gax-java/issues/1353)) ([ed0fc79](https://www.github.com/googleapis/gax-java/commit/ed0fc791b22db45bd20de890b0abecd1839d2d86))
+
+
+### Dependencies
+
+* remove codecov.io ([#1354](https://www.github.com/googleapis/gax-java/issues/1354)) ([06a53ac](https://www.github.com/googleapis/gax-java/commit/06a53aca36ed0825122be160479b1ea0ba8635a0))
+
 ### [1.63.1](https://www.github.com/googleapis/gax-java/compare/v1.63.0...v1.63.1) (2021-04-26)
 
 

diff --git a/README.md b/README.md
@@ -3,8 +3,6 @@ Google API Extensions for Java
 
 [![Build Status](https://travis-ci.org/googleapis/gax-java.svg?branch=master)](https://travis-ci.org/googleapis/gax-java)
 
-[![Code Coverage](https://img.shields.io/codecov/c/github/googleapis/gax-java.svg)](https://codecov.io/github/googleapis/gax-java)
-
 - [Documentation](https://googleapis.dev/java/gax/latest/)
 
 Google API Extensions for Java (GAX Java) is a library which aids in the
@@ -31,27 +29,27 @@ If you are using Maven, add this to your pom.xml file
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax</artifactId>
-  <version>1.63.1</version>
+  <version>1.64.0</version>
 </dependency>
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax-grpc</artifactId>
-  <version>1.63.1</version>
+  <version>1.64.0</version>
 </dependency>
 ```
 
 If you are using Gradle, add this to your dependencies
 
 ```Groovy
-compile 'com.google.api:gax:1.63.1',
-  'com.google.api:gax-grpc:1.63.1'
+compile 'com.google.api:gax:1.64.0',
+  'com.google.api:gax-grpc:1.64.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.api" % "gax" % "1.63.1"
-libraryDependencies += "com.google.api" % "gax-grpc" % "1.63.1"
+libraryDependencies += "com.google.api" % "gax" % "1.64.0"
+libraryDependencies += "com.google.api" % "gax-grpc" % "1.64.0"
 ```
 [//]: # ({x-version-update-end})
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -1,4 +1,4 @@
-project.version = "0.65.2-SNAPSHOT" // {x-version-update:benchmark:current}
+project.version = "0.66.1-SNAPSHOT" // {x-version-update:benchmark:current}
 
 buildscript {
     repositories {
@@ -23,7 +23,7 @@ dependencies {
     compile project(':gax-grpc')
     compile "io.grpc:grpc-netty:${libraries['version.io_grpc']}"
 
-    compile 'com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.21.0'
+    compile 'com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.24.1'
     compile 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.86.0'
 }
 

diff --git 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.63.2-SNAPSHOT" // {x-version-update:gax:current}
+project.version = "1.64.1-SNAPSHOT" // {x-version-update:gax:current}
 
 ext {
   // Project names not used for release
@@ -425,11 +425,12 @@ clean {
 task javadocCombinedV3(type: Javadoc) {
   source subprojects.collect {project -> project.sourceSets.main.allJava }
   classpath = files(subprojects.collect {project -> project.sourceSets.main.compileClasspath})
-  destinationDir = new File(projectDir, 'tmp_docs')
+  destinationDir = new File(projectDir, 'tmp_docs/docfx-yml')
 
   options.addStringOption('encoding', 'UTF-8')
   options.addStringOption("doclet", "com.microsoft.doclet.DocFxDoclet")
-  options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + "/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-172556.jar")]
+  options.addStringOption("projectname", "gax")
+  options.docletpath = [file(System.getenv('KOKORO_GFILE_DIR') + "/java-docfx-doclet-1.0.jar")]
 }
 
 clean {

diff --git a/codecov.yml b/codecov.yml
diff --git a/dependencies.properties b/dependencies.properties
@@ -8,24 +8,24 @@
 
 # Versions of oneself
 # {x-version-update-start:gax:current}
-version.gax=1.63.2-SNAPSHOT
+version.gax=1.64.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_grpc=1.63.2-SNAPSHOT
+version.gax_grpc=1.64.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_bom=1.63.2-SNAPSHOT
+version.gax_bom=1.64.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax-httpjson:current}
-version.gax_httpjson=0.80.2-SNAPSHOT
+version.gax_httpjson=0.81.1-SNAPSHOT
 # {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.15.2
 version.google_java_format=1.1
-version.io_grpc=1.36.0
+version.io_grpc=1.37.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
@@ -12,7 +12,7 @@ buildscript {
 
 archivesBaseName = "gax-bom"
 
-project.version = "1.63.2-SNAPSHOT" // {x-version-update:gax-bom:current}
+project.version = "1.64.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
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api</groupId>
   <artifactId>gax-bom</artifactId>
-  <version>1.63.2-SNAPSHOT</version><!-- {x-version-update:gax-bom:current} -->
+  <version>1.64.1-SNAPSHOT</version><!-- {x-version-update:gax-bom:current} -->
   <packaging>pom</packaging>
   <name>GAX (Google Api eXtensions) for Java</name>
   <description>Google Api eXtensions for Java</description>
@@ -33,34 +33,34 @@
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>1.63.2-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>1.64.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>1.63.2-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
+        <version>1.64.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
 	<classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.63.2-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.64.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.63.2-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.64.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
 	<classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>0.80.2-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.81.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>0.80.2-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.81.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
 	<classifier>testlib</classifier>
       </dependency>
     </dependencies>