From 67b6ead518b8575618b39418559f8494df683d17 Mon Sep 17 00:00:00 2001 From: Mark Elliot <123787712+mark-thm@users.noreply.github.com> Date: Tue, 7 May 2024 12:26:09 -0700 Subject: [PATCH 1/4] Update commons-compress to 1.26.1 Fixes #20269. Update commons-compress to 1.26.1 and swap use of GZIPInputStream to commons-compress' GzipCompressorInputStream, which [deals correctly with concatenated gz files](https://github.com/apache/commons-compress/blob/53c5e19208caaf63946a41d2763cda1f1b7eadc8/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java#L38-L70). Add a test to demonstrate this fixes the ruff extraction (thanks, fmeum) and update all related lockfiles. Closes #22213. PiperOrigin-RevId: 631509796 Change-Id: I4038244bfbdfbace747554e988587663ca580c16 --- MODULE.bazel | 2 +- scripts/bootstrap/compile.sh | 11 ++++++++--- .../lib/bazel/repository/TarBz2Function.java | 3 ++- .../lib/bazel/repository/TarGzFunction.java | 7 ++++--- src/test/shell/bazel/bazel_workspaces_test.sh | 16 ++++++++++++++++ src/test/shell/bazel/jdeps_class_denylist.txt | 6 ++++++ src/test/shell/integration/minimal_jdk_test.sh | 6 +++--- 7 files changed, 40 insertions(+), 11 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 0d7182824d2464..93d7a04de53916 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -148,7 +148,7 @@ maven.install( "javax.inject:javax.inject:1", "net.bytebuddy:byte-buddy:1.14.5", "net.bytebuddy:byte-buddy-agent:1.14.5", - "org.apache.commons:commons-compress:1.20", + "org.apache.commons:commons-compress:1.26.1", "org.apache.commons:commons-pool2:2.8.0", "org.apache.tomcat:tomcat-annotations-api:8.0.5", "org.apache.velocity:velocity:1.7", diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 44aff9fbdfde98..d7e6b9c660ecef 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -154,12 +154,17 @@ function create_deploy_jar() { local output=$3 shift 3 local packages="" - for i in $output/classes/*; do + # Only keep the services subdirectory of META-INF (needed for AutoService). + for i in $output/classes/META-INF/*; do local package=$(basename $i) - if [[ "$package" != "META-INF" ]]; then - packages="$packages -C $output/classes $package" + if [[ "$package" != "services" ]]; then + rm -r "$i" fi done + for i in $output/classes/*; do + local package=$(basename $i) + packages="$packages -C $output/classes $package" + done log "Creating $name.jar..." echo "Main-Class: $mainClass" > $output/MANIFEST.MF diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/TarBz2Function.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/TarBz2Function.java index 8d25d7d0d69ce3..af8c9c4408801f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/TarBz2Function.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/TarBz2Function.java @@ -36,6 +36,7 @@ protected InputStream getDecompressorStream(DecompressorDescriptor descriptor) throws IOException { return new BZip2CompressorInputStream( new BufferedInputStream( - new FileInputStream(descriptor.archivePath().getPathFile()), BUFFER_SIZE)); + new FileInputStream(descriptor.archivePath().getPathFile()), BUFFER_SIZE), + true); } } diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/TarGzFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/TarGzFunction.java index e1e1204d7df684..bb1965956635e9 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/TarGzFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/TarGzFunction.java @@ -19,7 +19,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.zip.GZIPInputStream; +import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; /** * Creates a repository by unarchiving a .tar.gz file. @@ -34,8 +34,9 @@ private TarGzFunction() { @Override protected InputStream getDecompressorStream(DecompressorDescriptor descriptor) throws IOException { - return new GZIPInputStream( + return new GzipCompressorInputStream( new BufferedInputStream( - new FileInputStream(descriptor.archivePath().getPathFile()), BUFFER_SIZE)); + new FileInputStream(descriptor.archivePath().getPathFile()), BUFFER_SIZE), + true); } } diff --git a/src/test/shell/bazel/bazel_workspaces_test.sh b/src/test/shell/bazel/bazel_workspaces_test.sh index 80569299020f62..dc21ce0c7859f9 100755 --- a/src/test/shell/bazel/bazel_workspaces_test.sh +++ b/src/test/shell/bazel/bazel_workspaces_test.sh @@ -504,6 +504,22 @@ function test_extract_default_zip_non_ascii_utf8_file_names() { ensure_output_contains_exactly_once "external/repo/out_dir/Ä_foo_∅.txt" "bar" } +function test_sparse_tar() { + set_workspace_command " + repository_ctx.download_and_extract( + url='https://mirror.bazel.build/github.com/astral-sh/ruff/releases/download/v0.1.6/ruff-aarch64-apple-darwin.tar.gz', + sha256='0b626e88762b16908b3dbba8327341ddc13b37ebe6ec1a0db3f033ce5a44162d', + )" + + build_and_process_log --exclude_rule "repository @@local_config_cc" + + ensure_contains_exactly 'location: .*repos.bzl:3:38' 1 + ensure_contains_atleast 'context: "repository @@repo"' 2 + ensure_contains_exactly 'download_and_extract_event' 1 + + [[ -f "$(bazel info output_base)/external/repo/ruff" ]] || fail "Expected ruff binary to be extracted" +} + function test_file() { set_workspace_command 'repository_ctx.file("filefile.sh", "echo filefile", True)' diff --git a/src/test/shell/bazel/jdeps_class_denylist.txt b/src/test/shell/bazel/jdeps_class_denylist.txt index 4f22e1a9c588ac..26868020ec5335 100644 --- a/src/test/shell/bazel/jdeps_class_denylist.txt +++ b/src/test/shell/bazel/jdeps_class_denylist.txt @@ -9,3 +9,9 @@ ./lombok/javac/java6/CommentCollectingScannerFactory.class ./lombok/javac/java7/CommentCollectingParser.class ./lombok/javac/java7/CommentCollectingScanner.class +./org/apache/commons/compress/harmony/pack200/Pack200Adapter.class +./org/apache/commons/compress/java/util/jar/Pack200.class +./org/apache/commons/compress/java/util/jar/Pack200$Packer.class +./org/apache/commons/compress/java/util/jar/Pack200$Unpacker.class +./org/apache/commons/lang3/concurrent/AbstractCircuitBreaker.class +./org/apache/commons/lang3/concurrent/EventCountCircuitBreaker.class diff --git a/src/test/shell/integration/minimal_jdk_test.sh b/src/test/shell/integration/minimal_jdk_test.sh index 0a9c126a565a98..067bba62f24f6f 100755 --- a/src/test/shell/integration/minimal_jdk_test.sh +++ b/src/test/shell/integration/minimal_jdk_test.sh @@ -42,13 +42,13 @@ export BAZEL_SUFFIX="_jdk_minimal" source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \ || { echo "integration_test_setup.sh not found!" >&2; exit 1; } -# Bazel's install base is < 460MB with minimal JDK and > 460MB with an all +# Bazel's install base is < 465MB with minimal JDK and > 465MB with an all # modules JDK. -function test_size_less_than_460MB() { +function test_size_less_than_465MB() { bazel info ib=$(bazel info install_base) size=$(du -s "$ib" | cut -d\ -f1) - maxsize=$((1024*460)) + maxsize=$((1024*465)) if [ $size -gt $maxsize ]; then echo "$ib was too big:" 1>&2 du -a "$ib" 1>&2 From 3e554c56461f9d192c6ce1c69092ac64b6e86327 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Fri, 26 Apr 2024 01:39:36 -0700 Subject: [PATCH 2/4] Update blake3 to v1.5.1.bcr.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This brings AVX-512 support on Linux. Also adds a JMH benchmark pitting BLAKE3 against SHA2-256. Results with `-f 1` (single JVM fork) and for `hashBytesOneShot` only:
Intel Core i5-8520U, Linux: BLAKE3 has ~8x the throughput on large inputs 
Benchmark                                      (size)    (type)   Mode  Cnt        Score        Error  Units
BazelHashFunctionsBenchmark.hashBytesOneShot        1    BLAKE3  thrpt    5  3897193.109 ± 104089.759  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot        1  SHA2_256  thrpt    5  9773250.840 ± 919565.969  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16    BLAKE3  thrpt    5  4058401.127 ±  69345.382  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16  SHA2_256  thrpt    5  9338184.696 ± 575903.627  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128    BLAKE3  thrpt    5  3883335.405 ± 197131.021  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128  SHA2_256  thrpt    5  3931746.804 ± 111963.068  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      512    BLAKE3  thrpt    5  3165886.130 ± 105001.405  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      512  SHA2_256  thrpt    5  1689377.092 ±  67006.025  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024    BLAKE3  thrpt    5  2137151.012 ±  71425.961  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024  SHA2_256  thrpt    5   971335.403 ±  43622.796  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096    BLAKE3  thrpt    5  1266551.855 ±  77312.865  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096  SHA2_256  thrpt    5   271217.035 ±  15770.310  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384    BLAKE3  thrpt    5   562124.458 ±  47243.736  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384  SHA2_256  thrpt    5    72281.652 ±  10734.186  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576    BLAKE3  thrpt    5     9800.524 ±    230.269  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576  SHA2_256  thrpt    5     1124.542 ±     40.938  ops/s
MacBook Pro with M3 Max, macOS: BLAKE3 has ~0.75x the throughput on large inputs 
Benchmark                                      (size)    (type)   Mode  Cnt         Score        Error  Units
BazelHashFunctionsBenchmark.hashBytesOneShot        1    BLAKE3  thrpt    5   9262824.819 ±  12194.067  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot        1  SHA2_256  thrpt    5  76557346.275 ± 548738.127  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16    BLAKE3  thrpt    5   9254500.192 ±  22138.081  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16  SHA2_256  thrpt    5  81029076.629 ± 748425.519  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128    BLAKE3  thrpt    5   8304084.839 ±  20398.724  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128  SHA2_256  thrpt    5  41460273.256 ± 106648.234  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024    BLAKE3  thrpt    5   3092086.580 ±   1301.806  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024  SHA2_256  thrpt    5   9355426.285 ±   7352.032  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096    BLAKE3  thrpt    5   1670833.346 ±   1809.726  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096  SHA2_256  thrpt    5   2562509.914 ±  29303.110  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384    BLAKE3  thrpt    5    484960.116 ±    146.961  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384  SHA2_256  thrpt    5    658392.748 ±   3364.324  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576    BLAKE3  thrpt    5      7987.472 ±     19.194  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576  SHA2_256  thrpt    5     10380.444 ±      8.804  ops/s
AMD Ryzen 7 PRO 5850U, Windows: BLAKE3 has ~1.5x the throughput on large inputs 
BazelHashFunctionsBenchmark.hashBytesOneShot        1    BLAKE3  thrpt    5   5569003,683 ± 125621,794  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot        1  SHA2_256  thrpt    5  21202138,257 ± 458127,205  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16    BLAKE3  thrpt    5   5539298,273 ±  77378,097  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot       16  SHA2_256  thrpt    5  21618815,496 ± 208338,556  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128    BLAKE3  thrpt    5   5047579,827 ± 118690,537  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      128  SHA2_256  thrpt    5  15806244,512 ± 258848,826  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      512    BLAKE3  thrpt    5   3300538,392 ±  53754,778  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot      512  SHA2_256  thrpt    5   8353887,852 ±  47076,094  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024    BLAKE3  thrpt    5   2062144,084 ±  14557,116  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     1024  SHA2_256  thrpt    5   5120693,705 ±  30640,599  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096    BLAKE3  thrpt    5   1437595,889 ±  34088,637  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot     4096  SHA2_256  thrpt    5   1552307,356 ±  25584,819  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384    BLAKE3  thrpt    5    558955,757 ±   8647,716  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot    16384  SHA2_256  thrpt    5    411619,868 ±   1179,203  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576    BLAKE3  thrpt    5      9576,940 ±    460,875  ops/s
BazelHashFunctionsBenchmark.hashBytesOneShot  1048576  SHA2_256  thrpt    5      6470,682 ±     41,223  ops/s
Closes #22017. PiperOrigin-RevId: 628330908 Change-Id: Ic635027d020d60b79d2e498fcebb0cc42fae712b --- MODULE.bazel | 5 +- .../google/devtools/build/lib/vfs/bazel/BUILD | 27 +++++++ .../bazel/BazelHashFunctionsBenchmark.java | 80 +++++++++++++++++++ .../build/lib/vfs/bazel/java_opt_binary.bzl | 23 ++++++ 4 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/google/devtools/build/lib/vfs/bazel/BazelHashFunctionsBenchmark.java create mode 100644 src/test/java/com/google/devtools/build/lib/vfs/bazel/java_opt_binary.bzl diff --git a/MODULE.bazel b/MODULE.bazel index 93d7a04de53916..7ef8b8412efe3b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,7 +20,7 @@ bazel_dep(name = "platforms", version = "0.0.9") bazel_dep(name = "rules_pkg", version = "0.9.1") bazel_dep(name = "stardoc", version = "0.5.6", repo_name = "io_bazel_skydoc") bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1") -bazel_dep(name = "blake3", version = "1.3.3.bcr.1") +bazel_dep(name = "blake3", version = "1.5.1.bcr.1") bazel_dep(name = "sqlite3", version = "3.42.0.bcr.1") bazel_dep(name = "zlib", version = "1.3") bazel_dep(name = "rules_cc", version = "0.0.9") @@ -31,6 +31,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.0") bazel_dep(name = "rules_python", version = "0.26.0") bazel_dep(name = "rules_testing", version = "0.0.4") bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest") +bazel_dep(name = "with_cfg.bzl", version = "0.2.4") # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR. bazel_dep(name = "remoteapis", version = "") @@ -98,7 +99,7 @@ maven.install( "com.google.http-client:google-http-client:1.42.0", "com.google.http-client:google-http-client-gson:1.42.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.google.turbine:turbine:0.4.0", + "com.google.turbine:turbine:0.5.0", "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", diff --git a/src/test/java/com/google/devtools/build/lib/vfs/bazel/BUILD b/src/test/java/com/google/devtools/build/lib/vfs/bazel/BUILD index f1d34cef6afb5f..4307662b71318c 100644 --- a/src/test/java/com/google/devtools/build/lib/vfs/bazel/BUILD +++ b/src/test/java/com/google/devtools/build/lib/vfs/bazel/BUILD @@ -1,4 +1,5 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test") +load(":java_opt_binary.bzl", "java_opt_binary") package( default_applicable_licenses = ["//:license"], @@ -19,6 +20,9 @@ java_library( [ "*.java", ], + exclude = [ + "BazelHashFunctionsBenchmark.java", + ], ), deps = [ "//src/main/java/com/google/devtools/build/lib/vfs/bazel", @@ -40,3 +44,26 @@ java_test( "//src/test/java/com/google/devtools/build/lib:test_runner", ], ) + +java_opt_binary( + name = "BazelHashFunctionsBenchmark", + srcs = ["BazelHashFunctionsBenchmark.java"], + main_class = "org.openjdk.jmh.Main", + deps = [ + ":jmh", + "//src/main/java/com/google/devtools/build/lib/vfs/bazel", + "//third_party:guava", + ], +) + +java_library( + name = "jmh", + exported_plugins = [":jmh_benchmark_processor"], + exports = ["@maven//:org_openjdk_jmh_jmh_core"], +) + +java_plugin( + name = "jmh_benchmark_processor", + processor_class = "org.openjdk.jmh.generators.BenchmarkProcessor", + deps = ["@maven//:org_openjdk_jmh_jmh_generator_annprocess"], +) diff --git a/src/test/java/com/google/devtools/build/lib/vfs/bazel/BazelHashFunctionsBenchmark.java b/src/test/java/com/google/devtools/build/lib/vfs/bazel/BazelHashFunctionsBenchmark.java new file mode 100644 index 00000000000000..54c1b981d85177 --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/vfs/bazel/BazelHashFunctionsBenchmark.java @@ -0,0 +1,80 @@ +// Copyright 2024 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.devtools.build.lib.vfs.bazel; + +import com.google.common.hash.HashCode; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hashing; +import java.security.SecureRandom; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; + +@BenchmarkMode(Mode.Throughput) +@State(Scope.Benchmark) +public class BazelHashFunctionsBenchmark { + + static { + BazelHashFunctions.ensureRegistered(); + } + + public enum HashFunctionType { + BLAKE3(new Blake3HashFunction()), + SHA2_256(Hashing.sha256()); + + final HashFunction hashFunction; + + HashFunctionType(HashFunction hashFunction) { + this.hashFunction = hashFunction; + } + } + + public enum Size { + B, + KB, + MB, + GB; + + final int bytes; + + Size() { + bytes = 1 << (ordinal() * 10); + } + } + + @Param({"BLAKE3", "SHA2_256"}) + public HashFunctionType type; + + @Param({"B", "KB", "MB", "GB"}) + public Size size; + + private byte[] data; + + @Setup(Level.Iteration) + public void setup() { + data = new byte[size.bytes]; + new SecureRandom().nextBytes(data); + } + + @Benchmark + public HashCode hashBytesOneShot() { + return type.hashFunction.hashBytes(data); + } +} diff --git a/src/test/java/com/google/devtools/build/lib/vfs/bazel/java_opt_binary.bzl b/src/test/java/com/google/devtools/build/lib/vfs/bazel/java_opt_binary.bzl new file mode 100644 index 00000000000000..cac1de2b2bc1a4 --- /dev/null +++ b/src/test/java/com/google/devtools/build/lib/vfs/bazel/java_opt_binary.bzl @@ -0,0 +1,23 @@ +# Copyright 2024 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +A wrapper around java_binary that forces it to be built with `-c opt`. + +This is useful for benchmark targets. +""" + +load("@with_cfg.bzl", "with_cfg") + +java_opt_binary, _java_opt_binary = with_cfg(native.java_binary).set("compilation_mode", "opt").build() From 2165dfacf94c78270fe6728f8038109ce9d42a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= Date: Wed, 8 May 2024 17:33:41 -0400 Subject: [PATCH 3/4] update lockfiles --- MODULE.bazel.lock | 186 +++++++++++++++++++++++++++++++-------------- maven_install.json | 91 ++++++++++++++++++++-- 2 files changed, 216 insertions(+), 61 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index a90fc0501c7768..fd3266f2b3ef67 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "8a870538c6859098c30a59a03523177a26377a76965a0e1a07cdeab366fa3a6b", + "moduleFileHash": "abc450b6a7e59faeb5cff18fbb6b89a2860331f26a4dced5ff2ae306d5b800f1", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -39,7 +39,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 68, + "line": 69, "column": 22 }, "imports": { @@ -83,7 +83,7 @@ "com.google.http-client:google-http-client:1.42.0", "com.google.http-client:google-http-client-gson:1.42.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.google.turbine:turbine:0.4.0", + "com.google.turbine:turbine:0.5.0", "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", @@ -133,7 +133,7 @@ "javax.inject:javax.inject:1", "net.bytebuddy:byte-buddy:1.14.5", "net.bytebuddy:byte-buddy-agent:1.14.5", - "org.apache.commons:commons-compress:1.20", + "org.apache.commons:commons-compress:1.26.1", "org.apache.commons:commons-pool2:2.8.0", "org.apache.tomcat:tomcat-annotations-api:8.0.5", "org.apache.velocity:velocity:1.7", @@ -170,7 +170,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 69, + "line": 70, "column": 14 } }, @@ -185,7 +185,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -200,7 +200,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -215,7 +215,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -230,7 +230,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -245,7 +245,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -260,7 +260,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -275,7 +275,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -290,7 +290,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -305,7 +305,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 195, + "line": 196, "column": 19 } }, @@ -333,7 +333,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 335, + "line": 336, "column": 22 } } @@ -347,7 +347,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 216, + "line": 217, "column": 32 }, "imports": { @@ -387,7 +387,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 250, + "line": 251, "column": 23 }, "imports": {}, @@ -401,7 +401,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 251, + "line": 252, "column": 17 } } @@ -415,7 +415,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 253, + "line": 254, "column": 20 }, "imports": { @@ -433,7 +433,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 254, + "line": 255, "column": 10 } } @@ -447,7 +447,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 265, + "line": 266, "column": 33 }, "imports": { @@ -478,7 +478,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 286, + "line": 287, "column": 29 }, "imports": { @@ -495,7 +495,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 289, + "line": 290, "column": 20 }, "imports": { @@ -514,7 +514,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 290, + "line": 291, "column": 12 } } @@ -528,7 +528,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 302, + "line": 303, "column": 32 }, "imports": { @@ -547,7 +547,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 310, + "line": 311, "column": 31 }, "imports": { @@ -564,7 +564,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 313, + "line": 314, "column": 48 }, "imports": { @@ -581,7 +581,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 357, + "line": 358, "column": 35 }, "imports": { @@ -598,7 +598,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 360, + "line": 361, "column": 42 }, "imports": { @@ -620,7 +620,7 @@ "rules_pkg": "rules_pkg@0.9.1", "io_bazel_skydoc": "stardoc@0.5.6", "zstd-jni": "zstd-jni@1.5.2-3.bcr.1", - "blake3": "blake3@1.3.3.bcr.1", + "blake3": "blake3@1.5.1.bcr.1", "sqlite3": "sqlite3@3.42.0.bcr.1", "zlib": "zlib@1.3", "rules_cc": "rules_cc@0.0.9", @@ -631,6 +631,7 @@ "rules_python": "rules_python@0.26.0", "rules_testing": "rules_testing@0.0.4", "com_google_googletest": "googletest@1.14.0", + "with_cfg.bzl": "with_cfg.bzl@0.2.4", "remoteapis": "remoteapis@_", "googleapis": "googleapis@_", "apple_support": "apple_support@1.8.1", @@ -993,10 +994,10 @@ } } }, - "blake3@1.3.3.bcr.1": { + "blake3@1.5.1.bcr.1": { "name": "blake3", - "version": "1.3.3.bcr.1", - "key": "blake3@1.3.3.bcr.1", + "version": "1.5.1.bcr.1", + "key": "blake3@1.5.1.bcr.1", "repoName": "blake3", "executionPlatformsToRegister": [], "toolchainsToRegister": [], @@ -1011,13 +1012,14 @@ "ruleClassName": "http_archive", "attributes": { "urls": [ - "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.3.3.tar.gz" + "https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/1.5.1.tar.gz" ], - "integrity": "sha256-J9K8TuWUW6dUNIWVIQQslJRj7nUU/xeq7zKOI++D/sA=", - "strip_prefix": "BLAKE3-1.3.3", + "integrity": "sha256-gizTf3AVLlmFQz0sUMj2suyDqvEaoxvp/nFIapF0Tzc=", + "strip_prefix": "BLAKE3-1.5.1", "remote_patches": { - "https://bcr.bazel.build/modules/blake3/1.3.3.bcr.1/patches/add_build_file.patch": "sha256-lKVoznUHSqWywOo27+g4J0csjL8lH3FEXjAFRJN5+Kw=", - "https://bcr.bazel.build/modules/blake3/1.3.3.bcr.1/patches/module_dot_bazel.patch": "sha256-4M/MRHdDFjS8iyVaKqy6QIc5Qea9pblUz7oj6I5aHfg=" + "https://bcr.bazel.build/modules/blake3/1.5.1.bcr.1/patches/add_build_file.patch": "sha256-BmZOqWOTfHup68uNZXOh2mP+b971CWY3QufbkIe6eEM=", + "https://bcr.bazel.build/modules/blake3/1.5.1.bcr.1/patches/module_dot_bazel.patch": "sha256-dKnHpXqvNwW2m7vYxnfWEoBhphBysqbeBxAMVX3b5a0=", + "https://bcr.bazel.build/modules/blake3/1.5.1.bcr.1/patches/fix_windows_arm_build_pr_389.patch": "sha256-9G3QDBp5OuyYP7vwPKjqK+uTUZmjhLpKSE7nshz8guc=" }, "remote_patch_strip": 0 } @@ -1797,6 +1799,35 @@ } } }, + "with_cfg.bzl@0.2.4": { + "name": "with_cfg.bzl", + "version": "0.2.4", + "key": "with_cfg.bzl@0.2.4", + "repoName": "with_cfg.bzl", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "bazel_skylib": "bazel_skylib@1.5.0", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/fmeum/with_cfg.bzl/releases/download/v0.2.4/with_cfg.bzl-v0.2.4.tar.gz" + ], + "integrity": "sha256-BqKxtWpYxHGrQNivFmxNUfCYLhxrxGN1uAWRWz/AZY4=", + "strip_prefix": "with_cfg.bzl-0.2.4", + "remote_patches": { + "https://bcr.bazel.build/modules/with_cfg.bzl/0.2.4/patches/module_dot_bazel_version.patch": "sha256-nMJ63F1h826i8AWSmXwz9pZYDwKfOnM5QdrZqyCLYMo=" + }, + "remote_patch_strip": 1 + } + } + }, "remoteapis@_": { "name": "remoteapis", "version": "", @@ -2859,7 +2890,7 @@ "general": { "bzlTransitiveDigest": "6vqJ6yadlUU86rSzRzNsiG2x5RGOCIg0gyw3j7iFVK4=", "recordedFileInputs": { - "@@//MODULE.bazel": "8a870538c6859098c30a59a03523177a26377a76965a0e1a07cdeab366fa3a6b", + "@@//MODULE.bazel": "abc450b6a7e59faeb5cff18fbb6b89a2860331f26a4dced5ff2ae306d5b800f1", "@@//src/test/tools/bzlmod/MODULE.bazel.lock": "6eb7a8bfc1274585712c029c8fd1e2a9a3fa089b30cf6f91cff6823580cf2f5c" }, "recordedDirentsInputs": {}, @@ -5348,7 +5379,7 @@ "recordedFileInputs": { "@@//src/tools/android/maven_android_install.json": "09bff3e33d291336046f7c9201630fb5e014f0e60b78b6f09b84e4f5f73ed04f", "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "cafb5d2d8119391eb2b322ce3840d3352ea82d496bdb8cbd4b6779ec4d044dda", - "@@//maven_install.json": "66b45440c9790e79e333c53a1875c6bf58d58ee2dbddbf2dc4eaf50f4d986534" + "@@//maven_install.json": "6e4420acdee546d1152ec8df003f299c980aa1ba16be27aa53bbf756dc839baa" }, "recordedDirentsInputs": {}, "envVariables": {}, @@ -5715,17 +5746,6 @@ "downloaded_file_path": "v1/com/android/zipflinger/7.1.3/zipflinger-7.1.3.jar" } }, - "com_google_turbine_turbine_0_4_0": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "sha256": "1947490c23263ae1c0a95acceb7cb419724f236d14cfbbe5a558101e79842b28", - "urls": [ - "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar" - ], - "downloaded_file_path": "v1/com/google/turbine/turbine/0.4.0/turbine-0.4.0.jar" - } - }, "io_grpc_grpc_protobuf_lite_1_56_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -5996,7 +6016,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.5.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", @@ -6046,7 +6066,7 @@ "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.5\" }", "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.5\" }", - "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.20\" }", + "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.26.1\" }", "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.8.0\" }", "{ \"group\": \"org.apache.tomcat\", \"artifact\": \"tomcat-annotations-api\", \"version\": \"8.0.5\" }", "{ \"group\": \"org.apache.velocity\", \"artifact\": \"velocity\", \"version\": \"1.7\" }", @@ -6451,6 +6471,17 @@ "downloaded_file_path": "v1/com/android/tools/common/30.1.3/common-30.1.3.jar" } }, + "com_google_turbine_turbine_0_5_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "3bb883977330ec99dd11d8bba0c9c9084b356189807920903984215a466c81ac", + "urls": [ + "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.5.0/turbine-0.5.0.jar" + ], + "downloaded_file_path": "v1/com/google/turbine/turbine/0.5.0/turbine-0.5.0.jar" + } + }, "io_grpc_grpc_auth_1_48_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -6802,12 +6833,24 @@ "repin_instructions": "" } }, + "org_apache_commons_commons_lang3_3_14_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar" + ], + "downloaded_file_path": "v1/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar" + } + }, "org_apache_commons_commons_compress_1_20": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { "sha256": "0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e", "urls": [ + "https://dl.google.com/android/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar", "https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar" ], "downloaded_file_path": "v1/org/apache/commons/commons-compress/1.20/commons-compress-1.20.jar" @@ -7955,6 +7998,17 @@ "downloaded_file_path": "v1/software/amazon/awssdk/s3/2.20.128/s3-2.20.128.jar" } }, + "org_apache_commons_commons_compress_1_26_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar" + ], + "downloaded_file_path": "v1/org/apache/commons/commons-compress/1.26.1/commons-compress-1.26.1.jar" + } + }, "com_squareup_javapoet_1_8_0": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -8247,6 +8301,17 @@ "downloaded_file_path": "v1/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" } }, + "commons_io_commons_io_2_15_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154", + "urls": [ + "https://repo1.maven.org/maven2/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar" + ], + "downloaded_file_path": "v1/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar" + } + }, "org_jetbrains_annotations_13_0": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -8384,6 +8449,17 @@ "downloaded_file_path": "v1/com/google/api-client/google-api-client/1.35.2/google-api-client-1.35.2.jar" } }, + "commons_codec_commons_codec_1_16_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "ec87bfb55f22cbd1b21e2190eeda28b2b312ed2a431ee49fbdcc01812d04a5e4", + "urls": [ + "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar" + ], + "downloaded_file_path": "v1/commons-codec/commons-codec/1.16.1/commons-codec-1.16.1.jar" + } + }, "org_ow2_asm_asm_commons_9_2": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -8533,7 +8609,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.4.0\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.5.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", @@ -8583,7 +8659,7 @@ "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy\", \"version\": \"1.14.5\" }", "{ \"group\": \"net.bytebuddy\", \"artifact\": \"byte-buddy-agent\", \"version\": \"1.14.5\" }", - "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.20\" }", + "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-compress\", \"version\": \"1.26.1\" }", "{ \"group\": \"org.apache.commons\", \"artifact\": \"commons-pool2\", \"version\": \"2.8.0\" }", "{ \"group\": \"org.apache.tomcat\", \"artifact\": \"tomcat-annotations-api\", \"version\": \"8.0.5\" }", "{ \"group\": \"org.apache.velocity\", \"artifact\": \"velocity\", \"version\": \"1.7\" }", diff --git a/maven_install.json b/maven_install.json index 6ae78a08634287..2e79eb8b4bb421 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 868269194, - "__RESOLVED_ARTIFACTS_HASH": 1287280127, + "__INPUT_ARTIFACTS_HASH": 268687906, + "__RESOLVED_ARTIFACTS_HASH": -1368933235, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.9.0", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.22.0", @@ -278,9 +278,9 @@ }, "com.google.turbine:turbine": { "shasums": { - "jar": "1947490c23263ae1c0a95acceb7cb419724f236d14cfbbe5a558101e79842b28" + "jar": "3bb883977330ec99dd11d8bba0c9c9084b356189807920903984215a466c81ac" }, - "version": "0.4.0" + "version": "0.5.0" }, "com.ryanharter.auto.value:auto-value-gson-extension": { "shasums": { @@ -306,12 +306,24 @@ }, "version": "1.12.0" }, + "commons-codec:commons-codec": { + "shasums": { + "jar": "ec87bfb55f22cbd1b21e2190eeda28b2b312ed2a431ee49fbdcc01812d04a5e4" + }, + "version": "1.16.1" + }, "commons-collections:commons-collections": { "shasums": { "jar": "eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8" }, "version": "3.2.2" }, + "commons-io:commons-io": { + "shasums": { + "jar": "a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154" + }, + "version": "2.15.1" + }, "commons-lang:commons-lang": { "shasums": { "jar": "50f11b09f877c294d56f24463f47d28f929cf5044f648661c0f0cfbae9a2f49c" @@ -582,9 +594,15 @@ }, "org.apache.commons:commons-compress": { "shasums": { - "jar": "0aeb625c948c697ea7b205156e112363b59ed5e2551212cd4e460bdb72c7c06e" + "jar": "27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04" + }, + "version": "1.26.1" + }, + "org.apache.commons:commons-lang3": { + "shasums": { + "jar": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c" }, - "version": "1.20" + "version": "3.14.0" }, "org.apache.commons:commons-math3": { "shasums": { @@ -1137,6 +1155,11 @@ "junit:junit": [ "org.hamcrest:hamcrest-core" ], + "org.apache.commons:commons-compress": [ + "commons-codec:commons-codec", + "commons-io:commons-io", + "org.apache.commons:commons-lang3" + ], "org.apache.velocity:velocity": [ "commons-collections:commons-collections", "commons-lang:commons-lang" @@ -1570,6 +1593,15 @@ "com.squareup:javapoet": [ "com.squareup.javapoet" ], + "commons-codec:commons-codec": [ + "org.apache.commons.codec", + "org.apache.commons.codec.binary", + "org.apache.commons.codec.cli", + "org.apache.commons.codec.digest", + "org.apache.commons.codec.language", + "org.apache.commons.codec.language.bm", + "org.apache.commons.codec.net" + ], "commons-collections:commons-collections": [ "org.apache.commons.collections", "org.apache.commons.collections.bag", @@ -1584,6 +1616,23 @@ "org.apache.commons.collections.map", "org.apache.commons.collections.set" ], + "commons-io:commons-io": [ + "org.apache.commons.io", + "org.apache.commons.io.build", + "org.apache.commons.io.channels", + "org.apache.commons.io.charset", + "org.apache.commons.io.comparator", + "org.apache.commons.io.file", + "org.apache.commons.io.file.attribute", + "org.apache.commons.io.file.spi", + "org.apache.commons.io.filefilter", + "org.apache.commons.io.function", + "org.apache.commons.io.input", + "org.apache.commons.io.input.buffer", + "org.apache.commons.io.monitor", + "org.apache.commons.io.output", + "org.apache.commons.io.serialization" + ], "commons-lang:commons-lang": [ "org.apache.commons.lang", "org.apache.commons.lang.builder", @@ -1989,9 +2038,36 @@ "org.apache.commons.compress.compressors.xz", "org.apache.commons.compress.compressors.z", "org.apache.commons.compress.compressors.zstandard", + "org.apache.commons.compress.harmony", + "org.apache.commons.compress.harmony.archive.internal.nls", + "org.apache.commons.compress.harmony.pack200", + "org.apache.commons.compress.harmony.unpack200", + "org.apache.commons.compress.harmony.unpack200.bytecode", + "org.apache.commons.compress.harmony.unpack200.bytecode.forms", + "org.apache.commons.compress.java.util.jar", "org.apache.commons.compress.parallel", "org.apache.commons.compress.utils" ], + "org.apache.commons:commons-lang3": [ + "org.apache.commons.lang3", + "org.apache.commons.lang3.arch", + "org.apache.commons.lang3.builder", + "org.apache.commons.lang3.compare", + "org.apache.commons.lang3.concurrent", + "org.apache.commons.lang3.concurrent.locks", + "org.apache.commons.lang3.event", + "org.apache.commons.lang3.exception", + "org.apache.commons.lang3.function", + "org.apache.commons.lang3.math", + "org.apache.commons.lang3.mutable", + "org.apache.commons.lang3.reflect", + "org.apache.commons.lang3.stream", + "org.apache.commons.lang3.text", + "org.apache.commons.lang3.text.translate", + "org.apache.commons.lang3.time", + "org.apache.commons.lang3.tuple", + "org.apache.commons.lang3.util" + ], "org.apache.commons:commons-math3": [ "org.apache.commons.math3", "org.apache.commons.math3.analysis", @@ -2365,7 +2441,9 @@ "com.ryanharter.auto.value:auto-value-gson-factory", "com.ryanharter.auto.value:auto-value-gson-runtime", "com.squareup:javapoet", + "commons-codec:commons-codec", "commons-collections:commons-collections", + "commons-io:commons-io", "commons-lang:commons-lang", "io.github.eisop:dataflow-errorprone", "io.github.java-diff-utils:java-diff-utils", @@ -2420,6 +2498,7 @@ "net.bytebuddy:byte-buddy-agent", "net.sf.jopt-simple:jopt-simple", "org.apache.commons:commons-compress", + "org.apache.commons:commons-lang3", "org.apache.commons:commons-math3", "org.apache.commons:commons-pool2", "org.apache.tomcat:tomcat-annotations-api", From 0da5efff07f25e6d8dd4245586043ebe7ae0c7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= Date: Wed, 8 May 2024 17:43:55 -0400 Subject: [PATCH 4/4] update turbine to 0.6.0 --- MODULE.bazel | 2 +- MODULE.bazel.lock | 34 +++++++++++++++++----------------- maven_install.json | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7ef8b8412efe3b..614222c78c77f3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -99,7 +99,7 @@ maven.install( "com.google.http-client:google-http-client:1.42.0", "com.google.http-client:google-http-client-gson:1.42.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.google.turbine:turbine:0.5.0", + "com.google.turbine:turbine:0.6.0", "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index fd3266f2b3ef67..56f106a0666a59 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 6, - "moduleFileHash": "abc450b6a7e59faeb5cff18fbb6b89a2860331f26a4dced5ff2ae306d5b800f1", + "moduleFileHash": "a456aed4701b3b5246c04e0ed200775ee337ca70f3a583baddd65bb0434fa2ba", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -83,7 +83,7 @@ "com.google.http-client:google-http-client:1.42.0", "com.google.http-client:google-http-client-gson:1.42.0", "com.google.j2objc:j2objc-annotations:1.3", - "com.google.turbine:turbine:0.5.0", + "com.google.turbine:turbine:0.6.0", "com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", "com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", "com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", @@ -2890,7 +2890,7 @@ "general": { "bzlTransitiveDigest": "6vqJ6yadlUU86rSzRzNsiG2x5RGOCIg0gyw3j7iFVK4=", "recordedFileInputs": { - "@@//MODULE.bazel": "abc450b6a7e59faeb5cff18fbb6b89a2860331f26a4dced5ff2ae306d5b800f1", + "@@//MODULE.bazel": "a456aed4701b3b5246c04e0ed200775ee337ca70f3a583baddd65bb0434fa2ba", "@@//src/test/tools/bzlmod/MODULE.bazel.lock": "6eb7a8bfc1274585712c029c8fd1e2a9a3fa089b30cf6f91cff6823580cf2f5c" }, "recordedDirentsInputs": {}, @@ -5379,7 +5379,7 @@ "recordedFileInputs": { "@@//src/tools/android/maven_android_install.json": "09bff3e33d291336046f7c9201630fb5e014f0e60b78b6f09b84e4f5f73ed04f", "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "cafb5d2d8119391eb2b322ce3840d3352ea82d496bdb8cbd4b6779ec4d044dda", - "@@//maven_install.json": "6e4420acdee546d1152ec8df003f299c980aa1ba16be27aa53bbf756dc839baa" + "@@//maven_install.json": "2f6095079e532a5b0201191509db67706e9b809bc1721a8fba8ab9810481b867" }, "recordedDirentsInputs": {}, "envVariables": {}, @@ -6016,7 +6016,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.5.0\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.6.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", @@ -6471,17 +6471,6 @@ "downloaded_file_path": "v1/com/android/tools/common/30.1.3/common-30.1.3.jar" } }, - "com_google_turbine_turbine_0_5_0": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_file", - "attributes": { - "sha256": "3bb883977330ec99dd11d8bba0c9c9084b356189807920903984215a466c81ac", - "urls": [ - "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.5.0/turbine-0.5.0.jar" - ], - "downloaded_file_path": "v1/com/google/turbine/turbine/0.5.0/turbine-0.5.0.jar" - } - }, "io_grpc_grpc_auth_1_48_1": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -6912,6 +6901,17 @@ "downloaded_file_path": "v1/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.3.0/java-allocation-instrumenter-3.3.0.jar" } }, + "com_google_turbine_turbine_0_6_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "sha256": "277b6d59934dc8af95675a6cf6f054e9f43e0708344b08ba2aa927a578174950", + "urls": [ + "https://repo1.maven.org/maven2/com/google/turbine/turbine/0.6.0/turbine-0.6.0.jar" + ], + "downloaded_file_path": "v1/com/google/turbine/turbine/0.6.0/turbine-0.6.0.jar" + } + }, "org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_4_32": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -8609,7 +8609,7 @@ "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.http-client\", \"artifact\": \"google-http-client-gson\", \"version\": \"1.42.0\" }", "{ \"group\": \"com.google.j2objc\", \"artifact\": \"j2objc-annotations\", \"version\": \"1.3\" }", - "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.5.0\" }", + "{ \"group\": \"com.google.turbine\", \"artifact\": \"turbine\", \"version\": \"0.6.0\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-extension\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-factory\", \"version\": \"1.3.1\" }", "{ \"group\": \"com.ryanharter.auto.value\", \"artifact\": \"auto-value-gson-runtime\", \"version\": \"1.3.1\" }", diff --git a/maven_install.json b/maven_install.json index 2e79eb8b4bb421..3728003960923b 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 268687906, - "__RESOLVED_ARTIFACTS_HASH": -1368933235, + "__INPUT_ARTIFACTS_HASH": -217313117, + "__RESOLVED_ARTIFACTS_HASH": 1427942467, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.9.0", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.22.0", @@ -278,9 +278,9 @@ }, "com.google.turbine:turbine": { "shasums": { - "jar": "3bb883977330ec99dd11d8bba0c9c9084b356189807920903984215a466c81ac" + "jar": "277b6d59934dc8af95675a6cf6f054e9f43e0708344b08ba2aa927a578174950" }, - "version": "0.5.0" + "version": "0.6.0" }, "com.ryanharter.auto.value:auto-value-gson-extension": { "shasums": {