diff --git a/Dependencies.txt b/Dependencies.txt index 10f82853a0..91c16ba987 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,4 +1,4 @@ -Protobuf=v24.0 +Protobuf=v24.4 abseil-cpp=20230802.0 Cbc=2.10.7 Cgl=0.60.5 diff --git a/WORKSPACE b/WORKSPACE index 704fc04eaf..c234508381 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -100,8 +100,8 @@ git_repository( ## Protobuf git_repository( name = "com_google_protobuf", - tag = "v24.0", - patches = ["//patches:protobuf-v24.0.patch"], + tag = "v24.4", + patches = ["//patches:protobuf-v24.4.patch"], patch_args = ["-p1"], remote = "https://github.com/protocolbuffers/protobuf.git", ) diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index edf35c02d0..385bd5f2ee 100644 --- a/bazel/notebook_requirements.in +++ b/bazel/notebook_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==1.4.0 numpy==1.25.2 -protobuf==4.24.0 +protobuf==4.24.4 scipy==1.11.1 # OR-Tools build dependencies diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index d4a94bf899..180b6149fd 100644 --- a/bazel/ortools_requirements.in +++ b/bazel/ortools_requirements.in @@ -1,7 +1,7 @@ # OR-Tools code dependencies absl-py==1.4.0 numpy==1.25.2 -protobuf==4.24.0 +protobuf==4.24.4 scipy==1.11.1 # OR-Tools build dependencies diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index a322550e26..50d850566a 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.0" + GIT_TAG "v24.4" GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.0.patch") + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.4.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 d4b770ecd4..4df69dd859 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.0" + GIT_TAG "v24.4" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.0.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.4.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 930ce10524..d682249e04 100644 --- a/ortools/dotnet/Google.OrTools-full.csproj.in +++ b/ortools/dotnet/Google.OrTools-full.csproj.in @@ -176,7 +176,7 @@ - + diff --git a/ortools/dotnet/Google.OrTools-local.csproj.in b/ortools/dotnet/Google.OrTools-local.csproj.in index 5c8e2acdd1..80e22ba9d0 100644 --- a/ortools/dotnet/Google.OrTools-local.csproj.in +++ b/ortools/dotnet/Google.OrTools-local.csproj.in @@ -164,7 +164,7 @@ - + diff --git a/ortools/java/pom-full.xml.in b/ortools/java/pom-full.xml.in index 42ab91c377..d47b03ed1b 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.0 + 3.24.4 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index 12cc129c7d..40dfe06d03 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.0 + 3.24.4 diff --git a/ortools/java/pom.xml.in b/ortools/java/pom.xml.in index 1bef1792f5..6859a721cf 100644 --- a/ortools/java/pom.xml.in +++ b/ortools/java/pom.xml.in @@ -69,7 +69,7 @@ com.google.protobuf protobuf-java - 3.24.0 + 3.24.4 junit diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 1b86356bfa..b80cee0c1c 100644 --- a/ortools/python/setup.py.in +++ b/ortools/python/setup.py.in @@ -46,7 +46,7 @@ setup( 'absl-py >= 0.13', 'numpy >= 1.13.3', 'pandas >= 1.5.2', - 'protobuf >= 4.24.0', + 'protobuf >= 4.24.4', ], package_data={ '@PYTHON_PROJECT@':[$<$,SHARED_LIBRARY>:'.libs/*','../$'>], diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 75e39b8582..3d97702158 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -13,7 +13,7 @@ exports_files([ "abseil-cpp-20230802.0.patch", - "protobuf-v24.0.patch", + "protobuf-v24.4.patch", "pybind11.patch", "pybind11_bazel.patch", "pybind11_protobuf.patch", diff --git a/patches/protobuf-v24.0.patch b/patches/protobuf-v24.4.patch similarity index 100% rename from patches/protobuf-v24.0.patch rename to patches/protobuf-v24.4.patch