Bump Protobuf 3.15.7 -> 3.15.8 (Fix #2524)

2021-04-27 15:31:30 +02:00
parent e0d46edd74
commit af7247758d
13 changed files with 18 additions and 18 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,4 +1,4 @@
-Protobuf=3.15.7
+Protobuf=3.15.8
 abseil-cpp=20210324.1
 Cbc=2.10.5
 Cgl=0.60.3
--- a/2
+++ b/2
@@ -29,7 +29,7 @@ http_archive(
 # Protobuf
 git_repository(
    name = "com_google_protobuf",
-    commit = "878be35",  # release v3.15.7
+    commit = "436bd78",  # release v3.15.8
    remote = "https://github.com/protocolbuffers/protobuf.git",
 )

--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -114,17 +114,17 @@ if(BUILD_Protobuf)
    FetchContent_Declare(
      protobuf
      GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      GIT_TAG "v3.15.7"
+      GIT_TAG "v3.15.8"
      GIT_SUBMODULES ""
-      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.15.7.patch"
+      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.15.8.patch"
      SOURCE_SUBDIR cmake)
    FetchContent_MakeAvailable(protobuf)
  else()
    fetch_git_dependency(
      NAME Protobuf
      REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      TAG "v3.15.7"
-      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.15.7.patch\""
+      TAG "v3.15.8"
+      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v3.15.8.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.15.7"
+      GIT_TAG "v3.15.8"
      GIT_SUBMODULES ""
-      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.15.7.patch"
+      PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.15.8.patch"
      SOURCE_SUBDIR cmake)
  FetchContent_MakeAvailable(protobuf)
 else()
  fetch_git_dependency(
      NAME Protobuf
      REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-      TAG "v3.15.7"
-      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.15.7.patch\""
+      TAG "v3.15.8"
+      PATCH_COMMAND "git apply \"${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v3.15.8.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.15.7
+PROTOBUF_TAG = v3.15.8
 ABSL_TAG = 20210324.1
 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.15.7
+PROTOBUF_TAG = v3.15.8
 ABSL_TAG = 20210324.1
 # 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/Google.OrTools.csproj.in
+++ b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
@@ -141,7 +141,7 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.15.7"/>
+    <PackageReference Include="Google.Protobuf" Version="3.15.8"/>
  </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.15.7</version>
+    <version>3.15.8</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.15.7</version>
+    <version>3.15.8</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.15.7</version>
+    <version>3.15.8</version>
  </dependency>
  <dependency>
    <groupId>junit</groupId>
--- a/ortools/python/setup.py.in
+++ b/ortools/python/setup.py.in
@@ -42,7 +42,7 @@ setup(
    version='@PROJECT_VERSION@',
    packages=find_packages(),
    install_requires=[
-        'protobuf >= 3.15.7',
+        'protobuf >= 3.15.8',
        'absl-py >= 0.11',
    ],
    package_data={
--- a/patches/protobuf-v3.15.8.patch
+++ b/patches/protobuf-v3.15.8.patch
--- a/tools/setup.py.in
+++ b/tools/setup.py.in
@@ -42,7 +42,7 @@ setup(
    version='VVVV',
    packages=find_packages(),
    install_requires=[
-        'protobuf >= 3.15.7',
+        'protobuf >= 3.15.8',
        'absl-py >= 0.11',
    ],
    package_data={