diff --git a/Dependencies.txt b/Dependencies.txt index 255f7b918c..669fbd885e 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,6 +1,6 @@ ZLIB=1.3.1 abseil-cpp=20240722.0 -Protobuf=v29.1 +Protobuf=v29.2 Eigen=3.4.0 Re2=2024-04-01 CoinUtils=2.11.12 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 7a1d6dfd49..1063fbcfe7 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.1" + GIT_TAG "v29.2" GIT_SHALLOW TRUE GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.1.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.2.patch" ) FetchContent_MakeAvailable(Protobuf) list(POP_BACK CMAKE_MESSAGE_INDENT) diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index 105e02af1e..54449f0fd1 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.1" + GIT_TAG "v29.2" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.1.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.2.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 1f40eeec11..5140c94d14 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 04b6db95e5..c484a421d4 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 79c354bde2..4f8ce22bd5 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.1 + 4.29.2 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index 399715d0ec..59135f7ba5 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.1 + 4.29.2 diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index 8b9e4fbca4..38be021e97 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.1,<5.30', + 'protobuf >= 5.29.2,<5.30', 'immutabledict >= 3.0.0', ], package_data={ diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 7ec0db8fa5..005055d1f9 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.1.patch", + "protobuf-v29.2.patch", "pybind11_abseil.patch", "pybind11_protobuf.patch", "pybind11.patch", diff --git a/patches/protobuf-v29.1.patch b/patches/protobuf-v29.2.patch similarity index 100% rename from patches/protobuf-v29.1.patch rename to patches/protobuf-v29.2.patch