go.mod: rename google.golang.org/proto as github.com/golang/protobuf/v2
This change was created by running:
git ls-files | xargs sed -i "s|google.golang.org/proto|github.com/golang/protobuf/v2|g"
This change is *not* an endorsement of "github.com/golang/protobuf/v2" as the
final import path when the v2 API is eventually released as stable.
We continue to reserve the right to make breaking changes as we see fit.
This change enables us to host the v2 API on a repository that is go-gettable
(since go.googlesource.com is not a known host by the "go get" tool;
and google.golang.org/proto was just a stub URL that is not currently served).
Thus, we can start work on a forked version of the v1 API that explores
what it would take to implement v1 in terms of v2 in a backwards compatible way.
Change-Id: Ia3ebc41ac4238af62ee140200d3158b53ac9ec48
Reviewed-on: https://go-review.googlesource.com/136736
Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/cmd/protoc-gen-go/main.go b/cmd/protoc-gen-go/main.go
index e7119f1..28745ae 100644
--- a/cmd/protoc-gen-go/main.go
+++ b/cmd/protoc-gen-go/main.go
@@ -20,8 +20,8 @@
"github.com/golang/protobuf/proto"
descpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
- "google.golang.org/proto/protogen"
- "google.golang.org/proto/reflect/protoreflect"
+ "github.com/golang/protobuf/v2/protogen"
+ "github.com/golang/protobuf/v2/reflect/protoreflect"
)
// generatedCodeVersion indicates a version of the generated code.
diff --git a/cmd/protoc-gen-go/oneof.go b/cmd/protoc-gen-go/oneof.go
index 2e788fe..dbb91a2 100644
--- a/cmd/protoc-gen-go/oneof.go
+++ b/cmd/protoc-gen-go/oneof.go
@@ -5,8 +5,8 @@
"strings"
"github.com/golang/protobuf/proto"
- "google.golang.org/proto/protogen"
- "google.golang.org/proto/reflect/protoreflect"
+ "github.com/golang/protobuf/v2/protogen"
+ "github.com/golang/protobuf/v2/reflect/protoreflect"
)
// genOneofField generates the struct field for a oneof.
diff --git a/cmd/protoc-gen-go/options.go b/cmd/protoc-gen-go/options.go
index 53e3e78..2690cbf 100644
--- a/cmd/protoc-gen-go/options.go
+++ b/cmd/protoc-gen-go/options.go
@@ -11,8 +11,8 @@
import (
"github.com/golang/protobuf/proto"
descpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
- "google.golang.org/proto/protogen"
- "google.golang.org/proto/reflect/protoreflect"
+ "github.com/golang/protobuf/v2/protogen"
+ "github.com/golang/protobuf/v2/reflect/protoreflect"
)
// messageOptions returns the MessageOptions for a message.
diff --git a/cmd/protoc-gen-go/testdata/comments/comments.proto b/cmd/protoc-gen-go/testdata/comments/comments.proto
index 7ee51ce..6bcee38 100644
--- a/cmd/protoc-gen-go/testdata/comments/comments.proto
+++ b/cmd/protoc-gen-go/testdata/comments/comments.proto
@@ -7,7 +7,7 @@
// COMMENT: package goproto.protoc.comments;
package goproto.protoc.comments;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/comments";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/comments";
// COMMENT: Message1
message Message1 {
diff --git a/cmd/protoc-gen-go/testdata/comments/deprecated.proto b/cmd/protoc-gen-go/testdata/comments/deprecated.proto
index a33cb33..c889b4d 100644
--- a/cmd/protoc-gen-go/testdata/comments/deprecated.proto
+++ b/cmd/protoc-gen-go/testdata/comments/deprecated.proto
@@ -7,7 +7,7 @@
package goproto.protoc.comments;
option deprecated = true;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/comments";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/comments";
message DeprecatedMessage {
option deprecated = true;
diff --git a/cmd/protoc-gen-go/testdata/extensions/base/base.proto b/cmd/protoc-gen-go/testdata/extensions/base/base.proto
index 3c16d25..c97436b 100644
--- a/cmd/protoc-gen-go/testdata/extensions/base/base.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/base/base.proto
@@ -6,7 +6,7 @@
package goproto.protoc.extension.base;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/base";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/base";
message BaseMessage {
optional string field = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
index b419842..6eadbc4 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.pb.go
@@ -6,8 +6,8 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- base "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/base"
- extra "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/extra"
+ base "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/base"
+ extra "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/extra"
math "math"
)
diff --git a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
index 3767b1e..5fb9e94 100644
--- a/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/ext/ext.proto
@@ -9,7 +9,7 @@
package goproto.protoc.extension.ext;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/ext";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/ext";
message Message {
optional bytes data = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto b/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
index 84a4392..e615f92 100644
--- a/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/extra/extra.proto
@@ -6,7 +6,7 @@
package goproto.protoc.extension.extra;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/extra";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/extra";
message ExtraMessage {
optional bytes data = 1;
diff --git a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
index 4611038..c9af7c6 100644
--- a/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
+++ b/cmd/protoc-gen-go/testdata/extensions/proto3/ext3.proto
@@ -8,7 +8,7 @@
package goproto.protoc.extension.proto3;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/extensions/proto3";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/extensions/proto3";
message Message {}
enum Enum { ZERO = 0; }
diff --git a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
index 4301804..0cd5be5 100644
--- a/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
+++ b/cmd/protoc-gen-go/testdata/fieldnames/fieldnames.proto
@@ -6,7 +6,7 @@
package goproto.protoc.fieldnames;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/fieldnames";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/fieldnames";
// Assorted edge cases in field name conflict resolution.
//
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.pb.go b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
index 01c95cb..bf39bf4 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/a.pb.go
@@ -6,7 +6,7 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- sub "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public/sub"
+ sub "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub"
math "math"
)
diff --git a/cmd/protoc-gen-go/testdata/import_public/a.proto b/cmd/protoc-gen-go/testdata/import_public/a.proto
index 6517d94..2722ad2 100644
--- a/cmd/protoc-gen-go/testdata/import_public/a.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/a.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public";
import public "import_public/sub/a.proto"; // Different Go package.
import public "import_public/b.proto"; // Same Go package.
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.pb.go b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
index 713fbc2..5d244a3 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.pb.go
+++ b/cmd/protoc-gen-go/testdata/import_public/b.pb.go
@@ -6,7 +6,7 @@
import (
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- sub "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public/sub"
+ sub "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub"
math "math"
)
diff --git a/cmd/protoc-gen-go/testdata/import_public/b.proto b/cmd/protoc-gen-go/testdata/import_public/b.proto
index d8f6705..4632fc6 100644
--- a/cmd/protoc-gen-go/testdata/import_public/b.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/b.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public";
import "import_public/sub/a.proto";
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/a.proto b/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
index b77090d..13bc0b3 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/a.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public.sub;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public/sub";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub";
import "import_public/sub/b.proto";
diff --git a/cmd/protoc-gen-go/testdata/import_public/sub/b.proto b/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
index 9f69ab9..fd643d6 100644
--- a/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
+++ b/cmd/protoc-gen-go/testdata/import_public/sub/b.proto
@@ -6,7 +6,7 @@
package goproto.protoc.import_public.sub;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/import_public/sub";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/import_public/sub";
message M2 {
}
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.proto b/cmd/protoc-gen-go/testdata/proto2/enum.proto
index 0faac3e..aa52b9b 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
// EnumType1 comment.
enum EnumType1 {
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.proto b/cmd/protoc-gen-go/testdata/proto2/fields.proto
index bb5b61e..9095c25 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
message FieldTestMessage {
optional bool optional_bool = 1;
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto b/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
index 85e77b2..bb92a0a 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
message Layer1 {
message Layer2 {
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.proto b/cmd/protoc-gen-go/testdata/proto2/proto2.proto
index 9e7e29d..fe610cf 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.proto
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto2;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto2";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto2";
message Message {
optional int32 i32 = 1;
diff --git a/cmd/protoc-gen-go/testdata/proto3/enum.proto b/cmd/protoc-gen-go/testdata/proto3/enum.proto
index 60e7b8e..e7a4db6 100644
--- a/cmd/protoc-gen-go/testdata/proto3/enum.proto
+++ b/cmd/protoc-gen-go/testdata/proto3/enum.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto3;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto3";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto3";
enum Enum {
ZERO = 0;
diff --git a/cmd/protoc-gen-go/testdata/proto3/fields.proto b/cmd/protoc-gen-go/testdata/proto3/fields.proto
index 5ae7344..ba61364 100644
--- a/cmd/protoc-gen-go/testdata/proto3/fields.proto
+++ b/cmd/protoc-gen-go/testdata/proto3/fields.proto
@@ -6,7 +6,7 @@
package goproto.protoc.proto3;
-option go_package = "google.golang.org/proto/cmd/protoc-gen-go/testdata/proto3";
+option go_package = "github.com/golang/protobuf/v2/cmd/protoc-gen-go/testdata/proto3";
message FieldTestMessage {
string optional_bool = 1;