Merge branch 'master' into disable-dp

googleapis · Jun 29, 2021 · a0e7d60 · a0e7d60
2 parents d70e56b + 0eac650
commit a0e7d60
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.66.0](https://www.github.com/googleapis/gax-java/compare/v1.65.1...v1.66.0) (2021-06-24)
+
+
+### Features
+
+* make ApiTracer internal API ([#1414](https://www.github.com/googleapis/gax-java/issues/1414)) ([e3e8462](https://www.github.com/googleapis/gax-java/commit/e3e8462a2f9e866480ec2106dc59555d41ea4bb5))
+
 ### [1.65.1](https://www.github.com/googleapis/gax-java/compare/v1.65.0...v1.65.1) (2021-06-08)
 
 

diff --git a/README.md b/README.md
@@ -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>1.65.1</version>
+  <version>1.66.0</version>
 </dependency>
 <dependency>
   <groupId>com.google.api</groupId>
   <artifactId>gax-grpc</artifactId>
-  <version>1.65.1</version>
+  <version>1.66.0</version>
 </dependency>
 ```
 
 If you are using Gradle, add this to your dependencies
 
 ```Groovy
-compile 'com.google.api:gax:1.65.1',
-  'com.google.api:gax-grpc:1.65.1'
+compile 'com.google.api:gax:1.66.0',
+  'com.google.api:gax-grpc:1.66.0'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.api" % "gax" % "1.65.1"
-libraryDependencies += "com.google.api" % "gax-grpc" % "1.65.1"
+libraryDependencies += "com.google.api" % "gax" % "1.66.0"
+libraryDependencies += "com.google.api" % "gax-grpc" % "1.66.0"
 ```
 [//]: # ({x-version-update-end})
 

diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -1,4 +1,4 @@
-project.version = "0.67.1" // {x-version-update:benchmark:current}
+project.version = "0.68.0" // {x-version-update:benchmark:current}
 
 buildscript {
     repositories {
@@ -22,9 +22,8 @@ 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:1.26.1'
-    compile 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.95.3'
+    compile 'com.google.api.grpc:grpc-google-cloud-bigtable-v2:1.27.0'
+    compile 'com.google.api.grpc:grpc-google-cloud-pubsub-v1:1.95.4'
 }
 
 // Allow command line to target specific test

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.65.1" // {x-version-update:gax:current}
+project.version = "1.66.0" // {x-version-update:gax:current}
 
 ext {
   // Project names not used for release

diff --git a/dependencies.properties b/dependencies.properties
@@ -8,16 +8,16 @@
 
 # Versions of oneself
 # {x-version-update-start:gax:current}
-version.gax=1.65.1
+version.gax=1.66.0
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_grpc=1.65.1
+version.gax_grpc=1.66.0
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_bom=1.65.1
+version.gax_bom=1.66.0
 # {x-version-update-end}
 # {x-version-update-start:gax-httpjson:current}
-version.gax_httpjson=0.82.1
+version.gax_httpjson=0.83.0
 # {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
@@ -12,7 +12,7 @@ buildscript {
 
 archivesBaseName = "gax-bom"
 
-project.version = "1.65.1" // {x-version-update:gax-bom:current}
+project.version = "1.66.0" // {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.65.1</version><!-- {x-version-update:gax-bom:current} -->
+  <version>1.66.0</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.65.1</version><!-- {x-version-update:gax:current} -->
+        <version>1.66.0</version><!-- {x-version-update:gax:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>1.65.1</version><!-- {x-version-update:gax:current} -->
+        <version>1.66.0</version><!-- {x-version-update:gax:current} -->
 	<classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.65.1</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.66.0</version><!-- {x-version-update:gax-grpc:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.65.1</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.66.0</version><!-- {x-version-update:gax-grpc:current} -->
 	<classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>0.82.1</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.83.0</version><!-- {x-version-update:gax-httpjson:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>0.82.1</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.83.0</version><!-- {x-version-update:gax-httpjson:current} -->
 	<classifier>testlib</classifier>
       </dependency>
     </dependencies>

diff --git 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.65.1" // {x-version-update:gax-grpc:current}
+project.version = "1.66.0" // {x-version-update:gax-grpc:current}
 
 dependencies {
   compile project(':gax'),

diff --git 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.82.1" // {x-version-update:gax-httpjson:current}
+project.version = "0.83.0" // {x-version-update:gax-httpjson:current}
 
 dependencies {
   compile project(':gax'),

diff --git 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.65.1" // {x-version-update:gax:current}
+project.version = "1.66.0" // {x-version-update:gax:current}
 
 dependencies {
   compile libraries['maven.com_google_guava_guava'],

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -14,13 +14,13 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
       <!-- WARNING this is automatically populated by a build script, don't update manually -->
-      <version>1.65.1</version><!-- {x-version-update:gax:current} -->
+      <version>1.66.0</version><!-- {x-version-update:gax:current} -->
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
       <!-- WARNING this is automatically populated by a build script, don't update manually -->
-      <version>1.65.1</version><!-- {x-version-update:gax-grpc:current} -->
+      <version>1.66.0</version><!-- {x-version-update:gax-grpc:current} -->
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>

diff --git a/versions.txt b/versions.txt
@@ -1,8 +1,8 @@
 # Format:
 # module:released-version:current-version
 
-gax:1.65.1:1.65.1
-gax-bom:1.65.1:1.65.1
-gax-grpc:1.65.1:1.65.1
-gax-httpjson:0.82.1:0.82.1
-benchmark:0.67.1:0.67.1
+gax:1.66.0:1.66.0
+gax-bom:1.66.0:1.66.0
+gax-grpc:1.66.0:1.66.0
+gax-httpjson:0.83.0:0.83.0
+benchmark:0.68.0:0.68.0