Merge branch 'main' into add-google-c2p

.github/release-please.yml

@@ -11,4 +11,8 @@ branches:
   - bumpMinorPreMajor: true
     handleGHRelease: true
     releaseType: java-yoshi
-    branch: java7
+    branch: java7
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 2.6.x

.github/sync-repo-settings.yaml

@@ -2,15 +2,13 @@ rebaseMergeAllowed: false
 squashMergeAllowed: true
 mergeCommitAllowed: false
 branchProtectionRules:
-  - pattern: master
+  - pattern: main
     isAdminEnforced: true
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
     requiredStatusCheckContexts:
       - bazel
-      - linkage-monitor (8)
-      - linkage-monitor (11)
       - units (8)
       - units (11)
       - cla/google
@@ -53,6 +51,16 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - cla/google
+  - pattern: 2.6.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: true
+    requiredStatusCheckContexts:
+      - bazel
+      - units (8)
+      - units (11)
+      - cla/google
 permissionRules:
   - team: yoshi-admins
     permission: admin

.github/workflows/ci.yaml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 name: ci
 jobs:
@@ -61,23 +61,3 @@ jobs:
           name: test-artifacts
           path: ~/.cache/bazel/*/*/*/gax-java/bazel-out/*/testlogs/*
           retention-days: 5
-
-  linkage-monitor:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [8, 11]
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
-        with:
-          java-version: ${{ matrix.java }}
-      - run: java -version
-      - name: Build and install local Maven repository
-        run: ./gradlew build publishToMavenLocal -x test -x signMavenJavaPublication
-      - name: Generate artifact list (linkage-monitor-artifacts.txt) for Linkage Monitor
-        run: ./gradlew createLinkageMonitorArtifactList
-      - name: Check dependency conflicts with the latest Libraries BOM
-        uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
-      - name: Check dependency conflicts in the gax artifacts
-        run: ./gradlew checkJavaLinkage

.kokoro/build.sh

@@ -16,12 +16,11 @@
 set -eo pipefail
 
 scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-## cd to the parent directory, i.e. the root of the git repo
+# cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
 # Print out Java
 java -version
 echo $JOB_TYPE
 
-./gradlew assemble
-./gradlew build install
+./gradlew -Pskip.signing build publishToMavenLocal

.kokoro/release/common.cfg

@@ -8,8 +8,8 @@ build_file: "gax-java/.kokoro/trampoline.sh"
 
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
-    key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
 }
 
 before_action {

.kokoro/release/drop.cfg

@@ -1,5 +1,5 @@
 # Format: //devtools/kokoro/config/proto/build.proto
- env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/gax-java/.kokoro/release/drop.sh"
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/gax-java/.kokoro/release/drop.sh"
 }

.kokoro/release/promote.cfg

@@ -1,5 +1,5 @@
 # Format: //devtools/kokoro/config/proto/build.proto
- env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/gax-java/.kokoro/release/promote.sh"
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/gax-java/.kokoro/release/promote.sh"
 }

.kokoro/release/publish_javadoc11.cfg

@@ -2,19 +2,19 @@
 
 # cloud-rad production
 env_vars: {
-          key: "STAGING_BUCKET_V2"
-          value: "docs-staging-v2"
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2"
 }
 
 # Configure the docker image for kokoro-trampoline
 env_vars: {
-          key: "TRAMPOLINE_IMAGE"
-          value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
 }
 
 env_vars: {
-          key: "TRAMPOLINE_BUILD_FILE"
-          value: "github/gax-java/.kokoro/release/publish_javadoc11.sh"
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/gax-java/.kokoro/release/publish_javadoc11.sh"
 }
 
 before_action {

.kokoro/release/stage.cfg

@@ -1,7 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
- env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/gax-java/.kokoro/release/stage.sh"
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/gax-java/.kokoro/release/stage.sh"
 }
 
 env_vars: {

.kokoro/release/stage.sh

@@ -30,9 +30,9 @@ setup_environment_secrets
 mkdir -p ${HOME}/.gradle
 create_gradle_properties_file "${HOME}/.gradle/gradle.properties"
 
-./gradlew assemble publish
-
-if [[ -n "${AUTORELEASE_PR}" ]]
+if [[ -z "${AUTORELEASE_PR}" ]]
 then
-  ./gradlew closeAndReleaseRepository
+  ./gradlew publishToSonatype
+else
+  ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
 fi

CHANGELOG.md

@@ -1,5 +1,48 @@
 # Changelog
 
+## [2.6.0](https://www.github.com/googleapis/gax-java/compare/v2.5.3...v2.6.0) (2021-10-15)
+
+
+### Features
+
+* remove deprecated Generated annotation ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+
+
+### Bug Fixes
+
+* Fix com.google.rpc.Code to StatusCode.Code conversion logic ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+
+
+### Dependencies
+
+* update api-common to 2.0.5 ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+* update auto-value to 1.8.2 ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+* update com_google_protobuf to 3.18.1 ([#1519](https://www.github.com/googleapis/gax-java/issues/1519)) ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+* update google-http-client to 1.40.1 ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+* update grpc to 1.41.0 ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+* update guava to v31 ([2d76bff](https://www.github.com/googleapis/gax-java/commit/2d76bff6d64da818a3aff7ea0bdf5a36b82c3464))
+
+### [2.5.3](https://www.github.com/googleapis/gax-java/compare/v2.5.2...v2.5.3) (2021-10-13)
+
+
+### Bug Fixes
+
+* Fix `com.google.rpc.Code` to `StatusCode.Code` conversion  logic ([#1508](https://www.github.com/googleapis/gax-java/issues/1508)) ([61b1617](https://www.github.com/googleapis/gax-java/commit/61b161799faf292be1394111381f8a35e757b85a))
+
+### [2.5.2](https://www.github.com/googleapis/gax-java/compare/v2.5.1...v2.5.2) (2021-10-13)
+
+
+### Dependencies
+
+* release multiple artifacts at once ([#1506](https://www.github.com/googleapis/gax-java/issues/1506)) ([8c022f6](https://www.github.com/googleapis/gax-java/commit/8c022f69f7878280e00f200f65a931ff0f8cfe45))
+
+### [2.5.1](https://www.github.com/googleapis/gax-java/compare/v2.5.0...v2.5.1) (2021-10-08)
+
+
+### Dependencies
+
+* fix release pipeline ([#1500](https://www.github.com/googleapis/gax-java/issues/1500)) ([f8ae03b](https://www.github.com/googleapis/gax-java/commit/f8ae03bbf0389d5fd943d214c1058ee012be757b))
+
 ## [2.5.0](https://www.github.com/googleapis/gax-java/compare/v2.4.1...v2.5.0) (2021-09-21)
 
 

README.md

@@ -1,7 +1,7 @@
 Google API Extensions for Java
 ==============================
 
-[![Build Status](https://travis-ci.org/googleapis/gax-java.svg?branch=master)](https://travis-ci.org/googleapis/gax-java)
+[![Build Status](https://travis-ci.org/googleapis/gax-java.svg?branch=main)](https://travis-ci.org/googleapis/gax-java)
 
 - [Documentation](https://googleapis.dev/java/gax/latest/)
 
@@ -29,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>2.5.0</version>
+  <version>2.6.0</version>
 </dependency>
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax-grpc</artifactId>
-  <version>2.5.0</version>
+  <version>2.6.0</version>
 </dependency>
 ```
 
 If you are using Gradle, add this to your dependencies
 
 ```Groovy
-compile 'com.google.api:gax:2.5.0',
-  'com.google.api:gax-grpc:2.5.0'
+compile 'com.google.api:gax:2.6.0',
+  'com.google.api:gax-grpc:2.6.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.api" % "gax" % "2.5.0"
-libraryDependencies += "com.google.api" % "gax-grpc" % "2.5.0"
+libraryDependencies += "com.google.api" % "gax" % "2.6.0"
+libraryDependencies += "com.google.api" % "gax-grpc" % "2.6.0"
 ```
 [//]: # ({x-version-update-end})
 
@@ -152,6 +152,6 @@ License
 
 BSD - See [LICENSE] for more information.
 
-[CONTRIBUTING]:https://github.com/googleapis/gax-java/blob/master/CONTRIBUTING.md
-[LICENSE]: https://github.com/googleapis/gax-java/blob/master/LICENSE
+[CONTRIBUTING]:https://github.com/googleapis/gax-java/blob/main/CONTRIBUTING.md
+[LICENSE]: https://github.com/googleapis/gax-java/blob/main/LICENSE
 

benchmark/build.gradle

@@ -1,32 +1,18 @@
-project.version = "0.75.0" // {x-version-update:benchmark:current}
-
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.4"
-    }
+plugins {
+  id 'me.champeau.gradle.jmh' version '0.5.3'
 }
 
-apply plugin: "me.champeau.gradle.jmh"
-apply plugin: 'java'
-
-repositories {
-    mavenCentral()
-}
+project.version = "0.76.1-SNAPSHOT" // {x-version-update:benchmark:current}
 
 dependencies {
-    compile project(':gax')
-    compile project(':gax-grpc')
-    compile "io.grpc:grpc-netty:${libraries['version.io_grpc']}"
-    compile 'com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.1.2'
-    compile 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.96.4'
+  implementation project(':gax')
+  implementation project(':gax-grpc')
+  implementation "io.grpc:grpc-netty:${libraries['version.io_grpc']}"
+  implementation 'com.google.api.grpc:grpc-google-cloud-bigtable-v2:2.1.4'
+  implementation 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.96.6'
 }
 
 // Allow command line to target specific test
-if (project.properties.containsKey('include')) {
-    jmh.include = [project.properties.get('include')]
+if (project.hasProperty('include')) {
+  jmh.include = [project.include]
 }