Fix: Revert Protobuf to 3.12.2

note: 3.12.3 is borken and tag was added on the wrong branch ref: protocolbuffers/protobuf#7632 (comment)
google · Jun 18, 2020 · 95b9094 · 95b9094
1 parent 78a7de8
commit 95b9094
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Dependencies.txt b/Dependencies.txt
@@ -1,6 +1,6 @@
 gflags=2.2.2
 glog=0.4.0
-Protobuf=3.12.3
+Protobuf=3.12.2
 abseil-cpp=20200225.2
 Cbc=2.10.5
 Cgl=0.60.3

diff --git a/WORKSPACE b/WORKSPACE
@@ -21,7 +21,7 @@ git_repository(
 
 git_repository(
     name = "com_google_protobuf",
-    commit = "31ebe2a",  # release v3.12.3
+    commit = "678da4f",  # release v3.12.2
     remote = "https://github.com/protocolbuffers/protobuf.git",
 )
 

diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
@@ -102,7 +102,7 @@ if(BUILD_Protobuf)
     REPOSITORY
       "https://github.com/protocolbuffers/protobuf.git"
     TAG
-      "v3.12.3"
+      "v3.12.2"
     CMAKE_ARGS
       -Dprotobuf_MSVC_STATIC_RUNTIME:BOOL=OFF
       -Dprotobuf_BUILD_TESTS:BOOL=OFF

diff --git a/makefiles/Makefile.third_party.unix.mk b/makefiles/Makefile.third_party.unix.mk
@@ -21,7 +21,7 @@ PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY})
 # Tags of dependencies to checkout.
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.4.0
-PROTOBUF_TAG = v3.12.3
+PROTOBUF_TAG = v3.12.2
 ABSL_TAG = 20200225.2
 CBC_TAG = 2.10.5
 CGL_TAG = 0.60.3

diff --git a/makefiles/Makefile.third_party.win.mk b/makefiles/Makefile.third_party.win.mk
@@ -37,7 +37,7 @@ ZLIB_TAG = 1.2.11
 ZLIB_ARCHIVE_TAG = 1211
 GFLAGS_TAG = 2.2.2
 GLOG_TAG = 0.4.0
-PROTOBUF_TAG = v3.12.3
+PROTOBUF_TAG = v3.12.2
 ABSL_TAG = 20200225.2
 CBC_TAG = 2.10.5
 CGL_TAG = 0.60.3

diff --git a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
@@ -137,7 +137,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.12.3"/>
+    <PackageReference Include="Google.Protobuf" Version="3.12.2"/>
   </ItemGroup>
 
   <!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->