dependencies: bump Protobuf from v31.0 to v31.1

2025-06-17 11:08:04 +02:00
parent 7b67f855e6
commit 3467396a74
16 changed files with 19 additions and 19 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20250512.0
-Protobuf=v31.0
+Protobuf=v31.1
 Eigen=3.4.0
 Re2=2024-07-02
 CoinUtils=2.11.12
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -26,7 +26,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.2")
 bazel_dep(name = "googletest", version = "1.17.0")
 bazel_dep(name = "highs", version = "1.11.0")
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "protobuf", version = "31.0")
+bazel_dep(name = "protobuf", version = "31.1")
 bazel_dep(name = "pybind11_abseil", version = "202402.0")
 bazel_dep(name = "pybind11_bazel", version = "2.13.6")
 bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
--- a/bazel/notebook_requirements.in
+++ b/bazel/notebook_requirements.in
@@ -2,8 +2,8 @@
 absl-py==2.2.2
 immutabledict==4.2.1
 numpy==2.2.0
-protobuf==6.31.0
-requests==2.32.3
+protobuf==6.31.1
+requests==2.32.4
 scipy==1.14.1
 typing-extensions==4.13.1

--- a/bazel/notebook_requirements.txt
+++ b/bazel/notebook_requirements.txt
@@ -215,7 +215,7 @@ prometheus-client==0.22.1
    # via jupyter-server
 prompt-toolkit==3.0.51
    # via ipython
-protobuf==6.31.0
+protobuf==6.31.1
    # via
    #   -r bazel/notebook_requirements.in
    #   mypy-protobuf
--- a/bazel/ortools_requirements.in
+++ b/bazel/ortools_requirements.in
@@ -2,8 +2,8 @@
 absl-py==2.2.2
 immutabledict==4.2.1
 numpy==2.2.0
-protobuf==6.31.0
-requests==2.32.3
+protobuf==6.31.1
+requests==2.32.4
 scipy==1.14.1
 typing-extensions==4.13.1

--- a/bazel/ortools_requirements.txt
+++ b/bazel/ortools_requirements.txt
@@ -45,7 +45,7 @@ platformdirs==3.10.0
    # via
    #   black
    #   virtualenv
-protobuf==6.31.0
+protobuf==6.31.1
    # via
    #   -r bazel/ortools_requirements.in
    #   mypy-protobuf
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -136,11 +136,11 @@ if(BUILD_Protobuf)
  FetchContent_Declare(
    Protobuf
    GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v31.0"
+    GIT_TAG "v31.1"
    GIT_SHALLOW TRUE
    GIT_SUBMODULES ""
    PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v31.0.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v31.1.patch"
  )
  FetchContent_MakeAvailable(Protobuf)
  list(POP_BACK CMAKE_MESSAGE_INDENT)
--- a/cmake/host.CMakeLists.txt
+++ b/cmake/host.CMakeLists.txt
@@ -125,11 +125,11 @@ set(protobuf_WITH_ZLIB OFF)
 FetchContent_Declare(
  protobuf
  GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-  GIT_TAG "v31.0"
+  GIT_TAG "v31.1"
  GIT_SHALLOW TRUE
  GIT_SUBMODULES ""
  PATCH_COMMAND git apply --ignore-whitespace
-  "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v31.0.patch"
+  "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v31.1.patch"
 )
 FetchContent_MakeAvailable(protobuf)
 list(POP_BACK CMAKE_MESSAGE_INDENT)
--- a/ortools/dotnet/Google.OrTools-full.csproj.in
+++ b/ortools/dotnet/Google.OrTools-full.csproj.in
@@ -193,7 +193,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.31.0"/>
+    <PackageReference Include="Google.Protobuf" Version="3.31.1"/>
  </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
@@ -181,7 +181,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.31.0"/>
+    <PackageReference Include="Google.Protobuf" Version="3.31.1"/>
  </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>4.31.0</version>
+    <version>4.31.1</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>4.31.0</version>
+    <version>4.31.1</version>
  </dependency>
 </dependencies>

--- 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 >= 6.31.0,<6.32',
+        'protobuf >= 6.31.1,<6.32',
        'typing-extensions >= 4.12',
        'immutabledict >= 3.0.0',
    ],
--- a/patches/BUILD.bazel
+++ b/patches/BUILD.bazel
@@ -13,7 +13,7 @@

 exports_files([
    "abseil-cpp-20250512.0.patch",
-    "protobuf-v31.0.patch",
+    "protobuf-v31.1.patch",
    "pybind11_bazel.patch",
    "pybind11_abseil.patch",
    "pybind11_protobuf.patch",
--- a/patches/fuzztest-2025-02-14.patch
+++ b/patches/fuzztest-2025-02-14.patch
@@ -36,7 +36,7 @@ index 1f4f08d..cc4d0ba 100644
 
 set(proto_URL https://github.com/protocolbuffers/protobuf.git)
 -set(proto_TAG v28.2)
-+set(proto_TAG v31.0)
+set(proto_TAG v31.1)
 
 set(nlohmann_json_URL https://github.com/nlohmann/json.git)
 set(nlohmann_json_TAG v3.11.2)
--- a/patches/protobuf-v31.1.patch
+++ b/patches/protobuf-v31.1.patch