dependency: Bump Protobuf to v28.2

google · Oct 22, 2024 · c7b05c9 · c7b05c9
1 parent 5736c71
commit c7b05c9
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 20 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20240722.0
-Protobuf=v27.3
+Protobuf=v28.2
 Eigen=3.4.0
 Re2=2024-04-01
 CoinUtils=2.11.6
@@ -17,3 +17,4 @@ pybind11_abseil=52f2739
 pybind11_protobuf=3b11990
 # Testing
 googletest=v1.15.2
+benchmark=v1.8.4
diff --git a/WORKSPACE b/WORKSPACE
@@ -148,9 +148,9 @@ install_notebook_deps()
 # This statement defines the @com_google_protobuf repo.
 git_repository(
     name = "com_google_protobuf",
-    patches = ["//patches:protobuf-v27.3.patch"],
+    patches = ["//patches:protobuf-v28.2.patch"],
     patch_args = ["-p1"],
-    tag = "v27.3",
+    tag = "v28.2",
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 # Load common dependencies.

diff --git 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.27.5
+protobuf==5.28.2
 requests==2.32.0
 scipy==1.14.1
 

diff --git 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==5.27.5
+protobuf==5.28.2
     # via
     #   -r bazel/notebook_requirements.in
     #   mypy-protobuf

diff --git 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.27.5
+protobuf==5.28.2
 requests==2.32.3
 scipy==1.14.1
 

diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt
@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    bazel run //bazel:ortools_requirements.update
 #
-absl-py==2.0.0
+absl-py==2.1.0
     # via -r bazel/ortools_requirements.in
 black==24.8.0
     # via -r bazel/ortools_requirements.in
@@ -30,7 +30,7 @@ mypy-extensions==1.0.0
     #   mypy
 mypy-protobuf==3.5.0
     # via -r bazel/ortools_requirements.in
-numpy==2.1.0
+numpy==2.1.1
     # via
     #   -r bazel/ortools_requirements.in
     #   pandas
@@ -45,7 +45,7 @@ platformdirs==3.10.0
     # via
     #   black
     #   virtualenv
-protobuf==5.27.3
+protobuf==5.28.2
     # via
     #   -r bazel/ortools_requirements.in
     #   mypy-protobuf

diff --git 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 "v27.3"
+    GIT_TAG "v28.2"
     GIT_SHALLOW TRUE
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v27.3.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.2.patch"
   )
   FetchContent_MakeAvailable(Protobuf)
   list(POP_BACK CMAKE_MESSAGE_INDENT)

diff --git 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 "v27.3"
+  GIT_TAG "v28.2"
   GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v27.3.patch")
+  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.2.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
@@ -193,7 +193,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.27.3"/>
+    <PackageReference Include="Google.Protobuf" Version="3.28.2"/>
   </ItemGroup>
 
   <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

diff --git 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.27.3"/>
+    <PackageReference Include="Google.Protobuf" Version="3.28.2"/>
   </ItemGroup>
 
   <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

diff --git 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.27.3</version>
+    <version>4.28.2</version>
   </dependency>
 </dependencies>
 

diff --git 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.27.3</version>
+    <version>4.28.2</version>
   </dependency>
 </dependencies>
 

diff --git 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.27.3,<5.28',
+        'protobuf >= 5.28.2,<5.29',
         'immutabledict >= 3.0.0',
     ],
     package_data={

diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel
@@ -14,7 +14,7 @@
 exports_files([
     "abseil-cpp-20240722.0.patch",
     "highs.patch",
-    "protobuf-v27.3.patch",
+    "protobuf-v28.2.patch",
     "pybind11_abseil.patch",
     "pybind11_bazel.patch",
     "pybind11_protobuf.patch",

diff --git a/patches/protobuf-v27.3.patch → patches/protobuf-v28.2.patch b/patches/protobuf-v27.3.patch → patches/protobuf-v28.2.patch