From 28ff3d5b2e84756411d01057f63b925445cc5e44 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 8 Nov 2024 11:39:01 +0100 Subject: [PATCH] deps: Bump protobuf to v28.3 --- Dependencies.txt | 2 +- WORKSPACE | 4 ++-- bazel/notebook_requirements.in | 2 +- bazel/notebook_requirements.txt | 4 ++-- bazel/ortools_requirements.in | 2 +- bazel/ortools_requirements.txt | 4 ++-- 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-v28.2.patch => protobuf-v28.3.patch} | 0 15 files changed, 19 insertions(+), 19 deletions(-) rename patches/{protobuf-v28.2.patch => protobuf-v28.3.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index a76d9fa871..39452cf854 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,6 +1,6 @@ ZLIB=1.3.1 abseil-cpp=20240722.0 -Protobuf=v28.2 +Protobuf=v28.3 Eigen=3.4.0 Re2=2024-04-01 CoinUtils=2.11.6 diff --git a/WORKSPACE b/WORKSPACE index a17588f1e5..4b556d8432 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -148,9 +148,9 @@ install_notebook_deps() # This statement defines the @com_google_protobuf repo. git_repository( name = "com_google_protobuf", - patches = ["//patches:protobuf-v28.2.patch"], + patches = ["//patches:protobuf-v28.3.patch"], patch_args = ["-p1"], - tag = "v28.2", + tag = "v28.3", remote = "https://github.com/protocolbuffers/protobuf.git", ) # Load common dependencies. diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index 987f0d6d66..8a21c9a8df 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.28.2 +protobuf==5.28.3 requests==2.32.0 scipy==1.14.1 diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index 3c4a2bbc3e..12feab6301 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # bazel run //bazel:notebook_requirements.update @@ -216,7 +216,7 @@ prometheus-client==0.17.1 # via jupyter-server prompt-toolkit==3.0.39 # via ipython -protobuf==5.28.2 +protobuf==5.28.3 # via # -r bazel/notebook_requirements.in # mypy-protobuf diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index 9661af3d06..fdd6cb7df1 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.28.2 +protobuf==5.28.3 requests==2.32.3 scipy==1.14.1 diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index f32aeb1dba..a94c259f3a 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.13 # by the following command: # # bazel run //bazel:ortools_requirements.update @@ -45,7 +45,7 @@ platformdirs==3.10.0 # via # black # virtualenv -protobuf==5.28.2 +protobuf==5.28.3 # via # -r bazel/ortools_requirements.in # mypy-protobuf diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index fc23d05bb4..a6f9631906 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 "v28.2" + GIT_TAG "v28.3" GIT_SHALLOW TRUE GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.2.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.3.patch" ) FetchContent_MakeAvailable(Protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index 8c87bf98d5..28baee21a8 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 "v28.2" + GIT_TAG "v28.3" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.2.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.3.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 f1f813ad55..1e900d4da5 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 f7e36c22f9..be0415fc67 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 82df1445ac..0172065fa7 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.28.2 + 4.28.3 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index c8064584e4..d6544d6bca 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.28.2 + 4.28.3 diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 3adb763337..295451b6e7 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.28.2,<5.29', + 'protobuf >= 5.28.3,<5.29', 'immutabledict >= 3.0.0', ], package_data={ diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 2461b33134..e05e1810ff 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -14,7 +14,7 @@ exports_files([ "abseil-cpp-20240722.0.patch", "highs-v1.8.0.patch", - "protobuf-v28.2.patch", + "protobuf-v28.3.patch", "pybind11_abseil.patch", "pybind11_bazel.patch", "pybind11_protobuf.patch", diff --git a/patches/protobuf-v28.2.patch b/patches/protobuf-v28.3.patch similarity index 100% rename from patches/protobuf-v28.2.patch rename to patches/protobuf-v28.3.patch