Merge branch 'main' of github.com:google/or-tools

google · Dec 20, 2024 · 587a788 · 587a788
2 parents 239a1c0 + a86127f
commit 587a788
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20240722.0
-Protobuf=v29.1
+Protobuf=v29.2
 Eigen=3.4.0
 Re2=2024-04-01
 CoinUtils=2.11.12

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 "v29.1"
+    GIT_TAG "v29.2"
     GIT_SHALLOW TRUE
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.1.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.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 "v29.1"
+  GIT_TAG "v29.2"
   GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.1.patch")
+  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.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.29.1"/>
+    <PackageReference Include="Google.Protobuf" Version="3.29.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.29.1"/>
+    <PackageReference Include="Google.Protobuf" Version="3.29.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.29.1</version>
+    <version>4.29.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.29.1</version>
+    <version>4.29.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.29.1,<5.30',
+        'protobuf >= 5.29.2,<5.30',
         '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-v1.8.1.patch",
-    "protobuf-v29.1.patch",
+    "protobuf-v29.2.patch",
     "pybind11_abseil.patch",
     "pybind11_protobuf.patch",
     "pybind11.patch",

diff --git a/patches/protobuf-v29.1.patch → patches/protobuf-v29.2.patch b/patches/protobuf-v29.1.patch → patches/protobuf-v29.2.patch