dependency: Bump Protobuf to v24.4

2023-10-05 23:21:11 +02:00
parent c60a2d03d6
commit bfdc7b5dce
14 changed files with 16 additions and 16 deletions
--- 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
--- a/4
+++ b/4
@@ -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",
 )
--- 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
--- 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
--- 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")
--- 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")
--- a/ortools/dotnet/Google.OrTools-full.csproj.in
+++ b/ortools/dotnet/Google.OrTools-full.csproj.in
@@ -176,7 +176,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.24.0"/>
+    <PackageReference Include="Google.Protobuf" Version="3.24.4"/>
  </ItemGroup>

  <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
--- a/ortools/dotnet/Google.OrTools-local.csproj.in
+++ b/ortools/dotnet/Google.OrTools-local.csproj.in
@@ -164,7 +164,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.24.0"/>
+    <PackageReference Include="Google.Protobuf" Version="3.24.4"/>
  </ItemGroup>

  <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
--- a/ortools/java/pom-full.xml.in
+++ b/ortools/java/pom-full.xml.in
@@ -109,7 +109,7 @@
  <dependency>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-java</artifactId>
-    <version>3.24.0</version>
+    <version>3.24.4</version>
  </dependency>
 </dependencies>

--- a/ortools/java/pom-local.xml.in
+++ b/ortools/java/pom-local.xml.in
@@ -81,7 +81,7 @@
  <dependency>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-java</artifactId>
-    <version>3.24.0</version>
+    <version>3.24.4</version>
  </dependency>
 </dependencies>

--- a/ortools/java/pom.xml.in
+++ b/ortools/java/pom.xml.in
@@ -69,7 +69,7 @@
  <dependency>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-java</artifactId>
-    <version>3.24.0</version>
+    <version>3.24.4</version>
  </dependency>
  <dependency>
    <groupId>junit</groupId>
--- 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@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PROJECT_NAME@,TYPE>,SHARED_LIBRARY>:'.libs/*','../$<TARGET_SONAME_FILE_NAME:@PROJECT_NAME@>'>],
--- 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",
--- a/patches/protobuf-v24.4.patch
+++ b/patches/protobuf-v24.4.patch