dependency: bump protobuf to v30.2

2025-03-28 09:38:15 +01:00
parent 94cb4537c3
commit 520ec2e026
16 changed files with 18 additions and 18 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20250127.1
-Protobuf=v30.1
+Protobuf=v30.2
 Eigen=3.4.0
 Re2=2024-04-01
 CoinUtils=2.11.12
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -25,7 +25,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_
 bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
 bazel_dep(name = "highs", version = "1.10.0")
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "protobuf", version = "30.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf")
 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,7 +2,7 @@
 absl-py==2.1.0
 immutabledict==3.0.0
 numpy==2.2.0
-protobuf==6.30.1
+protobuf==6.30.2
 requests==2.32.0
 scipy==1.14.1

--- a/bazel/notebook_requirements.txt
+++ b/bazel/notebook_requirements.txt
@@ -216,7 +216,7 @@ prometheus-client==0.17.1
    # via jupyter-server
 prompt-toolkit==3.0.39
    # via ipython
-protobuf==6.30.1
+protobuf==6.30.2
    # via
    #   -r bazel/notebook_requirements.in
    #   mypy-protobuf
--- a/bazel/ortools_requirements.in
+++ b/bazel/ortools_requirements.in
@@ -2,7 +2,7 @@
 absl-py==2.1.0
 immutabledict==3.0.0
 numpy==2.2.0
-protobuf==6.30.1
+protobuf==6.30.2
 requests==2.32.3
 scipy==1.14.1

--- a/bazel/ortools_requirements.txt
+++ b/bazel/ortools_requirements.txt
@@ -45,7 +45,7 @@ platformdirs==3.10.0
    # via
    #   black
    #   virtualenv
-protobuf==6.30.1
+protobuf==6.30.2
    # via
    #   -r bazel/ortools_requirements.in
    #   mypy-protobuf
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -113,10 +113,10 @@ if(BUILD_Protobuf)
  FetchContent_Declare(
    Protobuf
    GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v30.1"
+    GIT_TAG "v30.2"
    GIT_SHALLOW TRUE
    GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v30.1.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v30.2.patch"
  )
  FetchContent_MakeAvailable(Protobuf)
  list(POP_BACK CMAKE_MESSAGE_INDENT)
--- a/cmake/host.CMakeLists.txt
+++ b/cmake/host.CMakeLists.txt
@@ -124,10 +124,10 @@ set(protobuf_WITH_ZLIB OFF)
 FetchContent_Declare(
  protobuf
  GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-  GIT_TAG "v30.1"
+  GIT_TAG "v30.2"
  GIT_SHALLOW TRUE
  GIT_SUBMODULES ""
-  PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.1.patch"
+  PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v30.2.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.30.1"/>
+    <PackageReference Include="Google.Protobuf" Version="3.30.2"/>
  </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.30.1"/>
+    <PackageReference Include="Google.Protobuf" Version="3.30.2"/>
  </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.30.1</version>
+    <version>4.30.2</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.30.1</version>
+    <version>4.30.2</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.30.1,<6.31',
+        'protobuf >= 6.30.2,<6.31',
        'immutabledict >= 3.0.0',
    ],
    package_data={
--- a/patches/BUILD.bazel
+++ b/patches/BUILD.bazel
@@ -14,7 +14,7 @@
 exports_files([
    "abseil-cpp-20250127.1.patch",
    "highs-v1.9.0.patch",
-    "protobuf-v30.1.patch",
+    "protobuf-v30.2.patch",
    "pybind11_abseil.patch",
    "pybind11_protobuf.patch",
    "pybind11.patch",
--- a/patches/fuzztest-2025-02-14.patch
+++ b/patches/fuzztest-2025-02-14.patch
@@ -28,7 +28,7 @@ index 1f4f08d..cc4d0ba 100644
 
 set(gtest_URL https://github.com/google/googletest.git)
 -set(gtest_TAG v1.14.0)
-+set(gtest_TAG v1.15.2)
+set(gtest_TAG v1.16.0)
 
 # From https://www.antlr.org/download.html
 set(antlr_cpp_URL https://www.antlr.org/download/antlr4-cpp-runtime-4.12.0-source.zip)
@@ -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 v30.1)
+set(proto_TAG v30.2)
 
 set(nlohmann_json_URL https://github.com/nlohmann/json.git)
 set(nlohmann_json_TAG v3.11.2)
--- a/patches/protobuf-v30.2.patch
+++ b/patches/protobuf-v30.2.patch