diff --git a/Dependencies.txt b/Dependencies.txt index ef07f26b64..7f34dd3184 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,4 +1,4 @@ -Protobuf=v21.10 +Protobuf=v21.12 abseil-cpp=20220623.1 Cbc=2.10.7 Cgl=0.60.5 diff --git a/WORKSPACE b/WORKSPACE index 5094118af3..f4f91468c9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -42,7 +42,7 @@ git_repository( # Protobuf git_repository( name = "com_google_protobuf", - tag = "v21.10", + tag = "v21.12", remote = "https://github.com/protocolbuffers/protobuf.git", ) # Load common dependencies. diff --git a/bazel/python_deps.txt b/bazel/python_deps.txt index 879d7b0900..9972424972 100644 --- a/bazel/python_deps.txt +++ b/bazel/python_deps.txt @@ -1,4 +1,4 @@ absl-py >= 0.13 numpy >= 1.13.3 -protobuf >= 4.21.10 +protobuf >= 4.21.12 scipy >= 1.10.0 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 8f8739790e..5947182b0c 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -100,9 +100,9 @@ if(BUILD_Protobuf) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v21.10" + GIT_TAG "v21.12" GIT_SUBMODULES "" - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v21.10.patch") + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v21.12.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 96ded386c1..32614d470f 100644 --- a/cmake/host.CMakeLists.txt +++ b/cmake/host.CMakeLists.txt @@ -116,9 +116,9 @@ set(protobuf_MSVC_STATIC_RUNTIME OFF) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git" - GIT_TAG "v21.5" + GIT_TAG "v21.12" GIT_SUBMODULES "" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v21.10.patch") + PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v21.12.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 caa5a1815d..6c22d3c005 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 be4640b1bd..09e5916c54 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 f9d0d4b237..c0616a2554 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.21.10 + 3.21.12 diff --git a/ortools/java/pom-local.xml.in b/ortools/java/pom-local.xml.in index bc03df2d01..a67f1f3c98 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.21.10 + 3.21.12 diff --git a/ortools/java/pom.xml.in b/ortools/java/pom.xml.in index f722e25bab..ec90d4e0fb 100644 --- a/ortools/java/pom.xml.in +++ b/ortools/java/pom.xml.in @@ -69,7 +69,7 @@ com.google.protobuf protobuf-java - 3.21.10 + 3.21.12 junit diff --git a/ortools/python/setup.py.in b/ortools/python/setup.py.in index d6f229bfc9..1af6c67397 100644 --- a/ortools/python/setup.py.in +++ b/ortools/python/setup.py.in @@ -45,7 +45,7 @@ setup( install_requires=[ 'absl-py >= 0.13', 'numpy >= 1.13.3', - 'protobuf >= 4.21.10', + 'protobuf >= 4.21.12', 'scipy >= 1.10.0', ], package_data={ diff --git a/patches/protobuf-v21.10.patch b/patches/protobuf-v21.12.patch similarity index 100% rename from patches/protobuf-v21.10.patch rename to patches/protobuf-v21.12.patch