From cd7b27be386290d9fbca89c7d52a51c2d1a8bf4c Mon Sep 17 00:00:00 2001 From: Rafi Kamal Date: Fri, 15 Nov 2019 17:44:10 -0800 Subject: [PATCH] Update protobuf version (#6898) --- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- js/package.json | 2 +- php/ext/google/protobuf/package.xml | 20 ++++++++-- php/ext/google/protobuf/protobuf.h | 2 +- .../Protobuf/Internal/DescriptorProto.php | 4 +- .../DescriptorProto/ExtensionRange.php | 6 +-- .../DescriptorProto/ReservedRange.php | 4 +- .../Protobuf/Internal/EnumDescriptorProto.php | 4 +- .../EnumDescriptorProto/EnumReservedRange.php | 4 +- .../Google/Protobuf/Internal/EnumOptions.php | 4 +- .../Internal/EnumValueDescriptorProto.php | 6 +-- .../Protobuf/Internal/EnumValueOptions.php | 2 +- .../Internal/FieldDescriptorProto.php | 20 +++++----- .../Google/Protobuf/Internal/FieldOptions.php | 12 +++--- .../Protobuf/Internal/FileDescriptorProto.php | 10 ++--- .../Google/Protobuf/Internal/FileOptions.php | 40 +++++++++---------- .../Internal/GeneratedCodeInfo/Annotation.php | 6 +-- .../Protobuf/Internal/MessageOptions.php | 8 ++-- .../Internal/MethodDescriptorProto.php | 12 +++--- .../Protobuf/Internal/MethodOptions.php | 4 +- .../Internal/OneofDescriptorProto.php | 4 +- .../Internal/ServiceDescriptorProto.php | 4 +- .../Protobuf/Internal/ServiceOptions.php | 2 +- .../Internal/SourceCodeInfo/Location.php | 4 +- .../Protobuf/Internal/UninterpretedOption.php | 12 +++--- .../Internal/UninterpretedOption/NamePart.php | 4 +- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- 38 files changed, 120 insertions(+), 106 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index d21d3cc7bb7e..63909d3c69cd 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.11.0-rc0' + s.version = '3.11.0-rc1' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = '3-Clause BSD License' diff --git a/Protobuf.podspec b/Protobuf.podspec index 11d0963a46ef..a4b3f4b5a6be 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -5,7 +5,7 @@ # dependent projects use the :git notation to refer to the library. Pod::Spec.new do |s| s.name = 'Protobuf' - s.version = '3.11.0-rc0' + s.version = '3.11.0-rc1' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = '3-Clause BSD License' diff --git a/configure.ac b/configure.ac index f741fecdfa6d..af2d980bcf9a 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) # In the SVN trunk, the version should always be the next anticipated release # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.11.0-rc-0],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.11.0-rc-1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 9357025f3da7..d1a533842a2e 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.11.0-rc0 + 3.11.0-rc1 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/master/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index a81a52f76988..837b5658ffa3 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.11.0-rc0 + 3.11.0-rc1 6 Google Inc. netstandard1.0;netstandard2.0;net45 diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 0adda2203f9d..59f0846b6825 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.11.0-rc-0 + 3.11.0-rc-1 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 8c20b1f65eda..737a9c167aef 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.11.0-rc-0 + 3.11.0-rc-1 protobuf-java diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 3343eb91e1ae..fc91b2c33387 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.11.0-rc-0 + 3.11.0-rc-1 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index c53a9ee64796..04443859f8a8 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.11.0-rc-0 + 3.11.0-rc-1 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 54a35817c754..082c7ddafa17 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.11.0-rc-0 + 3.11.0-rc-1 protobuf-java-util diff --git a/js/package.json b/js/package.json index c9ea4de53768..2cfba39ba8ef 100644 --- a/js/package.json +++ b/js/package.json @@ -1,6 +1,6 @@ { "name": "google-protobuf", - "version": "3.11.0-rc.0", + "version": "3.11.0-rc.1", "description": "Protocol Buffers for JavaScript", "main": "google-protobuf.js", "files": [ diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index ba2521c2a8a7..bee8b035a42e 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,10 +10,10 @@ protobuf-opensource@google.com yes - 2019-10-03 - + 2019-11-15 + - 3.11.0RC0 + 3.11.0RC1 3.11.0 @@ -431,5 +431,19 @@ G A release. 3-Clause BSD License GA release. + + + 3.11.0RC1 + 3.11.0 + + + beta + beta + + 2019-11-15 + + 3-Clause BSD License + GA release. + diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 6151ff4cd613..908134118ff0 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -37,7 +37,7 @@ #include "upb.h" #define PHP_PROTOBUF_EXTNAME "protobuf" -#define PHP_PROTOBUF_VERSION "3.11.0RC0" +#define PHP_PROTOBUF_VERSION "3.11.0RC1" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto.php b/php/src/Google/Protobuf/Internal/DescriptorProto.php index 3b215d52ae4d..7cc689d0282e 100644 --- a/php/src/Google/Protobuf/Internal/DescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/DescriptorProto.php @@ -20,7 +20,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field repeated .google.protobuf.FieldDescriptorProto field = 2; @@ -55,7 +55,7 @@ class DescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional .google.protobuf.MessageOptions options = 7; */ - private $options = null; + protected $options = null; private $has_options = false; /** * Generated from protobuf field repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9; diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php index a2057fd5d17e..82b5695efe49 100644 --- a/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php +++ b/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php @@ -20,19 +20,19 @@ class ExtensionRange extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 start = 1; */ - private $start = 0; + protected $start = 0; private $has_start = false; /** * Exclusive. * * Generated from protobuf field optional int32 end = 2; */ - private $end = 0; + protected $end = 0; private $has_end = false; /** * Generated from protobuf field optional .google.protobuf.ExtensionRangeOptions options = 3; */ - private $options = null; + protected $options = null; private $has_options = false; /** diff --git a/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php b/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php index 73c964faa0b5..8022151abfc6 100644 --- a/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php +++ b/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php @@ -24,14 +24,14 @@ class ReservedRange extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 start = 1; */ - private $start = 0; + protected $start = 0; private $has_start = false; /** * Exclusive. * * Generated from protobuf field optional int32 end = 2; */ - private $end = 0; + protected $end = 0; private $has_end = false; /** diff --git a/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php b/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php index da30fa99067f..f5c7fe148281 100644 --- a/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php @@ -20,7 +20,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field repeated .google.protobuf.EnumValueDescriptorProto value = 2; @@ -30,7 +30,7 @@ class EnumDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional .google.protobuf.EnumOptions options = 3; */ - private $options = null; + protected $options = null; private $has_options = false; /** * Range of reserved numeric values. Reserved numeric values may not be used diff --git a/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php b/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php index e1079585ec01..949dd891071f 100644 --- a/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php +++ b/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php @@ -26,14 +26,14 @@ class EnumReservedRange extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 start = 1; */ - private $start = 0; + protected $start = 0; private $has_start = false; /** * Inclusive. * * Generated from protobuf field optional int32 end = 2; */ - private $end = 0; + protected $end = 0; private $has_end = false; /** diff --git a/php/src/Google/Protobuf/Internal/EnumOptions.php b/php/src/Google/Protobuf/Internal/EnumOptions.php index 3d74c81c2176..e6500423b194 100644 --- a/php/src/Google/Protobuf/Internal/EnumOptions.php +++ b/php/src/Google/Protobuf/Internal/EnumOptions.php @@ -21,7 +21,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool allow_alias = 2; */ - private $allow_alias = false; + protected $allow_alias = false; private $has_allow_alias = false; /** * Is this enum deprecated? @@ -31,7 +31,7 @@ class EnumOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 3 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php b/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php index 50bda008e899..3dd95583ac55 100644 --- a/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php @@ -20,17 +20,17 @@ class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field optional int32 number = 2; */ - private $number = 0; + protected $number = 0; private $has_number = false; /** * Generated from protobuf field optional .google.protobuf.EnumValueOptions options = 3; */ - private $options = null; + protected $options = null; private $has_options = false; /** diff --git a/php/src/Google/Protobuf/Internal/EnumValueOptions.php b/php/src/Google/Protobuf/Internal/EnumValueOptions.php index a267c6d5e25e..9f9fb3bec1bc 100644 --- a/php/src/Google/Protobuf/Internal/EnumValueOptions.php +++ b/php/src/Google/Protobuf/Internal/EnumValueOptions.php @@ -23,7 +23,7 @@ class EnumValueOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 1 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php b/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php index e578197515f8..b231c9e1021e 100644 --- a/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php @@ -20,17 +20,17 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field optional int32 number = 3; */ - private $number = 0; + protected $number = 0; private $has_number = false; /** * Generated from protobuf field optional .google.protobuf.FieldDescriptorProto.Label label = 4; */ - private $label = 0; + protected $label = 0; private $has_label = false; /** * If type_name is set, this need not be set. If both this and type_name @@ -38,7 +38,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional .google.protobuf.FieldDescriptorProto.Type type = 5; */ - private $type = 0; + protected $type = 0; private $has_type = false; /** * For message and enum types, this is the name of the type. If the name @@ -49,7 +49,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string type_name = 6; */ - private $type_name = ''; + protected $type_name = ''; private $has_type_name = false; /** * For extensions, this is the name of the type being extended. It is @@ -57,7 +57,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string extendee = 2; */ - private $extendee = ''; + protected $extendee = ''; private $has_extendee = false; /** * For numeric types, contains the original text representation of the value. @@ -68,7 +68,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string default_value = 7; */ - private $default_value = ''; + protected $default_value = ''; private $has_default_value = false; /** * If set, gives the index of a oneof in the containing type's oneof_decl @@ -76,7 +76,7 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 oneof_index = 9; */ - private $oneof_index = 0; + protected $oneof_index = 0; private $has_oneof_index = false; /** * JSON name of this field. The value is set by protocol compiler. If the @@ -86,12 +86,12 @@ class FieldDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string json_name = 10; */ - private $json_name = ''; + protected $json_name = ''; private $has_json_name = false; /** * Generated from protobuf field optional .google.protobuf.FieldOptions options = 8; */ - private $options = null; + protected $options = null; private $has_options = false; /** diff --git a/php/src/Google/Protobuf/Internal/FieldOptions.php b/php/src/Google/Protobuf/Internal/FieldOptions.php index 751c278d7823..2ccc41825c48 100644 --- a/php/src/Google/Protobuf/Internal/FieldOptions.php +++ b/php/src/Google/Protobuf/Internal/FieldOptions.php @@ -23,7 +23,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING]; */ - private $ctype = 0; + protected $ctype = 0; private $has_ctype = false; /** * The packed option can be enabled for repeated primitive fields to enable @@ -34,7 +34,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool packed = 2; */ - private $packed = false; + protected $packed = false; private $has_packed = false; /** * The jstype option determines the JavaScript type used for values of the @@ -50,7 +50,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL]; */ - private $jstype = 0; + protected $jstype = 0; private $has_jstype = false; /** * Should this field be parsed lazily? Lazy applies only to message-type @@ -80,7 +80,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool lazy = 5 [default = false]; */ - private $lazy = false; + protected $lazy = false; private $has_lazy = false; /** * Is this field deprecated? @@ -90,14 +90,14 @@ class FieldOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 3 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * For Google-internal migration only. Do not use. * * Generated from protobuf field optional bool weak = 10 [default = false]; */ - private $weak = false; + protected $weak = false; private $has_weak = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/FileDescriptorProto.php b/php/src/Google/Protobuf/Internal/FileDescriptorProto.php index cb10aa79390f..c9e3648c2374 100644 --- a/php/src/Google/Protobuf/Internal/FileDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/FileDescriptorProto.php @@ -22,14 +22,14 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * e.g. "foo", "foo.bar", etc. * * Generated from protobuf field optional string package = 2; */ - private $package = ''; + protected $package = ''; private $has_package = false; /** * Names of files imported by this file. @@ -78,7 +78,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional .google.protobuf.FileOptions options = 8; */ - private $options = null; + protected $options = null; private $has_options = false; /** * This field contains optional information about the original source code. @@ -88,7 +88,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional .google.protobuf.SourceCodeInfo source_code_info = 9; */ - private $source_code_info = null; + protected $source_code_info = null; private $has_source_code_info = false; /** * The syntax of the proto file. @@ -96,7 +96,7 @@ class FileDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string syntax = 12; */ - private $syntax = ''; + protected $syntax = ''; private $has_syntax = false; /** diff --git a/php/src/Google/Protobuf/Internal/FileOptions.php b/php/src/Google/Protobuf/Internal/FileOptions.php index 6fea195ec18a..605d92bfda74 100644 --- a/php/src/Google/Protobuf/Internal/FileOptions.php +++ b/php/src/Google/Protobuf/Internal/FileOptions.php @@ -23,7 +23,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string java_package = 1; */ - private $java_package = ''; + protected $java_package = ''; private $has_java_package = false; /** * If set, all the classes from the .proto file are wrapped in a single @@ -34,7 +34,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string java_outer_classname = 8; */ - private $java_outer_classname = ''; + protected $java_outer_classname = ''; private $has_java_outer_classname = false; /** * If set true, then the Java code generator will generate a separate .java @@ -46,14 +46,14 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool java_multiple_files = 10 [default = false]; */ - private $java_multiple_files = false; + protected $java_multiple_files = false; private $has_java_multiple_files = false; /** * This option does nothing. * * Generated from protobuf field optional bool java_generate_equals_and_hash = 20 [deprecated = true]; */ - private $java_generate_equals_and_hash = false; + protected $java_generate_equals_and_hash = false; private $has_java_generate_equals_and_hash = false; /** * If set true, then the Java2 code generator will generate code that @@ -65,12 +65,12 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool java_string_check_utf8 = 27 [default = false]; */ - private $java_string_check_utf8 = false; + protected $java_string_check_utf8 = false; private $has_java_string_check_utf8 = false; /** * Generated from protobuf field optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED]; */ - private $optimize_for = 0; + protected $optimize_for = 0; private $has_optimize_for = false; /** * Sets the Go package where structs generated from this .proto will be @@ -81,7 +81,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string go_package = 11; */ - private $go_package = ''; + protected $go_package = ''; private $has_go_package = false; /** * Should generic services be generated in each language? "Generic" services @@ -96,22 +96,22 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool cc_generic_services = 16 [default = false]; */ - private $cc_generic_services = false; + protected $cc_generic_services = false; private $has_cc_generic_services = false; /** * Generated from protobuf field optional bool java_generic_services = 17 [default = false]; */ - private $java_generic_services = false; + protected $java_generic_services = false; private $has_java_generic_services = false; /** * Generated from protobuf field optional bool py_generic_services = 18 [default = false]; */ - private $py_generic_services = false; + protected $py_generic_services = false; private $has_py_generic_services = false; /** * Generated from protobuf field optional bool php_generic_services = 42 [default = false]; */ - private $php_generic_services = false; + protected $php_generic_services = false; private $has_php_generic_services = false; /** * Is this file deprecated? @@ -121,7 +121,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 23 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * Enables the use of arenas for the proto messages in this file. This applies @@ -129,7 +129,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool cc_enable_arenas = 31 [default = false]; */ - private $cc_enable_arenas = false; + protected $cc_enable_arenas = false; private $has_cc_enable_arenas = false; /** * Sets the objective c class prefix which is prepended to all objective c @@ -137,14 +137,14 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string objc_class_prefix = 36; */ - private $objc_class_prefix = ''; + protected $objc_class_prefix = ''; private $has_objc_class_prefix = false; /** * Namespace for generated classes; defaults to the package. * * Generated from protobuf field optional string csharp_namespace = 37; */ - private $csharp_namespace = ''; + protected $csharp_namespace = ''; private $has_csharp_namespace = false; /** * By default Swift generators will take the proto package and CamelCase it @@ -154,7 +154,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string swift_prefix = 39; */ - private $swift_prefix = ''; + protected $swift_prefix = ''; private $has_swift_prefix = false; /** * Sets the php class prefix which is prepended to all php generated classes @@ -162,7 +162,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string php_class_prefix = 40; */ - private $php_class_prefix = ''; + protected $php_class_prefix = ''; private $has_php_class_prefix = false; /** * Use this option to change the namespace of php generated classes. Default @@ -171,7 +171,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string php_namespace = 41; */ - private $php_namespace = ''; + protected $php_namespace = ''; private $has_php_namespace = false; /** * Use this option to change the namespace of php generated metadata classes. @@ -180,7 +180,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string php_metadata_namespace = 44; */ - private $php_metadata_namespace = ''; + protected $php_metadata_namespace = ''; private $has_php_metadata_namespace = false; /** * Use this option to change the package of ruby generated classes. Default @@ -189,7 +189,7 @@ class FileOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string ruby_package = 45; */ - private $ruby_package = ''; + protected $ruby_package = ''; private $has_ruby_package = false; /** * The parser stores options it doesn't recognize here. diff --git a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php index 09f958d2512c..369fea489293 100644 --- a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php +++ b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php @@ -28,7 +28,7 @@ class Annotation extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string source_file = 2; */ - private $source_file = ''; + protected $source_file = ''; private $has_source_file = false; /** * Identifies the starting offset in bytes in the generated code @@ -36,7 +36,7 @@ class Annotation extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 begin = 3; */ - private $begin = 0; + protected $begin = 0; private $has_begin = false; /** * Identifies the ending offset in bytes in the generated code that @@ -45,7 +45,7 @@ class Annotation extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional int32 end = 4; */ - private $end = 0; + protected $end = 0; private $has_end = false; /** diff --git a/php/src/Google/Protobuf/Internal/MessageOptions.php b/php/src/Google/Protobuf/Internal/MessageOptions.php index 445394211028..95bb706a5a2a 100644 --- a/php/src/Google/Protobuf/Internal/MessageOptions.php +++ b/php/src/Google/Protobuf/Internal/MessageOptions.php @@ -34,7 +34,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool message_set_wire_format = 1 [default = false]; */ - private $message_set_wire_format = false; + protected $message_set_wire_format = false; private $has_message_set_wire_format = false; /** * Disables the generation of the standard "descriptor()" accessor, which can @@ -43,7 +43,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool no_standard_descriptor_accessor = 2 [default = false]; */ - private $no_standard_descriptor_accessor = false; + protected $no_standard_descriptor_accessor = false; private $has_no_standard_descriptor_accessor = false; /** * Is this message deprecated? @@ -53,7 +53,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 3 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * Whether the message is an automatically generated map entry type for the @@ -77,7 +77,7 @@ class MessageOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool map_entry = 7; */ - private $map_entry = false; + protected $map_entry = false; private $has_map_entry = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php b/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php index 1bd5dd3e1c43..f40f20f0d73d 100644 --- a/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php @@ -20,7 +20,7 @@ class MethodDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Input and output type names. These are resolved in the same way as @@ -28,31 +28,31 @@ class MethodDescriptorProto extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string input_type = 2; */ - private $input_type = ''; + protected $input_type = ''; private $has_input_type = false; /** * Generated from protobuf field optional string output_type = 3; */ - private $output_type = ''; + protected $output_type = ''; private $has_output_type = false; /** * Generated from protobuf field optional .google.protobuf.MethodOptions options = 4; */ - private $options = null; + protected $options = null; private $has_options = false; /** * Identifies if client streams multiple client messages * * Generated from protobuf field optional bool client_streaming = 5 [default = false]; */ - private $client_streaming = false; + protected $client_streaming = false; private $has_client_streaming = false; /** * Identifies if server streams multiple server messages * * Generated from protobuf field optional bool server_streaming = 6 [default = false]; */ - private $server_streaming = false; + protected $server_streaming = false; private $has_server_streaming = false; /** diff --git a/php/src/Google/Protobuf/Internal/MethodOptions.php b/php/src/Google/Protobuf/Internal/MethodOptions.php index a2c729a9bbed..6a4c92de5e53 100644 --- a/php/src/Google/Protobuf/Internal/MethodOptions.php +++ b/php/src/Google/Protobuf/Internal/MethodOptions.php @@ -23,12 +23,12 @@ class MethodOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 33 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * Generated from protobuf field optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN]; */ - private $idempotency_level = 0; + protected $idempotency_level = 0; private $has_idempotency_level = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php index 9ecfe5cbfe96..413b8e55eb41 100644 --- a/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php @@ -20,12 +20,12 @@ class OneofDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field optional .google.protobuf.OneofOptions options = 2; */ - private $options = null; + protected $options = null; private $has_options = false; /** diff --git a/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php b/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php index 8de7afd0bcd9..aaeefbc9ea4f 100644 --- a/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php +++ b/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php @@ -20,7 +20,7 @@ class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional string name = 1; */ - private $name = ''; + protected $name = ''; private $has_name = false; /** * Generated from protobuf field repeated .google.protobuf.MethodDescriptorProto method = 2; @@ -30,7 +30,7 @@ class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field optional .google.protobuf.ServiceOptions options = 3; */ - private $options = null; + protected $options = null; private $has_options = false; /** diff --git a/php/src/Google/Protobuf/Internal/ServiceOptions.php b/php/src/Google/Protobuf/Internal/ServiceOptions.php index 67162f3764e6..0581efbafca3 100644 --- a/php/src/Google/Protobuf/Internal/ServiceOptions.php +++ b/php/src/Google/Protobuf/Internal/ServiceOptions.php @@ -23,7 +23,7 @@ class ServiceOptions extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional bool deprecated = 33 [default = false]; */ - private $deprecated = false; + protected $deprecated = false; private $has_deprecated = false; /** * The parser stores options it doesn't recognize here. See above. diff --git a/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php b/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php index bad247a11f66..0aeea61cae0d 100644 --- a/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php +++ b/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php @@ -93,12 +93,12 @@ class Location extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string leading_comments = 3; */ - private $leading_comments = ''; + protected $leading_comments = ''; private $has_leading_comments = false; /** * Generated from protobuf field optional string trailing_comments = 4; */ - private $trailing_comments = ''; + protected $trailing_comments = ''; private $has_trailing_comments = false; /** * Generated from protobuf field repeated string leading_detached_comments = 6; diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption.php b/php/src/Google/Protobuf/Internal/UninterpretedOption.php index 3b517ec552c1..6c871cc1aeb5 100644 --- a/php/src/Google/Protobuf/Internal/UninterpretedOption.php +++ b/php/src/Google/Protobuf/Internal/UninterpretedOption.php @@ -33,32 +33,32 @@ class UninterpretedOption extends \Google\Protobuf\Internal\Message * * Generated from protobuf field optional string identifier_value = 3; */ - private $identifier_value = ''; + protected $identifier_value = ''; private $has_identifier_value = false; /** * Generated from protobuf field optional uint64 positive_int_value = 4; */ - private $positive_int_value = 0; + protected $positive_int_value = 0; private $has_positive_int_value = false; /** * Generated from protobuf field optional int64 negative_int_value = 5; */ - private $negative_int_value = 0; + protected $negative_int_value = 0; private $has_negative_int_value = false; /** * Generated from protobuf field optional double double_value = 6; */ - private $double_value = 0.0; + protected $double_value = 0.0; private $has_double_value = false; /** * Generated from protobuf field optional bytes string_value = 7; */ - private $string_value = ''; + protected $string_value = ''; private $has_string_value = false; /** * Generated from protobuf field optional string aggregate_value = 8; */ - private $aggregate_value = ''; + protected $aggregate_value = ''; private $has_aggregate_value = false; /** diff --git a/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php b/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php index 92ee4b44b92f..1956ba7f085e 100644 --- a/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php +++ b/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php @@ -24,12 +24,12 @@ class NamePart extends \Google\Protobuf\Internal\Message /** * Generated from protobuf field required string name_part = 1; */ - private $name_part = ''; + protected $name_part = ''; private $has_name_part = false; /** * Generated from protobuf field required bool is_extension = 2; */ - private $is_extension = false; + protected $is_extension = false; private $has_is_extension = false; /** diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index 2931bb66bc5d..ab5209708fc0 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.11.0-rc-0 + 3.11.0-rc-1 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 5a025af1a656..f3e0a7152e99 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,7 +30,7 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '3.11.0rc0' +__version__ = '3.11.0rc1' if __name__ != '__main__': try: diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index 302352d79cde..1ba594d7084d 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.11.0.rc.0" + s.version = "3.11.0.rc.1" git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers"