dependencies: Bump Protobuf from v24.4 to v25.0

google · Nov 10, 2023 · 129e1a8 · 129e1a8
1 parent 6bd11bc
commit 129e1a8
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 18 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=v24.4
+Protobuf=v25.0
 abseil-cpp=20230802.1
 Cbc=2.10.7
 Cgl=0.60.5

diff --git a/WORKSPACE b/WORKSPACE
@@ -100,8 +100,8 @@ git_repository(
 ## Protobuf
 git_repository(
     name = "com_google_protobuf",
-    tag = "v24.4",
-    patches = ["//patches:protobuf-v24.4.patch"],
+    tag = "v25.0",
+    patches = ["//patches:protobuf-v25.0.patch"],
     patch_args = ["-p1"],
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )

diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in
@@ -1,7 +1,7 @@
 # OR-Tools code dependencies
 absl-py==2.0.0
 numpy==1.26.1
-protobuf==4.24.4
+protobuf==4.25.0
 scipy==1.11.3
 
 # OR-Tools build dependencies

diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt
@@ -228,7 +228,7 @@ prompt-toolkit==3.0.39
     # via
     #   ipython
     #   jupyter-console
-protobuf==4.24.4
+protobuf==4.25.0
     # via
     #   -r bazel/notebook_requirements.in
     #   mypy-protobuf

diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in
@@ -1,7 +1,7 @@
 # OR-Tools code dependencies
 absl-py==2.0.0
 numpy==1.26.1
-protobuf==4.24.4
+protobuf==4.25.0
 scipy==1.11.3
 
 # OR-Tools build dependencies

diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt
@@ -37,7 +37,7 @@ platformdirs==3.10.0
     # via
     #   black
     #   virtualenv
-protobuf==4.24.4
+protobuf==4.25.0
     # via
     #   -r bazel/ortools_requirements.in
     #   mypy-protobuf

diff --git 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.4"
+    GIT_TAG "v25.0"
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.4.patch")
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v25.0.patch")
   FetchContent_MakeAvailable(protobuf)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")

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 "v24.4"
+  GIT_TAG "v25.0"
   GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.4.patch")
+  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v25.0.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
@@ -184,7 +184,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.24.4"/>
+    <PackageReference Include="Google.Protobuf" Version="3.25.0"/>
   </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
@@ -172,7 +172,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.24.4"/>
+    <PackageReference Include="Google.Protobuf" Version="3.25.0"/>
   </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>3.24.4</version>
+    <version>3.25.0</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>3.24.4</version>
+    <version>3.25.0</version>
   </dependency>
 </dependencies>
 

diff --git 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.4</version>
+    <version>3.25.0</version>
   </dependency>
   <dependency>
     <groupId>junit</groupId>

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 >= 4.24.4',
+        'protobuf >= 4.25.0',
     ],
     package_data={
         '@PYTHON_PROJECT@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PROJECT_NAME@,TYPE>,SHARED_LIBRARY>:'.libs/*','../$<TARGET_SONAME_FILE_NAME:@PROJECT_NAME@>'>],

diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel
@@ -13,7 +13,7 @@
 
 exports_files([
     "abseil-cpp-20230802.1.patch",
-    "protobuf-v24.4.patch",
+    "protobuf-v25.0.patch",
     "pybind11.patch",
     "pybind11_bazel.patch",
     "pybind11_protobuf.patch",

diff --git a/patches/protobuf-v24.4.patch → patches/protobuf-v25.0.patch b/patches/protobuf-v24.4.patch → patches/protobuf-v25.0.patch