From 9997cb46d1f5df9fb83347e28ee1890b80e192f9 Mon Sep 17 00:00:00 2001 From: Martin Traverse Date: Tue, 31 Oct 2023 18:53:52 +0000 Subject: [PATCH] Update dependency and license info for Guava --- dev/compliance/permitted-licenses.json | 4 ++++ gradle/base-java.gradle | 1 + gradle/versions.gradle | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/compliance/permitted-licenses.json b/dev/compliance/permitted-licenses.json index d156ab8ab..2d9b80701 100644 --- a/dev/compliance/permitted-licenses.json +++ b/dev/compliance/permitted-licenses.json @@ -46,6 +46,10 @@ "moduleName": "com.google.guava:guava-bom", "moduleLicense": null }, + { + "moduleName": "com.google.guava:guava-parent", + "moduleLicense": null + }, { "moduleName": "io.netty:netty-bom", "moduleLicense": null diff --git a/gradle/base-java.gradle b/gradle/base-java.gradle index ae20f2677..17fd40d60 100644 --- a/gradle/base-java.gradle +++ b/gradle/base-java.gradle @@ -25,6 +25,7 @@ dependencies { implementation platform(group: "io.grpc", name: "grpc-bom", version: "${grpc_version}") implementation platform(group: "com.google.protobuf", name: "protobuf-bom", version: "${proto_version}") implementation platform(group: "com.google.guava", name: "guava-bom", version: "${guava_version}") + implementation platform(group: "com.google.guava", name: "guava-parent", version: "${guava_version}") implementation platform(group: "com.fasterxml.jackson", name: "jackson-bom", version: "${jackson_version}") implementation platform(group: "org.slf4j", name: "slf4j-parent", version: "${slf4j_version}") implementation platform(group: "org.apache.logging.log4j", name: "log4j-bom", version: "${log4j_version}") diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 441a0c2a6..d02597e71 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -26,7 +26,7 @@ ext { // Core platform technologies netty_version = '4.1.100.Final' - guava_version = '32.0.1-jre' + guava_version = '32.1.3-jre' proto_version = '3.23.2' grpc_version = '1.59.0' gapi_version = '2.20.0'