Skip to content

Commit a86127f

Browse files
committed
deps: Bump Protobuf to v29.2
1 parent 2563173 commit a86127f

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

Dependencies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB=1.3.1
22
abseil-cpp=20240722.0
3-
Protobuf=v29.1
3+
Protobuf=v29.2
44
Eigen=3.4.0
55
Re2=2024-04-01
66
CoinUtils=2.11.12

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ if(BUILD_Protobuf)
108108
FetchContent_Declare(
109109
Protobuf
110110
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
111-
GIT_TAG "v29.1"
111+
GIT_TAG "v29.2"
112112
GIT_SHALLOW TRUE
113113
GIT_SUBMODULES ""
114-
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.1.patch"
114+
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.2.patch"
115115
)
116116
FetchContent_MakeAvailable(Protobuf)
117117
list(POP_BACK CMAKE_MESSAGE_INDENT)

cmake/host.CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ set(protobuf_WITH_ZLIB OFF)
121121
FetchContent_Declare(
122122
protobuf
123123
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
124-
GIT_TAG "v29.1"
124+
GIT_TAG "v29.2"
125125
GIT_SUBMODULES ""
126-
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.1.patch")
126+
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.2.patch")
127127
FetchContent_MakeAvailable(protobuf)
128128
list(POP_BACK CMAKE_MESSAGE_INDENT)
129129
message(CHECK_PASS "fetched")

ortools/dotnet/Google.OrTools-full.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</ItemGroup>
194194

195195
<ItemGroup>
196-
<PackageReference Include="Google.Protobuf" Version="3.29.1"/>
196+
<PackageReference Include="Google.Protobuf" Version="3.29.2"/>
197197
</ItemGroup>
198198

199199
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

ortools/dotnet/Google.OrTools-local.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
</ItemGroup>
182182

183183
<ItemGroup>
184-
<PackageReference Include="Google.Protobuf" Version="3.29.1"/>
184+
<PackageReference Include="Google.Protobuf" Version="3.29.2"/>
185185
</ItemGroup>
186186

187187
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

ortools/java/pom-full.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>com.google.protobuf</groupId>
111111
<artifactId>protobuf-java</artifactId>
112-
<version>4.29.1</version>
112+
<version>4.29.2</version>
113113
</dependency>
114114
</dependencies>
115115

ortools/java/pom-local.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.google.protobuf</groupId>
8383
<artifactId>protobuf-java</artifactId>
84-
<version>4.29.1</version>
84+
<version>4.29.2</version>
8585
</dependency>
8686
</dependencies>
8787

ortools/python/setup.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ setup(
4646
'absl-py >= 2.0.0',
4747
'numpy >= 1.13.3',
4848
'pandas >= 2.0.0',
49-
'protobuf >= 5.29.1,<5.30',
49+
'protobuf >= 5.29.2,<5.30',
5050
'immutabledict >= 3.0.0',
5151
],
5252
package_data={

patches/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
exports_files([
1515
"abseil-cpp-20240722.0.patch",
1616
"highs-v1.8.1.patch",
17-
"protobuf-v29.1.patch",
17+
"protobuf-v29.2.patch",
1818
"pybind11_abseil.patch",
1919
"pybind11_protobuf.patch",
2020
"pybind11.patch",

0 commit comments

Comments
 (0)