deps: Bump protobuf to v28.3

2024-11-08 11:39:01 +01:00
parent 0a9aa728e8
commit 28ff3d5b2e
15 changed files with 19 additions and 19 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20240722.0
-Protobuf=v28.2
+Protobuf=v28.3
 Eigen=3.4.0
 Re2=2024-04-01
 CoinUtils=2.11.6
--- a/4
+++ b/4
@@ -148,9 +148,9 @@ install_notebook_deps()
 # This statement defines the @com_google_protobuf repo.
 git_repository(
    name = "com_google_protobuf",
-    patches = ["//patches:protobuf-v28.2.patch"],
+    patches = ["//patches:protobuf-v28.3.patch"],
    patch_args = ["-p1"],
-    tag = "v28.2",
+    tag = "v28.3",
    remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 # Load common dependencies.
--- 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.1.1
-protobuf==5.28.2
+protobuf==5.28.3
 requests==2.32.0
 scipy==1.14.1

--- a/bazel/notebook_requirements.txt
+++ b/bazel/notebook_requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    bazel run //bazel:notebook_requirements.update
@@ -216,7 +216,7 @@ prometheus-client==0.17.1
    # via jupyter-server
 prompt-toolkit==3.0.39
    # via ipython
-protobuf==5.28.2
+protobuf==5.28.3
    # 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.1.1
-protobuf==5.28.2
+protobuf==5.28.3
 requests==2.32.3
 scipy==1.14.1

--- a/bazel/ortools_requirements.txt
+++ b/bazel/ortools_requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.11
+# This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
 #    bazel run //bazel:ortools_requirements.update
@@ -45,7 +45,7 @@ platformdirs==3.10.0
    # via
    #   black
    #   virtualenv
-protobuf==5.28.2
+protobuf==5.28.3
    # via
    #   -r bazel/ortools_requirements.in
    #   mypy-protobuf
--- 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 "v28.2"
+    GIT_TAG "v28.3"
    GIT_SHALLOW TRUE
    GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.2.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.3.patch"
  )
  FetchContent_MakeAvailable(Protobuf)
  list(POP_BACK CMAKE_MESSAGE_INDENT)
--- 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 "v28.2"
+  GIT_TAG "v28.3"
  GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.2.patch")
+  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.3.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
@@ -193,7 +193,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.28.2"/>
+    <PackageReference Include="Google.Protobuf" Version="3.28.3"/>
  </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.28.2"/>
+    <PackageReference Include="Google.Protobuf" Version="3.28.3"/>
  </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.28.2</version>
+    <version>4.28.3</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.28.2</version>
+    <version>4.28.3</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 >= 5.28.2,<5.29',
+        'protobuf >= 5.28.3,<5.29',
        'immutabledict >= 3.0.0',
    ],
    package_data={
--- a/patches/BUILD.bazel
+++ b/patches/BUILD.bazel
@@ -14,7 +14,7 @@
 exports_files([
    "abseil-cpp-20240722.0.patch",
    "highs-v1.8.0.patch",
-    "protobuf-v28.2.patch",
+    "protobuf-v28.3.patch",
    "pybind11_abseil.patch",
    "pybind11_bazel.patch",
    "pybind11_protobuf.patch",
--- a/patches/protobuf-v28.3.patch
+++ b/patches/protobuf-v28.3.patch