Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): Bump guava version to 32.1.1-jre #1832

Merged
merged 2 commits into from
Jul 7, 2023
Merged

build(deps): Bump guava version to 32.1.1-jre #1832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7623135
chore: Bump guava version to 32.1.1-jre
lqiu96 Jul 6, 2023
c199181
chore: Add guava to gradle template
lqiu96 Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gapic-generator-java-pom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<grpc.version>1.55.3</grpc.version>
<google.auth.version>1.19.0</google.auth.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.0.1-jre</guava.version>
<guava.version>32.1.1-jre</guava.version>
<!-- On next protobuf upgrade (to 3.23.3 or higher),
remove temporarily j2objc-annotations exclusions from protobuf-java-util dependencies.
For context: https://github.com/googleapis/sdk-platform-java/pull/1791-->
Expand Down
2 changes: 1 addition & 1 deletion gapic-generator-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>32.0.1-jre</version>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gax-java/dependencies.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ maven.io_netty_netty_transport_native_unix_common=io.netty:netty-transport-nativ
maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.26.0
maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53
maven.com_google_code_gson_gson=com.google.code.gson:gson:2.10.1
maven.com_google_guava_guava=com.google.guava:guava:32.0.1-jre
maven.com_google_guava_guava=com.google.guava:guava:32.1.1-jre
maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.12.0
maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
Expand Down
1 change: 0 additions & 1 deletion java-common-protos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-iam-parent</site.installationModule>
<junit.version>4.13.2</junit.version>
<guava.version>32.0.1-jre</guava.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 2 additions & 0 deletions rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ dependencies {
testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
testImplementation '{{maven.junit_junit}}'
api '{{maven.com_google_guava_guava}}'


// TODO: remove when dropping Java 8 support.
// https://github.com/googleapis/gapic-generator-java/issues/888
Expand Down
1 change: 1 addition & 0 deletions rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dependencies {
testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
testImplementation '{{maven.junit_junit}}'
api '{{maven.com_google_guava_guava}}'

// TODO: remove when dropping Java 8 support.
// https://github.com/googleapis/gapic-generator-java/issues/888
Expand Down
1 change: 1 addition & 0 deletions rules_java_gapic/resources/gradle/client_rest.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
api 'com.google.api:gax-httpjson:{{version.gax_httpjson}}'
testImplementation 'com.google.api:gax-httpjson:{{version.gax_httpjson}}:testlib'
testImplementation '{{maven.junit_junit}}'
api '{{maven.com_google_guava_guava}}'

// TODO: remove when dropping Java 8 support.
// https://github.com/googleapis/gapic-generator-java/issues/888
Expand Down