From 35436087050b91a3f354010f236cab29589f44df Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 9 Dec 2024 14:24:08 +0100 Subject: [PATCH] dependency: Bump Protobuf to v29.1 --- 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/{protobuf-v29.0.patch => protobuf-v29.1.patch} | 0 15 files changed, 16 insertions(+), 16 deletions(-) rename patches/{protobuf-v29.0.patch => protobuf-v29.1.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index cf66e9a99a..255f7b918c 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,6 +1,6 @@ ZLIB=1.3.1 abseil-cpp=20240722.0 -Protobuf=v29.0 +Protobuf=v29.1 Eigen=3.4.0 Re2=2024-04-01 CoinUtils=2.11.12 diff --git a/MODULE.bazel b/MODULE.bazel index 891031bd0a..27c714a309 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -24,7 +24,7 @@ bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_ bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest") bazel_dep(name = "highs", version = "1.8.1") bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "29.1", repo_name = "com_google_protobuf") bazel_dep(name = "pybind11_abseil", version = "202402.0", repo_name = "org_pybind11_abseil") 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 e7f3ec2513..d81e1ec517 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.1.1 -protobuf==5.29.0 +protobuf==5.29.1 requests==2.32.0 scipy==1.14.1 diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index f0d57c51bf..92903532f8 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==5.29.0 +protobuf==5.29.1 # via # -r bazel/notebook_requirements.in # mypy-protobuf diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index bbb6fa5c73..1a412d819c 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.1.1 -protobuf==5.29.0 +protobuf==5.29.1 requests==2.32.3 scipy==1.14.1 diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index ed900c52a4..557352a7c5 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -45,7 +45,7 @@ platformdirs==3.10.0 # via # black # virtualenv -protobuf==5.29.0 +protobuf==5.29.1 # via # -r bazel/ortools_requirements.in # mypy-protobuf diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 5193e719e4..7a1d6dfd49 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -108,10 +108,10 @@ if(BUILD_Protobuf) FetchContent_Declare( Protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v29.0" + GIT_TAG "v29.1" GIT_SHALLOW TRUE GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.0.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.1.patch" ) FetchContent_MakeAvailable(Protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index c778130230..105e02af1e 100644 --- a/cmake/host.CMakeLists.txt +++ b/cmake/host.CMakeLists.txt @@ -121,9 +121,9 @@ set(protobuf_WITH_ZLIB OFF) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v29.0" + GIT_TAG "v29.1" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.0.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.1.patch") FetchContent_MakeAvailable(protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) message(CHECK_PASS "fetched") diff --git a/ortools/dotnet/Google.OrTools-full.csproj.in b/ortools/dotnet/Google.OrTools-full.csproj.in index 146d715cbb..b0c536c846 100644 --- a/ortools/dotnet/Google.OrTools-full.csproj.in +++ b/ortools/dotnet/Google.OrTools-full.csproj.in @@ -184,7 +184,7 @@ - + diff --git a/ortools/dotnet/Google.OrTools-local.csproj.in b/ortools/dotnet/Google.OrTools-local.csproj.in index 3046c35785..e4a07a7f95 100644 --- a/ortools/dotnet/Google.OrTools-local.csproj.in +++ b/ortools/dotnet/Google.OrTools-local.csproj.in @@ -172,7 +172,7 @@ - + diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in index 3cb0a1426b..79c354bde2 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.29.0 + 4.29.1 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index 6eec65f8dd..399715d0ec 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.29.0 + 4.29.1 diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 2aabccf3e3..5b95cb40fc 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 >= 5.29.0,<5.30', + 'protobuf >= 5.29.1,<5.30', 'immutabledict >= 3.0.0', ], package_data={ diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index f112ce791d..ec66b9e0f0 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -14,7 +14,7 @@ exports_files([ "abseil-cpp-20240722.0.patch", "highs-v1.8.1.patch", - "protobuf-v29.0.patch", + "protobuf-v29.1.patch", "pybind11_abseil.patch", "pybind11_bazel.patch", "pybind11_protobuf.patch", diff --git a/patches/protobuf-v29.0.patch b/patches/protobuf-v29.1.patch similarity index 100% rename from patches/protobuf-v29.0.patch rename to patches/protobuf-v29.1.patch