From 520ec2e0263202f6cc0f0bf5f52477ae58432756 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 28 Mar 2025 09:38:15 +0100 Subject: [PATCH] dependency: bump protobuf to v30.2 --- Dependencies.txt | 2 +- MODULE.bazel | 2 +- bazel/notebook_requirements.in | 2 +- bazel/notebook_requirements.txt | 2 +- bazel/ortools_requirements.in | 2 +- bazel/ortools_requirements.txt | 2 +- cmake/dependencies/CMakeLists.txt | 4 ++-- cmake/host.CMakeLists.txt | 4 ++-- ortools/dotnet/Google.OrTools-full.csproj.in | 2 +- ortools/dotnet/Google.OrTools-local.csproj.in | 2 +- ortools/java/pom-full.xml.in | 2 +- ortools/java/pom-local.xml.in | 2 +- ortools/python/setup.py.in | 2 +- patches/BUILD.bazel | 2 +- patches/fuzztest-2025-02-14.patch | 4 ++-- patches/{protobuf-v30.1.patch => protobuf-v30.2.patch} | 0 16 files changed, 18 insertions(+), 18 deletions(-) rename patches/{protobuf-v30.1.patch => protobuf-v30.2.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index 5c2fe79832..035d1e5541 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,6 +1,6 @@ ZLIB=1.3.1 abseil-cpp=20250127.1 -Protobuf=v30.1 +Protobuf=v30.2 Eigen=3.4.0 Re2=2024-04-01 CoinUtils=2.11.12 diff --git a/MODULE.bazel b/MODULE.bazel index 7f78662a17..4dc8220f8c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -25,7 +25,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_ bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest") bazel_dep(name = "highs", version = "1.10.0") bazel_dep(name = "platforms", version = "0.0.11") -bazel_dep(name = "protobuf", version = "30.1", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf") bazel_dep(name = "pybind11_abseil", version = "202402.0") bazel_dep(name = "pybind11_bazel", version = "2.13.6") bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729") diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index 8d23d12189..d16d1b8951 100644 --- a/bazel/notebook_requirements.in +++ b/bazel/notebook_requirements.in @@ -2,7 +2,7 @@ absl-py==2.1.0 immutabledict==3.0.0 numpy==2.2.0 -protobuf==6.30.1 +protobuf==6.30.2 requests==2.32.0 scipy==1.14.1 diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index 64e7817ae8..0ea2c14447 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -216,7 +216,7 @@ prometheus-client==0.17.1 # via jupyter-server prompt-toolkit==3.0.39 # via ipython -protobuf==6.30.1 +protobuf==6.30.2 # via # -r bazel/notebook_requirements.in # mypy-protobuf diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index 58dd6506ee..7984c46ea4 100644 --- a/bazel/ortools_requirements.in +++ b/bazel/ortools_requirements.in @@ -2,7 +2,7 @@ absl-py==2.1.0 immutabledict==3.0.0 numpy==2.2.0 -protobuf==6.30.1 +protobuf==6.30.2 requests==2.32.3 scipy==1.14.1 diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index 5597056c44..2bfd1ba508 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -45,7 +45,7 @@ platformdirs==3.10.0 # via # black # virtualenv -protobuf==6.30.1 +protobuf==6.30.2 # via # -r bazel/ortools_requirements.in # mypy-protobuf diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 2d25b70c4d..e453e12ef0 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -113,10 +113,10 @@ if(BUILD_Protobuf) FetchContent_Declare( Protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v30.1" + GIT_TAG "v30.2" GIT_SHALLOW TRUE GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v30.1.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v30.2.patch" ) FetchContent_MakeAvailable(Protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index eca83599a0..a1425e391b 100644 --- a/cmake/host.CMakeLists.txt +++ b/cmake/host.CMakeLists.txt @@ -124,10 +124,10 @@ set(protobuf_WITH_ZLIB OFF) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v30.1" + GIT_TAG "v30.2" GIT_SHALLOW TRUE GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.1.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.2.patch" ) FetchContent_MakeAvailable(protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/ortools/dotnet/Google.OrTools-full.csproj.in b/ortools/dotnet/Google.OrTools-full.csproj.in index 7c3e6223a5..ffdaf5860c 100644 --- a/ortools/dotnet/Google.OrTools-full.csproj.in +++ b/ortools/dotnet/Google.OrTools-full.csproj.in @@ -193,7 +193,7 @@ - + diff --git a/ortools/dotnet/Google.OrTools-local.csproj.in b/ortools/dotnet/Google.OrTools-local.csproj.in index ee865fc9e4..e6576d74ea 100644 --- a/ortools/dotnet/Google.OrTools-local.csproj.in +++ b/ortools/dotnet/Google.OrTools-local.csproj.in @@ -181,7 +181,7 @@ - + diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in index b8a66c3d08..69a4547aa6 100644 --- a/ortools/java/pom-full.xml.in +++ b/ortools/java/pom-full.xml.in @@ -109,7 +109,7 @@ com.google.protobuf protobuf-java - 4.30.1 + 4.30.2 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index b0e00b5034..93f38eac79 100644 --- a/ortools/java/pom-local.xml.in +++ b/ortools/java/pom-local.xml.in @@ -81,7 +81,7 @@ com.google.protobuf protobuf-java - 4.30.1 + 4.30.2 diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 11808f68eb..93afdcf155 100644 --- a/ortools/python/setup.py.in +++ b/ortools/python/setup.py.in @@ -46,7 +46,7 @@ setup( 'absl-py >= 2.0.0', 'numpy >= 1.13.3', 'pandas >= 2.0.0', - 'protobuf >= 6.30.1,<6.31', + 'protobuf >= 6.30.2,<6.31', 'immutabledict >= 3.0.0', ], package_data={ diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 68a45272bd..166ab5000f 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -14,7 +14,7 @@ exports_files([ "abseil-cpp-20250127.1.patch", "highs-v1.9.0.patch", - "protobuf-v30.1.patch", + "protobuf-v30.2.patch", "pybind11_abseil.patch", "pybind11_protobuf.patch", "pybind11.patch", diff --git a/patches/fuzztest-2025-02-14.patch b/patches/fuzztest-2025-02-14.patch index f0562655c6..e803bbe2a7 100644 --- a/patches/fuzztest-2025-02-14.patch +++ b/patches/fuzztest-2025-02-14.patch @@ -28,7 +28,7 @@ index 1f4f08d..cc4d0ba 100644 set(gtest_URL https://github.com/google/googletest.git) -set(gtest_TAG v1.14.0) -+set(gtest_TAG v1.15.2) ++set(gtest_TAG v1.16.0) # From https://www.antlr.org/download.html set(antlr_cpp_URL https://www.antlr.org/download/antlr4-cpp-runtime-4.12.0-source.zip) @@ -36,7 +36,7 @@ index 1f4f08d..cc4d0ba 100644 set(proto_URL https://github.com/protocolbuffers/protobuf.git) -set(proto_TAG v28.2) -+set(proto_TAG v30.1) ++set(proto_TAG v30.2) set(nlohmann_json_URL https://github.com/nlohmann/json.git) set(nlohmann_json_TAG v3.11.2) diff --git a/patches/protobuf-v30.1.patch b/patches/protobuf-v30.2.patch similarity index 100% rename from patches/protobuf-v30.1.patch rename to patches/protobuf-v30.2.patch