deps: Bump Protobuf 3.19.1 -> 3.19.4

2022-02-02 11:00:24 +01:00
parent 4defaa23ed
commit 8c4b96c65e
13 changed files with 18 additions and 18 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=3.19.1
+Protobuf=3.19.4
 abseil-cpp=20211102.0
 Cbc=2.10.5
 Cgl=0.60.3
--- a/2
+++ b/2
@@ -31,7 +31,7 @@ http_archive(
 # Protobuf
 git_repository(
    name = "com_google_protobuf",
-    commit = "7c40b2d",  # release v3.19.1
+    commit = "22d0e26",  # release v3.19.4
    remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 # Load common dependencies.
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -87,17 +87,17 @@ if(BUILD_Protobuf)
    FetchContent_Declare(
      protobuf
      GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      GIT_TAG "v3.19.1"
+      GIT_TAG "v3.19.4"
      GIT_SUBMODULES ""
-      PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.19.1.patch"
+      PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.19.4.patch"
      SOURCE_SUBDIR cmake)
    FetchContent_MakeAvailable(protobuf)
  else()
    fetch_git_dependency(
      NAME Protobuf
      REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      TAG "v3.19.1"
-      PATCH_COMMAND "git apply --ignore-whitespace \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.19.1.patch\""
+      TAG "v3.19.4"
+      PATCH_COMMAND "git apply --ignore-whitespace \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.19.4.patch\""
      SOURCE_SUBDIR cmake
      )
  endif()
--- a/cmake/host.CMakeLists.txt
+++ b/cmake/host.CMakeLists.txt
@@ -106,17 +106,17 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18")
  FetchContent_Declare(
      protobuf
      GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      GIT_TAG "v3.19.1"
+      GIT_TAG "v3.19.4"
      GIT_SUBMODULES ""
-      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.19.1.patch"
+      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.19.4.patch"
      SOURCE_SUBDIR cmake)
  FetchContent_MakeAvailable(protobuf)
 else()
  fetch_git_dependency(
      NAME Protobuf
      REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      TAG "v3.19.1"
-      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.19.1.patch\""
+      TAG "v3.19.4"
+      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.19.4.patch\""
      SOURCE_SUBDIR cmake)
 endif()
 list(POP_BACK CMAKE_MESSAGE_INDENT)
--- a/makefiles/Makefile.third_party.unix.mk
+++ b/makefiles/Makefile.third_party.unix.mk
@@ -20,7 +20,7 @@ UNIX_SWIG_BINARY ?= swig
 PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY})

 # Tags of dependencies to checkout.
-PROTOBUF_TAG = v3.19.1
+PROTOBUF_TAG = v3.19.4
 ABSL_TAG = 20211102.0
 CBC_TAG = 2.10.5
 CGL_TAG = 0.60.3
--- a/makefiles/Makefile.third_party.win.mk
+++ b/makefiles/Makefile.third_party.win.mk
@@ -35,7 +35,7 @@ SWIG_BINARY = $(WINDOWS_SWIG_BINARY)
 # tags of dependencies to checkout.
 ZLIB_TAG = 1.2.11
 ZLIB_ARCHIVE_TAG = 1211
-PROTOBUF_TAG = v3.19.1
+PROTOBUF_TAG = v3.19.4
 ABSL_TAG = 20211102.0
 # We are using a CBC archive containing all coin-or project
 # since Clp 2.17.5+ is broken we need to stick with Cbc 2.10.4
--- a/ortools/dotnet/Google.OrTools.csproj.in
+++ b/ortools/dotnet/Google.OrTools.csproj.in
@@ -144,7 +144,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.19.1"/>
+    <PackageReference Include="Google.Protobuf" Version="3.19.4"/>
  </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
@@ -95,7 +95,7 @@
  <dependency>
    <groupId>com.google.protobuf</groupId>
    <artifactId>protobuf-java</artifactId>
-    <version>3.19.1</version>
+    <version>3.19.4</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>3.19.1</version>
+    <version>3.19.4</version>
  </dependency>
 </dependencies>

--- 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.19.1</version>
+    <version>3.19.4</version>
  </dependency>
  <dependency>
    <groupId>junit</groupId>
--- a/ortools/python/setup.py.in
+++ b/ortools/python/setup.py.in
@@ -45,7 +45,7 @@ setup(
    install_requires=[
        'absl-py >= 0.13',
        'numpy >= 1.13.3',
-        'protobuf >= 3.19.1',
+        'protobuf >= 3.19.4',
    ],
    package_data={
        '@PROJECT_NAME@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PYTHON_PROJECT@,TYPE>,SHARED_LIBRARY>:'.libs/*', '../$<TARGET_SONAME_FILE_NAME:@PYTHON_PROJECT@>'>],
--- a/patches/protobuf-v3.19.4.patch
+++ b/patches/protobuf-v3.19.4.patch
--- a/tools/setup.py.in
+++ b/tools/setup.py.in
@@ -45,7 +45,7 @@ setup(
    install_requires=[
        'absl-py >= 0.13',
        'numpy >= 1.13.3',
-        'protobuf >= 3.19.1',
+        'protobuf >= 3.19.4',
    ],
    package_data={
        'ortools.init' : ['_pywrapinit.dll', '*.pyi'],