From 2d74ed177d097d4b1d05eb2f343832edb285b61b Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Sun, 29 Dec 2024 22:44:07 +0100 Subject: [PATCH] build(deps): Bump grpc-java from 1.66.0 to 1.69.0 --- WORKSPACE.bazel | 15 +++- maven_install.json | 180 +++++++++++++++++++++++---------------------- 2 files changed, 103 insertions(+), 92 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 4e31b181b..853d9cff6 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -20,7 +20,7 @@ register_toolchains("//tools/java_toolchain:repository_default_java_toolchain_de load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -GRPC_JAVA_VERSION = "1.66.0" +GRPC_JAVA_VERSION = "1.69.0" RDF4J_VERSION = "5.0.2" @@ -32,7 +32,7 @@ RDF4J_VERSION = "5.0.2" # (AKA https://github.com/grpc/grpc-java/issues/9559) is available. http_archive( name = "io_grpc_grpc_java", - sha256 = "28a10159fb36939bf09ce158ac0a5dbadf52ce2a3a47f5c1356b5fdbb9423373", + sha256 = "3874ac920ad86b7a096e94c0fb17e52a9ed00982bf1fb44910d63bd9345a2fe4", strip_prefix = "grpc-java-%s" % GRPC_JAVA_VERSION, url = "https://github.com/grpc/grpc-java/archive/refs/tags/v%s.zip" % GRPC_JAVA_VERSION, ) @@ -82,8 +82,15 @@ rules_jvm_external_setup() load("@rules_jvm_external//:defs.bzl", "maven_install") # This is required so that we can use duplicate_version_warning (below) and fixes -# the "com.google.guava:guava has multiple versions 32.1.3-android, 33.0.0-jre" problem. -IO_GRPC_GRPC_JAVA_ARTIFACTS_WITHOUT_GUAVA = [item for item in IO_GRPC_GRPC_JAVA_ARTIFACTS if ((item != "com.google.guava:guava:33.2.1-android") and not item.startswith("com.google.errorprone:error_prone_annotations"))] +# the "com.google.guava:guava has multiple versions x.y.z-android, x.y.z-jre" problem. +IO_GRPC_GRPC_JAVA_ARTIFACTS_WITHOUT_GUAVA = [ + item + for item in IO_GRPC_GRPC_JAVA_ARTIFACTS + # NOTE: The version number hard-coded here need to be adapted when dependencies are bumped. + # TODO Move this Guava version to a variable... + if ((item != "com.google.guava:guava:33.3.1-android") and + not item.startswith("com.google.errorprone:error_prone_annotations")) +] maven_install( artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS_WITHOUT_GUAVA + [ diff --git a/maven_install.json b/maven_install.json index b43e99382..4654cd147 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,13 +1,14 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1152795491, - "__RESOLVED_ARTIFACTS_HASH": -1090637732, + "__INPUT_ARTIFACTS_HASH": 1206088059, + "__RESOLVED_ARTIFACTS_HASH": 182688122, "conflict_resolution": { "com.fasterxml.jackson.core:jackson-databind:2.13.5": "com.fasterxml.jackson.core:jackson-databind:2.17.2", "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2", "com.google.truth:truth:1.4.2": "com.google.truth:truth:1.4.4", "com.squareup.okio:okio:2.10.0": "com.squareup.okio:okio:3.6.0", - "io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1" + "io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1", + "org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0" }, "artifacts": { "ch.vorburger.exec:exec": { @@ -138,24 +139,24 @@ }, "com.google.api.grpc:proto-google-common-protos": { "shasums": { - "jar": "ee9c751f06b112e92b37f75e4f73a17d03ef2c3302c6e8d986adbcc721b63cb0", - "sources": "fe7831089c20c097ef540b61ff90d12cfe0fbc57c2bbe21a3e8fa96bb0085d99" + "jar": "43ec7807459aaa4012e838a1be4ef2d590cf233305da60af5b54f08ec8cf2302", + "sources": "6954ee2057e201eda9584edcbb9e781649e15a808adaef87942f1f539a2f6551" }, - "version": "2.29.0" + "version": "2.48.0" }, "com.google.auth:google-auth-library-credentials": { "shasums": { - "jar": "d982eda20835e301dcbeec4d083289a44fdd06e9a35ce18449054f4ffd3f099f", - "sources": "6151c76a0d9ef7bebe621370bbd812e927300bbfe5b11417c09bd29a1c54509b" + "jar": "5dbf1207d14e093f67995f457cb69c3cf49bed1364150b23465e09acada65d96", + "sources": "edc2499f614f01050b044b046789d28079302e8f9af141bca00ba71188b7c5e4" }, - "version": "1.23.0" + "version": "1.24.1" }, "com.google.auth:google-auth-library-oauth2-http": { "shasums": { - "jar": "f2bf739509b5f3697cb1bf33ff9dc27e8fc886cedb2f6376a458263f793ed133", - "sources": "f4c00cac4c72cd39d0957dffad5d19c4ad63185e4fbec3d6211fb0cf3f5fdb6f" + "jar": "88a75cd4448ea2f3b46e48a89497a6cf0985a5fa4e21274af4940e07f59f6eaf", + "sources": "0c91f45329bb9acc5db7aca708ae57f4501e1ce6b18c1c7aa5967b19b7e57294" }, - "version": "1.23.0" + "version": "1.24.1" }, "com.google.auto.service:auto-service": { "shasums": { @@ -243,17 +244,17 @@ }, "com.google.http-client:google-http-client": { "shasums": { - "jar": "60aca7428c5a1ff3655b70541a98ff3d70dded48ac1324dae1af39f1b61914af", - "sources": "3d397d060e9ae0e8a71721ff836ed629ee66c81b9326e4f2a5aa892ae8c3a3f9" + "jar": "390618d7b51704240b8fd28e1230fa35d220f93f4b4ba80f63e38db00dacb09e", + "sources": "9419537a2973195619b43f76be92388b1e37a785503717d76afff5764884ebc2" }, - "version": "1.43.3" + "version": "1.44.2" }, "com.google.http-client:google-http-client-gson": { "shasums": { - "jar": "e31a4edcb9c83954a2587e14fa2f3f8f4aad56152381b3321a3bd0bcae03fa26", - "sources": "e6f65d3459b5f8907f3a29c299916db1efd56883f8ce45af1b0f278036181af5" + "jar": "1119b66685195310375b717de2215d6c5d14fa8ed9f57e07b4fecd461e7b9db7", + "sources": "3bac061bdac5c5c67713b8db689a1d6342afcb07a87c2f7285dffc1729fc4825" }, - "version": "1.43.3" + "version": "1.44.2" }, "com.google.j2objc:j2objc-annotations": { "shasums": { @@ -453,52 +454,52 @@ }, "io.grpc:grpc-api": { "shasums": { - "jar": "8fadb1f4f0a18971c082497f34cbb78a51897ca8af4b212aa2a99c7de9ad995c", - "sources": "6d0df2072702a1badfaaab3cce14f2629d4eaec85cf696347561bec19736ce8c" + "jar": "ffa9af0f76fb08b4dbcade9dba9805af6b216980cafa0756b4d97b6029077506", + "sources": "e175c53977b6899c7be5a2e2007f79996d46c5512e852975cb4af663ffd84db9" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-context": { "shasums": { - "jar": "7b7521aa2116014d08dc08825e13d70eac8eb646d09dd44980b6f4d1883e6713", - "sources": "c4638347d6d0964eb7a3987cd9d943554cbdf5e334b26f6d119dfc0e85fb1899" + "jar": "e682d036496d4429442955b615b931ee65486bd318d0ab13d9937d11cb36ffd5", + "sources": "a2ac5373e3f1021ec3f936b7c994b5fb94b391a8db24333825a0c081163d9efd" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-core": { "shasums": { - "jar": "136b7a7c411a45089dc2b26f0f032f4ae466d9b5d3bfe3a513421d6f35d2c2bd", - "sources": "24f39ed04710125c713b3ffe9280e19ff5772697f3bf69baaa9ba964d022a5cf" + "jar": "817fbb87f8119c40f2b276f49340effd880e7e574095d3a8fb798a94e3f66652", + "sources": "a5de00973cc68fcbb0a79d50f7bc4d19c6846c6eb5bf9082b8a5cf1615992349" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-inprocess": { "shasums": { - "jar": "e5de67add0c4d4b96ea945b52bb7d43c08f0e9969afd3d37067eaf04ebb63416", - "sources": "364b3545a61a3d0178235f4fc0d55231e99c12cf5902135dcd94db411e87e1c9" + "jar": "d057ecd320020baad0f672d1ca80e354d7769960f81c6a094f1399085c93911f", + "sources": "3336e47ecd05bd0a4a7f188cfbfb9affed511be4bc5ae3a617eebb911aeae462" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-netty": { "shasums": { - "jar": "77f7c0ccd77df1d62a8508fef6676fa80b388e3ef4f67fceb99a7d5eaa73b7c9", - "sources": "248ed3b90dd43c4c4678b9492ae11f8d6dbe21cb0e8086fd0d01afb84e71a87f" + "jar": "355c0b87155a765bf9c59b4412c13a2890bde28c4ee85a3c6ca9b0d885652c95", + "sources": "b98370f7871bda3c57d7bae4a47196e5f85884632f4116344b78fc124b146bea" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-stub": { "shasums": { - "jar": "39a32906304c7f442dfa56dfc6ea88887287fb398621d549e15dfdeaffae194a", - "sources": "804366607d379261778d2373b5b23375f63666acfdb325fdd789081ee635edf3" + "jar": "d515b3680ddc5dd7a25b0db3a72ced719a9a6006dca7810afe354069cc5908fe", + "sources": "23c093d06b35c3d4325538e533986331c0fab1352694ab5cf907be35f22d88b4" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.grpc:grpc-util": { "shasums": { - "jar": "c41b69a730bbc8605351a9e1a0dd7bd9283333c48c00234ba30b4d796b38bbdd", - "sources": "70b40671dca4d1ee0e346699ad61b6af76f399150c527278638de98b176d97e6" + "jar": "22b47e755dc271c1738327162366599c4faf25ae1d1356455d6191d472841b94", + "sources": "89aaa0fcadd5ebdb423a75c1efad108301a772ab4173da64f5be4f91d3b77812" }, - "version": "1.66.0" + "version": "1.69.0" }, "io.gsonfire:gson-fire": { "shasums": { @@ -530,113 +531,113 @@ }, "io.netty:netty-buffer": { "shasums": { - "jar": "462874b44ee782fbefec64078cda6eb8e7bf9f0e0af71a928ef4c1f2d564f7ee", - "sources": "7954d2b274d418d844a573a4712b18a7c40b85f94284f5429cb32e6408394d60" + "jar": "46d74e79125aacc055c31f18152fdc5d4a569aa8d60091203d0baa833973ac3c", + "sources": "b4e7d5c0d3cbbed2bfc2c26922e6e8989330e7d2ec653a39ab40635d24ee5850" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-codec": { "shasums": { - "jar": "180a01ed67af399602e24ff1c32864e7f57f57c4a0fa5e9ab3fe9b0e5e9cf051", - "sources": "33a18f8618c81b251e58d2cc94445bddf7bf0c84856213febf13c2b42fd5966a" + "jar": "9eccce9a8d827bb8ce84f9c3183fec58bd1c96a51010cf711297746034af3701", + "sources": "da6a146add7a60a96ee363d59db2fc79d4858d0c73ec9afe995a13f4bbd4a110" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-codec-http": { "shasums": { - "jar": "326811d249cb0e5555e78e026e877834e792261c38f0666d80464426695d9590", - "sources": "6f1489ef88b5dc670addd06180e1f5f3bf86b9fd01758d8200a4f7307ddf77d1" + "jar": "dc0d6af5054630a70ff0ef354f20aa7a6e46738c9fc5636ed3d4fe77e38bd48d", + "sources": "b03b477f0607bbb6693ea1de41e4db3dbec1de616bea6feeba096fbf9fca1209" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-codec-http2": { "shasums": { - "jar": "23b4a74350f4cf8d41b93fb93d52b5050667d8d53fffc385672c86eab83b8749", - "sources": "10ddecd4de1351a4bdfa4ed6a113a47f808edfdd54b83cd477c4fb27e935f78e" + "jar": "b546c75445a487bb7bcd5a94779caecce33582cf7be31b8b39fc0e65b1ee26fc", + "sources": "555279bfb4ddd1fede5afaced0973bc763a6b643de7c6b006280f79d92e30889" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-codec-socks": { "shasums": { - "jar": "608a453b90f8384ba4efcdc6db7f899a1f10b9ea1890954696e6cfac45ff1ba9", - "sources": "a2f57ddadc95f8d06ce8b1713a30e72aab6acf9a20fba7eb0e30b7df9e6ec256" + "jar": "976052a3c9bb280bc6d99f3a29e6404677cf958c3de05b205093d38c006b880c", + "sources": "aedb4ffb91584e1b60d4c64f96c6033c204fcbca64b97ebf895df05ec6700dd3" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-common": { "shasums": { - "jar": "d2908301f1ac6f2910900742473c15d701765d3d4467acdb1eebb9df3aa82885", - "sources": "cb67f6cfc3ee2c9f0966ad244197e0c23a9c1c615aec764afd3793316766c67c" + "jar": "9851ec66548b9e0d41164ce98943cdd4bbe305f68ddbd24eae52e4501a0d7b1a", + "sources": "ca8799963fdfc712f0b87120f1b6a5e728444eeb41feaf2ecca52435b03bf099" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-handler": { "shasums": { - "jar": "0e10e584c2e7fdf7f4804e14760ed987003f1b62ab982f62eaf13a9892793d3a", - "sources": "c591995af266161769863298dfe1aa2ff634c25abef33e710a1c9f2ef707fc20" + "jar": "d5a08d7de364912e4285968de4d4cce3f01da4bb048d5c6937e5f2af1f8e148a", + "sources": "3e8186c75527436a7fb99d0686cf138676df9498724aa787f7894d2ad6c4caa6" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-handler-proxy": { "shasums": { - "jar": "686dbc2e61407f216d6cb267dd7954896f851dd34b58be3e757c5a89f20a5e67", - "sources": "40b1123cfaec444459e1184af882c994cb7c6a9b21cc7f4c98e902e2ee628f10" + "jar": "ad54ab4fe9c47ef3e723d71251126db53e8db543871adb9eafc94446539eff52", + "sources": "b1411f4864e9f76d435aca6adfe93bf8745718e1c0e1b7d73d0d1926e2e92a8a" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-resolver": { "shasums": { - "jar": "c42c481c776e9d367a45cc3a67a06f65897d280334eb30b2362b8c55b7523f4f", - "sources": "5e8cd49d0804f2ec6c04f16f46cc1a6ebfb00745177d740c23a51b9913c28fc8" + "jar": "a2e9b4ae7caa92fc5bd747e11d1dec20d81b18fc00959554302244ac5c56ce70", + "sources": "792d057545fc3f1aa72c5571f6caf44d4166527322003cfb7b621c15bcd8d9e7" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-tcnative-boringssl-static": { "shasums": { - "jar": "b6f974972c44cd6f9cecabc255290286faac40b6393c66c3c3c0db7f421cc28e", - "linux-aarch_64": "3614395218ae379cec22ccaa089c4f27b9329a660e0d53c93e7cb12b7a2cee46", - "linux-x86_64": "4ff9d14f1ec6ccee35b78f53a6f3d9c7c54535aa2a76138311c2f619c5e150e1", - "osx-aarch_64": "58e0302c9fde3db984c3ff7ee7ec7159dc0320bdb91533cc290e12e40911cd1a", - "osx-x86_64": "fcfea887f4f0802d363c699b444d504b7109a7cb198ae6845eeff63745e5b0ba", + "jar": "bb8349bda3ba043c09f5c732c5b2d47f18ac4dafce248cb850cfbd0599e5ba01", + "linux-aarch_64": "9fd6f905bce8472ca9e24f8728962b91b9319c84fcbb618ab87f6b9774c063ed", + "linux-x86_64": "45ce55b49f4c16de65278d9f4608a9f06460f290f1e3b4fc3f2452866519d618", + "osx-aarch_64": "834d3df2f9eb3aa08d49326409c454e2f9c75a49c3f0454b7cab64619b1614dc", + "osx-x86_64": "3a16b7ca4e891f9ad51e9ae9eb167c5e81d7f55a0001edf2471b693f4f8c12e1", "sources": null, - "windows-x86_64": "17cd2fa3c63b7ed23edea01c945e55cb7baed1faa0f553732c3f5f56da90b3e0" + "windows-x86_64": "855d930366fae9bec3872569975959e1e31dd752dffc9f925eae8436f933e11a" }, - "version": "2.0.61.Final" + "version": "2.0.65.Final" }, "io.netty:netty-tcnative-classes": { "shasums": { - "jar": "9b970eccd844bfae175a5cbbf7bf94891894add06d6ccbe1abf2250cd64080f6", - "sources": "b542370be6ad4d723e0156fc41ffc0db9efa308330e71aec18cdeb0dfc3a44d0" + "jar": "84ef0241ada1b4ed92785e10c16edbeb063348959a3b0ef740712badd09fa128", + "sources": "054c5f7b4228630227cdf312301a0e9c4cf34b33a1d1bbd842556ea5d3cbf465" }, - "version": "2.0.61.Final" + "version": "2.0.65.Final" }, "io.netty:netty-transport": { "shasums": { - "jar": "b1deeceedab3734cdb959c55f4be5ab4a667a8aed59121ff93763f49470f5470", - "sources": "3c90fa8b30f71f02aff109d06931819ae54b16a3d61a15dfa9e24161057d57c4" + "jar": "a42dd68390ca14b4ff2d40628a096c76485b4adb7c19602d5289321a0669e704", + "sources": "8b30a2af314e828040b7736f2134192fcf932e9f34756c6e6168753dfae32cb5" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-transport-classes-epoll": { "shasums": { - "jar": "9abc4b17b1212b33666eae4e8013d0bb78a9a2bcd0a9a621b9bd06a7e5fc0050", - "sources": "f6e36b8a08e593f4985210f90230ae4d4927342e372a5f60ca1d5ee6f4013d2c" + "jar": "8e59cec67de3b9f8afe4eccec11ed8ce4423948eeaf4ca512bf69324052ed510", + "sources": "77ddaafe69b00258c8c342c98b76a7fef14e0f91124780b24e49ee49be9b896a" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-transport-native-epoll": { "shasums": { - "linux-x86_64": "a108fb47babb7678b5b2abb1fc8b34510bd2f705faa450447860647f2de4ebaa", - "sources": "c6baf02f65e295baa8e4bfadaa2443b62187b6af4040cef165eaba0061c284ad" + "linux-x86_64": "dcd60c6b3076af307ab877201a136e1f1066c9be809aaed827391a23909f9135", + "sources": "156c8e44e9034fc82eff318b125391f456ae519c06c6a2001a4b20c0bd5abd6b" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.netty:netty-transport-native-unix-common": { "shasums": { - "jar": "5d888230a04c4a3e647c64e933cefb64fd49056f969bfb734c8a3fcedf0bea8a", - "sources": "28c71aa6c4f36cd8cc472142c858f324f8a23b85150a443e742c8814f46bb596" + "jar": "51717bb7471141950390c6713a449fdb1054d07e60737ee7dda7083796cdee48", + "sources": "05c3989c61518b7dd6225a445401d1e8a9508a0d99a839847dac373e305e784d" }, - "version": "4.1.100.Final" + "version": "4.1.110.Final" }, "io.opencensus:opencensus-api": { "shasums": { @@ -1498,6 +1499,7 @@ "com.google.errorprone:error_prone_annotations", "com.google.guava:guava", "com.google.j2objc:j2objc-annotations", + "io.grpc:grpc-context", "io.opencensus:opencensus-api", "io.opencensus:opencensus-contrib-http-util", "org.apache.httpcomponents:httpclient", @@ -2368,6 +2370,7 @@ ], "com.google.api.grpc:proto-google-common-protos": [ "com.google.api", + "com.google.apps.card.v1", "com.google.cloud", "com.google.cloud.audit", "com.google.cloud.location", @@ -2376,6 +2379,7 @@ "com.google.longrunning", "com.google.rpc", "com.google.rpc.context", + "com.google.shopping.type", "com.google.type" ], "com.google.auth:google-auth-library-credentials": [