Merge branch 'master' into update-deps

googleapis · Feb 25, 2021 · 2da663e · 2da663e
2 parents 0860ac5 + 84c6a50
commit 2da663e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
@@ -1,4 +1,4 @@
-project.version = "0.63.0" // {x-version-update:benchmark:current}
+project.version = "0.63.1-SNAPSHOT" // {x-version-update:benchmark:current}
 
 buildscript {
     repositories {

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.61.0" // {x-version-update:gax:current}
+project.version = "1.61.1-SNAPSHOT" // {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.61.0
+version.gax=1.61.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_grpc=1.61.0
+version.gax_grpc=1.61.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax:current}
-version.gax_bom=1.61.0
+version.gax_bom=1.61.1-SNAPSHOT
 # {x-version-update-end}
 # {x-version-update-start:gax-httpjson:current}
-version.gax_httpjson=0.78.0
+version.gax_httpjson=0.78.1-SNAPSHOT
 # {x-version-update-end}
 
 # Versions for dependencies which actual artifacts differ between Bazel and Gradle.
@@ -72,10 +72,10 @@ maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-snif
 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
 
 # Testing maven artifacts
-maven.junit_junit=junit:junit:4.13.1
+maven.junit_junit=junit:junit:4.13.2
 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2
 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3
-maven.com_google_truth_truth=com.google.truth:truth:1.0.1
+maven.com_google_truth_truth=com.google.truth:truth:1.1.2
 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.9.7
 maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6
diff --git a/gax-bom/build.gradle b/gax-bom/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 archivesBaseName = "gax-bom"
 
-project.version = "1.61.0" // {x-version-update:gax-bom:current}
+project.version = "1.61.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.61.0</version><!-- {x-version-update:gax-bom:current} -->
+  <version>1.61.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.61.0</version><!-- {x-version-update:gax:current} -->
+        <version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax</artifactId>
-        <version>1.61.0</version><!-- {x-version-update:gax:current} -->
+        <version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
 	<classifier>testlib</classifier>
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.61.0</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-grpc</artifactId>
-        <version>1.61.0</version><!-- {x-version-update:gax-grpc:current} -->
+        <version>1.61.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.78.0</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.78.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>gax-httpjson</artifactId>
-        <version>0.78.0</version><!-- {x-version-update:gax-httpjson:current} -->
+        <version>0.78.1-SNAPSHOT</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.61.0" // {x-version-update:gax-grpc:current}
+project.version = "1.61.1-SNAPSHOT" // {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.78.0" // {x-version-update:gax-httpjson:current}
+project.version = "0.78.1-SNAPSHOT" // {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.61.0" // {x-version-update:gax:current}
+project.version = "1.61.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
@@ -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.61.0</version><!-- {x-version-update:gax:current} -->
+      <version>1.61.1-SNAPSHOT</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.61.0</version><!-- {x-version-update:gax-grpc:current} -->
+      <version>1.61.1-SNAPSHOT</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.61.0:1.61.0
-gax-bom:1.61.0:1.61.0
-gax-grpc:1.61.0:1.61.0
-gax-httpjson:0.78.0:0.78.0
-benchmark:0.63.0:0.63.0
+gax:1.61.0:1.61.1-SNAPSHOT
+gax-bom:1.61.0:1.61.1-SNAPSHOT
+gax-grpc:1.61.0:1.61.1-SNAPSHOT
+gax-httpjson:0.78.0:0.78.1-SNAPSHOT
+benchmark:0.63.0:0.63.1-SNAPSHOT