update to newer protoc v3.19 (#497)

desc/protoprint/testfiles/descriptor-compact.proto

@@ -36,7 +36,7 @@
 // without any other information (e.g. without reading its imports).
 syntax = "proto2";
 package google.protobuf;
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 option java_package = "com.google.protobuf";
 option java_outer_classname = "DescriptorProtos";
 option csharp_namespace = "Google.Protobuf.Reflection";
@@ -289,16 +289,16 @@ message FileOptions {
   // inappropriate because proto packages do not normally start with backwards
   // domain names.
   optional string java_package = 1;
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
+  // Controls the name of the wrapper Java class generated for the .proto file.
+  // That class will always contain the .proto file's getDescriptor() method as
+  // well as any top-level extensions defined in the .proto file.
+  // If java_multiple_files is disabled, then all the other classes from the
+  // .proto file will be nested inside the single wrapper outer class.
   optional string java_outer_classname = 8;
-  // If set true, then the Java code generator will generate a separate .java
+  // If enabled, then the Java code generator will generate a separate .java
   // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
+  // file.  Thus, these types will *not* be nested inside the wrapper class
+  // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
   optional bool java_multiple_files = 10 [default = false];
@@ -407,6 +407,7 @@ message MessageOptions {
   // for the message, or it will be completely ignored; in the very least,
   // this is a formalization for deprecating messages.
   optional bool deprecated = 3 [default = false];
+  reserved 4, 5, 6;
   // Whether the message is an automatically generated map entry type for the
   // maps field.
   //

desc/protoprint/testfiles/descriptor-custom-sort.proto

@@ -304,7 +304,7 @@ message MethodDescriptorProto {
 }
 
 message MessageOptions {
-  reserved 9, 8;
+  reserved 9, 8, 6, 5, 4;
 
   extensions 1000 to max;
 
@@ -493,17 +493,17 @@ message FileOptions {
   // domain names.
   optional string java_package = 1;
 
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
+  // Controls the name of the wrapper Java class generated for the .proto file.
+  // That class will always contain the .proto file's getDescriptor() method as
+  // well as any top-level extensions defined in the .proto file.
+  // If java_multiple_files is disabled, then all the other classes from the
+  // .proto file will be nested inside the single wrapper outer class.
   optional string java_outer_classname = 8;
 
-  // If set true, then the Java code generator will generate a separate .java
+  // If enabled, then the Java code generator will generate a separate .java
   // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
+  // file.  Thus, these types will *not* be nested inside the wrapper class
+  // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
   optional bool java_multiple_files = 10 [default = false];
@@ -938,7 +938,7 @@ option java_package = "com.google.protobuf";
 
 option java_outer_classname = "DescriptorProtos";
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option csharp_namespace = "Google.Protobuf.Reflection";
 

desc/protoprint/testfiles/descriptor-default.proto

@@ -40,7 +40,7 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_package = "com.google.protobuf";
 
@@ -386,17 +386,17 @@ message FileOptions {
   // domain names.
   optional string java_package = 1;
 
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
+  // Controls the name of the wrapper Java class generated for the .proto file.
+  // That class will always contain the .proto file's getDescriptor() method as
+  // well as any top-level extensions defined in the .proto file.
+  // If java_multiple_files is disabled, then all the other classes from the
+  // .proto file will be nested inside the single wrapper outer class.
   optional string java_outer_classname = 8;
 
-  // If set true, then the Java code generator will generate a separate .java
+  // If enabled, then the Java code generator will generate a separate .java
   // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
+  // file.  Thus, these types will *not* be nested inside the wrapper class
+  // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
   optional bool java_multiple_files = 10 [default = false];
@@ -532,6 +532,8 @@ message MessageOptions {
   // this is a formalization for deprecating messages.
   optional bool deprecated = 3 [default = false];
 
+  reserved 4, 5, 6;
+
   // Whether the message is an automatically generated map entry type for the
   // maps field.
   //

desc/protoprint/testfiles/descriptor-multiline-style-comments.proto

@@ -44,7 +44,7 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_package = "com.google.protobuf";
 
@@ -441,19 +441,19 @@ message FileOptions {
 	optional string java_package = 1;
 
 	/*
-	 * If set, all the classes from the .proto file are wrapped in a single
-	 * outer class with the given name.  This applies to both Proto1
-	 * (equivalent to the old "--one_java_file" option) and Proto2 (where
-	 * a .proto always translates to a single class, but you may want to
-	 * explicitly choose the class name).
+	 * Controls the name of the wrapper Java class generated for the .proto file.
+	 * That class will always contain the .proto file's getDescriptor() method as
+	 * well as any top-level extensions defined in the .proto file.
+	 * If java_multiple_files is disabled, then all the other classes from the
+	 * .proto file will be nested inside the single wrapper outer class.
 	 */
 	optional string java_outer_classname = 8;
 
 	/*
-	 * If set true, then the Java code generator will generate a separate .java
+	 * If enabled, then the Java code generator will generate a separate .java
 	 * file for each top-level message, enum, and service defined in the .proto
-	 * file.  Thus, these types will *not* be nested inside the outer class
-	 * named by java_outer_classname.  However, the outer class will still be
+	 * file.  Thus, these types will *not* be nested inside the wrapper class
+	 * named by java_outer_classname.  However, the wrapper class will still be
 	 * generated to contain the file's getDescriptor() method as well as any
 	 * top-level extensions defined in the file.
 	 */
@@ -620,6 +620,8 @@ message MessageOptions {
 	 */
 	optional bool deprecated = 3 [default = false];
 
+	reserved 4, 5, 6;
+
 	/*
 	 * Whether the message is an automatically generated map entry type for the
 	 * maps field.

desc/protoprint/testfiles/descriptor-no-trailing-comments.proto

@@ -40,7 +40,7 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_package = "com.google.protobuf";
 
@@ -386,17 +386,17 @@ message FileOptions {
   // domain names.
   optional string java_package = 1;
 
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
+  // Controls the name of the wrapper Java class generated for the .proto file.
+  // That class will always contain the .proto file's getDescriptor() method as
+  // well as any top-level extensions defined in the .proto file.
+  // If java_multiple_files is disabled, then all the other classes from the
+  // .proto file will be nested inside the single wrapper outer class.
   optional string java_outer_classname = 8;
 
-  // If set true, then the Java code generator will generate a separate .java
+  // If enabled, then the Java code generator will generate a separate .java
   // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
+  // file.  Thus, these types will *not* be nested inside the wrapper class
+  // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
   optional bool java_multiple_files = 10 [default = false];
@@ -532,6 +532,8 @@ message MessageOptions {
   // this is a formalization for deprecating messages.
   optional bool deprecated = 3 [default = false];
 
+  reserved 4, 5, 6;
+
   // Whether the message is an automatically generated map entry type for the
   // maps field.
   //

desc/protoprint/testfiles/descriptor-only-doc-comments.proto

@@ -2,7 +2,7 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_package = "com.google.protobuf";
 
@@ -314,17 +314,17 @@ message FileOptions {
   // domain names.
   optional string java_package = 1;
 
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
+  // Controls the name of the wrapper Java class generated for the .proto file.
+  // That class will always contain the .proto file's getDescriptor() method as
+  // well as any top-level extensions defined in the .proto file.
+  // If java_multiple_files is disabled, then all the other classes from the
+  // .proto file will be nested inside the single wrapper outer class.
   optional string java_outer_classname = 8;
 
-  // If set true, then the Java code generator will generate a separate .java
+  // If enabled, then the Java code generator will generate a separate .java
   // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
+  // file.  Thus, these types will *not* be nested inside the wrapper class
+  // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
   optional bool java_multiple_files = 10 [default = false];
@@ -460,6 +460,8 @@ message MessageOptions {
   // this is a formalization for deprecating messages.
   optional bool deprecated = 3 [default = false];
 
+  reserved 4, 5, 6;
+
   // Whether the message is an automatically generated map entry type for the
   // maps field.
   //

desc/protoprint/testfiles/descriptor-sorted-AND-multiline-style-comments.proto

@@ -48,7 +48,7 @@ option cc_enable_arenas = true;
 
 option csharp_namespace = "Google.Protobuf.Reflection";
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_outer_classname = "DescriptorProtos";
 
@@ -546,21 +546,21 @@ message FileOptions {
   optional string java_package = 1;
 
   /*
-   * If set, all the classes from the .proto file are wrapped in a single
-   * outer class with the given name.  This applies to both Proto1
-   * (equivalent to the old "--one_java_file" option) and Proto2 (where
-   * a .proto always translates to a single class, but you may want to
-   * explicitly choose the class name).
+   * Controls the name of the wrapper Java class generated for the .proto file.
+   * That class will always contain the .proto file's getDescriptor() method as
+   * well as any top-level extensions defined in the .proto file.
+   * If java_multiple_files is disabled, then all the other classes from the
+   * .proto file will be nested inside the single wrapper outer class.
    */
   optional string java_outer_classname = 8;
 
   optional OptimizeMode optimize_for = 9 [default = SPEED];
 
   /*
-   * If set true, then the Java code generator will generate a separate .java
+   * If enabled, then the Java code generator will generate a separate .java
    * file for each top-level message, enum, and service defined in the .proto
-   * file.  Thus, these types will *not* be nested inside the outer class
-   * named by java_outer_classname.  However, the outer class will still be
+   * file.  Thus, these types will *not* be nested inside the wrapper class
+   * named by java_outer_classname.  However, the wrapper class will still be
    * generated to contain the file's getDescriptor() method as well as any
    * top-level extensions defined in the file.
    */
@@ -792,7 +792,7 @@ message MessageOptions {
 
   extensions 1000 to max;
 
-  reserved 8, 9;
+  reserved 4, 5, 6, 8, 9;
 }
 
 /* Describes a method of a service. */

desc/protoprint/testfiles/descriptor-sorted.proto

@@ -6,7 +6,7 @@ option cc_enable_arenas = true;
 
 option csharp_namespace = "Google.Protobuf.Reflection";
 
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
+option go_package = "google.golang.org/protobuf/types/descriptorpb";
 
 option java_outer_classname = "DescriptorProtos";
 
@@ -407,19 +407,19 @@ message FileOptions {
    // domain names.
    optional string java_package = 1;
 
-   // If set, all the classes from the .proto file are wrapped in a single
-   // outer class with the given name.  This applies to both Proto1
-   // (equivalent to the old "--one_java_file" option) and Proto2 (where
-   // a .proto always translates to a single class, but you may want to
-   // explicitly choose the class name).
+   // Controls the name of the wrapper Java class generated for the .proto file.
+   // That class will always contain the .proto file's getDescriptor() method as
+   // well as any top-level extensions defined in the .proto file.
+   // If java_multiple_files is disabled, then all the other classes from the
+   // .proto file will be nested inside the single wrapper outer class.
    optional string java_outer_classname = 8;
 
    optional OptimizeMode optimize_for = 9 [default = SPEED];
 
-   // If set true, then the Java code generator will generate a separate .java
+   // If enabled, then the Java code generator will generate a separate .java
    // file for each top-level message, enum, and service defined in the .proto
-   // file.  Thus, these types will *not* be nested inside the outer class
-   // named by java_outer_classname.  However, the outer class will still be
+   // file.  Thus, these types will *not* be nested inside the wrapper class
+   // named by java_outer_classname.  However, the wrapper class will still be
    // generated to contain the file's getDescriptor() method as well as any
    // top-level extensions defined in the file.
    optional bool java_multiple_files = 10 [default = false];
@@ -608,7 +608,7 @@ message MessageOptions {
 
    extensions 1000 to max;
 
-   reserved 8, 9;
+   reserved 4, 5, 6, 8, 9;
 }
 
 // Describes a method of a service.