From 129e1a8fadd398e334f294e243f02ef7b47e5d76 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 10 Nov 2023 16:48:32 +0100 Subject: [PATCH] dependencies: Bump Protobuf from v24.4 to v25.0 --- Dependencies.txt | 2 +- WORKSPACE | 4 ++-- 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/java/pom.xml.in | 2 +- ortools/python/setup.py.in | 2 +- patches/BUILD.bazel | 2 +- patches/{protobuf-v24.4.patch => protobuf-v25.0.patch} | 0 16 files changed, 18 insertions(+), 18 deletions(-) rename patches/{protobuf-v24.4.patch => protobuf-v25.0.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index e8bd844d3f..7ac170bd21 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,4 +1,4 @@ -Protobuf=v24.4 +Protobuf=v25.0 abseil-cpp=20230802.1 Cbc=2.10.7 Cgl=0.60.5 diff --git a/WORKSPACE b/WORKSPACE index 5ec02d3f64..8cb819517d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -100,8 +100,8 @@ git_repository( ## Protobuf git_repository( name = "com_google_protobuf", - tag = "v24.4", - patches = ["//patches:protobuf-v24.4.patch"], + tag = "v25.0", + patches = ["//patches:protobuf-v25.0.patch"], patch_args = ["-p1"], remote = "https://github.com/protocolbuffers/protobuf.git", ) diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index 8d7a684930..2da78f85be 100644 --- a/bazel/notebook_requirements.in +++ b/bazel/notebook_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==2.0.0 numpy==1.26.1 -protobuf==4.24.4 +protobuf==4.25.0 scipy==1.11.3 # OR-Tools build dependencies diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index b3d70f2828..dda0ff00ba 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -228,7 +228,7 @@ prompt-toolkit==3.0.39 # via # ipython # jupyter-console -protobuf==4.24.4 +protobuf==4.25.0 # via # -r bazel/notebook_requirements.in # mypy-protobuf diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index 5a102563b6..f1ec189cda 100644 --- a/bazel/ortools_requirements.in +++ b/bazel/ortools_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==2.0.0 numpy==1.26.1 -protobuf==4.24.4 +protobuf==4.25.0 scipy==1.11.3 # OR-Tools build dependencies diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index 4e47810c3d..f7210a0e5e 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -37,7 +37,7 @@ platformdirs==3.10.0 # via # black # virtualenv -protobuf==4.24.4 +protobuf==4.25.0 # via # -r bazel/ortools_requirements.in # mypy-protobuf diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 674e9d179f..af3a28c113 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -103,9 +103,9 @@ if(BUILD_Protobuf) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v24.4" + GIT_TAG "v25.0" GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.4.patch") + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v25.0.patch") FetchContent_MakeAvailable(protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) message(CHECK_PASS "fetched") diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index bcc64e4f6f..ecafb2748d 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 "v24.4" + GIT_TAG "v25.0" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.4.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v25.0.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 a7761d115a..e780ea1b1d 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 cbdc6deada..5d47dd3b8e 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 d47b03ed1b..3209c3d78c 100644 --- a/ortools/java/pom-full.xml.in +++ b/ortools/java/pom-full.xml.in @@ -109,7 +109,7 @@ com.google.protobuf protobuf-java - 3.24.4 + 3.25.0 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index 40dfe06d03..916767aae0 100644 --- a/ortools/java/pom-local.xml.in +++ b/ortools/java/pom-local.xml.in @@ -81,7 +81,7 @@ com.google.protobuf protobuf-java - 3.24.4 + 3.25.0 diff --git a/ortools/java/pom.xml.in b/ortools/java/pom.xml.in index 6859a721cf..6d63265bba 100644 --- a/ortools/java/pom.xml.in +++ b/ortools/java/pom.xml.in @@ -69,7 +69,7 @@ com.google.protobuf protobuf-java - 3.24.4 + 3.25.0 junit diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 1307e4bde6..1acb3690ef 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 >= 4.24.4', + 'protobuf >= 4.25.0', ], package_data={ '@PYTHON_PROJECT@':[$<$,SHARED_LIBRARY>:'.libs/*','../$'>], diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 5e2c97077a..f514593a1a 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -13,7 +13,7 @@ exports_files([ "abseil-cpp-20230802.1.patch", - "protobuf-v24.4.patch", + "protobuf-v25.0.patch", "pybind11.patch", "pybind11_bazel.patch", "pybind11_protobuf.patch", diff --git a/patches/protobuf-v24.4.patch b/patches/protobuf-v25.0.patch similarity index 100% rename from patches/protobuf-v24.4.patch rename to patches/protobuf-v25.0.patch