Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit 2da663e

Browse files
gcf-merge-on-green[bot]gcf-merge-on-green[bot]
authored
Merge branch 'master' into update-deps
2 parents 0860ac5 + 84c6a50 commit 2da663e

10 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎benchmark/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project.version = "0.63.0" // {x-version-update:benchmark:current}
1+
project.version = "0.63.1-SNAPSHOT" // {x-version-update:benchmark:current}
22

33
buildscript {
44
repositories {

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ apply plugin: 'com.github.sherter.google-java-format'
2424
apply plugin: 'io.codearte.nexus-staging'
2525

2626
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
27-
project.version = "1.61.0" // {x-version-update:gax:current}
27+
project.version = "1.61.1-SNAPSHOT" // {x-version-update:gax:current}
2828

2929
ext {
3030
// Project names not used for release

‎dependencies.properties‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
# Versions of oneself
1010
# {x-version-update-start:gax:current}
11-
version.gax=1.61.0
11+
version.gax=1.61.1-SNAPSHOT
1212
# {x-version-update-end}
1313
# {x-version-update-start:gax:current}
14-
version.gax_grpc=1.61.0
14+
version.gax_grpc=1.61.1-SNAPSHOT
1515
# {x-version-update-end}
1616
# {x-version-update-start:gax:current}
17-
version.gax_bom=1.61.0
17+
version.gax_bom=1.61.1-SNAPSHOT
1818
# {x-version-update-end}
1919
# {x-version-update-start:gax-httpjson:current}
20-
version.gax_httpjson=0.78.0
20+
version.gax_httpjson=0.78.1-SNAPSHOT
2121
# {x-version-update-end}
2222

2323
# 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
7272
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
7373

7474
# Testing maven artifacts
75-
maven.junit_junit=junit:junit:4.13.1
75+
maven.junit_junit=junit:junit:4.13.2
7676
maven.org_mockito_mockito_core=org.mockito:mockito-core:2.28.2
7777
maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3
78-
maven.com_google_truth_truth=com.google.truth:truth:1.0.1
78+
maven.com_google_truth_truth=com.google.truth:truth:1.1.2
7979
maven.com_googlecode_java_diff_utils_diffutils=com.googlecode.java-diff-utils:diffutils:1.3.0
8080
maven.net_bytebuddy_byte_buddy=net.bytebuddy:byte-buddy:1.9.7
8181
maven.org_objenesis_objenesis=org.objenesis:objenesis:2.6

‎gax-bom/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212

1313
archivesBaseName = "gax-bom"
1414

15-
project.version = "1.61.0" // {x-version-update:gax-bom:current}
15+
project.version = "1.61.1-SNAPSHOT" // {x-version-update:gax-bom:current}
1616

1717
ext {
1818
mavenJavaDir = "$project.buildDir/publications/mavenJava"

‎gax-bom/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.api</groupId>
55
<artifactId>gax-bom</artifactId>
6-
<version>1.61.0</version><!-- {x-version-update:gax-bom:current} -->
6+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax-bom:current} -->
77
<packaging>pom</packaging>
88
<name>GAX (Google Api eXtensions) for Java</name>
99
<description>Google Api eXtensions for Java</description>
@@ -33,34 +33,34 @@
3333
<dependency>
3434
<groupId>com.google.api</groupId>
3535
<artifactId>gax</artifactId>
36-
<version>1.61.0</version><!-- {x-version-update:gax:current} -->
36+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
3737
</dependency>
3838
<dependency>
3939
<groupId>com.google.api</groupId>
4040
<artifactId>gax</artifactId>
41-
<version>1.61.0</version><!-- {x-version-update:gax:current} -->
41+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
4242
<classifier>testlib</classifier>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.google.api</groupId>
4646
<artifactId>gax-grpc</artifactId>
47-
<version>1.61.0</version><!-- {x-version-update:gax-grpc:current} -->
47+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
4848
</dependency>
4949
<dependency>
5050
<groupId>com.google.api</groupId>
5151
<artifactId>gax-grpc</artifactId>
52-
<version>1.61.0</version><!-- {x-version-update:gax-grpc:current} -->
52+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
5353
<classifier>testlib</classifier>
5454
</dependency>
5555
<dependency>
5656
<groupId>com.google.api</groupId>
5757
<artifactId>gax-httpjson</artifactId>
58-
<version>0.78.0</version><!-- {x-version-update:gax-httpjson:current} -->
58+
<version>0.78.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
5959
</dependency>
6060
<dependency>
6161
<groupId>com.google.api</groupId>
6262
<artifactId>gax-httpjson</artifactId>
63-
<version>0.78.0</version><!-- {x-version-update:gax-httpjson:current} -->
63+
<version>0.78.1-SNAPSHOT</version><!-- {x-version-update:gax-httpjson:current} -->
6464
<classifier>testlib</classifier>
6565
</dependency>
6666
</dependencies>

‎gax-grpc/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax-grpc"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "1.61.0" // {x-version-update:gax-grpc:current}
4+
project.version = "1.61.1-SNAPSHOT" // {x-version-update:gax-grpc:current}
55

66
dependencies {
77
compile project(':gax'),

‎gax-httpjson/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax-httpjson"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "0.78.0" // {x-version-update:gax-httpjson:current}
4+
project.version = "0.78.1-SNAPSHOT" // {x-version-update:gax-httpjson:current}
55

66
dependencies {
77
compile project(':gax'),

‎gax/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
archivesBaseName = "gax"
22

33
// TODO: Populate this from dependencies.properties version property (for proper Gradle-Bazel sync)
4-
project.version = "1.61.0" // {x-version-update:gax:current}
4+
project.version = "1.61.1-SNAPSHOT" // {x-version-update:gax:current}
55

66
dependencies {
77
compile libraries['maven.com_google_guava_guava'],

‎samples/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<groupId>com.google.api</groupId>
1515
<artifactId>gax</artifactId>
1616
<!-- WARNING this is automatically populated by a build script, don't update manually -->
17-
<version>1.61.0</version><!-- {x-version-update:gax:current} -->
17+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
1818
</dependency>
1919
<dependency>
2020
<groupId>com.google.api</groupId>
2121
<artifactId>gax-grpc</artifactId>
2222
<!-- WARNING this is automatically populated by a build script, don't update manually -->
23-
<version>1.61.0</version><!-- {x-version-update:gax-grpc:current} -->
23+
<version>1.61.1-SNAPSHOT</version><!-- {x-version-update:gax-grpc:current} -->
2424
</dependency>
2525
<dependency>
2626
<groupId>com.google.auto.value</groupId>

‎versions.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Format:
22
# module:released-version:current-version
33

4-
gax:1.61.0:1.61.0
5-
gax-bom:1.61.0:1.61.0
6-
gax-grpc:1.61.0:1.61.0
7-
gax-httpjson:0.78.0:0.78.0
8-
benchmark:0.63.0:0.63.0
4+
gax:1.61.0:1.61.1-SNAPSHOT
5+
gax-bom:1.61.0:1.61.1-SNAPSHOT
6+
gax-grpc:1.61.0:1.61.1-SNAPSHOT
7+
gax-httpjson:0.78.0:0.78.1-SNAPSHOT
8+
benchmark:0.63.0:0.63.1-SNAPSHOT

0 commit comments

Comments
 (0)