Skip to content

Commit a325d7f

Browse files
nicolasnoblenicolasnoble
authored
Pointing the protobuf submodule to the new URL (grpc#26811)
* Pointing the protobuf submodule to the new URL * Also changing WORKSPACE dependencies * More references to the old URL...
1 parent c22baea commit a325d7f

File tree

28 files changed

+33
-33
lines changed

28 files changed

+33
-33
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
ignore = dirty
88
[submodule "third_party/protobuf"]
99
path = third_party/protobuf
10-
url = https://github.com/google/protobuf.git
10+
url = https://github.com/protocolbuffers/protobuf.git
1111
[submodule "third_party/googletest"]
1212
path = third_party/googletest
1313
url = https://github.com/google/googletest.git

‎BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ $ make
269269

270270
### A note on `protoc`
271271

272-
By default gRPC uses [protocol buffers](https://github.com/google/protobuf),
272+
By default gRPC uses [protocol buffers](https://github.com/protocolbuffers/protobuf),
273273
you will need the `protoc` compiler to generate stub server and client code.
274274

275275
If you compile gRPC from source, as described below, the Makefile will

‎CONCEPTS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ of methods). From this description, gRPC will generate client and server side in
1414
in any of the supported languages. The server implements
1515
the service interface, which can be remotely invoked by the client interface.
1616

17-
By default, gRPC uses [Protocol Buffers](https://github.com/google/protobuf) as the
17+
By default, gRPC uses [Protocol Buffers](https://github.com/protocolbuffers/protobuf) as the
1818
Interface Definition Language (IDL) for describing both the service interface
1919
and the structure of the payload messages. It is possible to use other
2020
alternatives if desired.

‎bazel/grpc_deps.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ def grpc_deps():
215215
sha256 = "cf63d46ef743f4c30b0e36a562caf83cabed3f10e6ca49eb476913c4655394d5",
216216
strip_prefix = "protobuf-436bd7880e458532901c58f4d9d1ea23fa7edd52",
217217
urls = [
218-
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz",
219-
"https://github.com/google/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz",
218+
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz",
219+
"https://github.com/protocolbuffers/protobuf/archive/436bd7880e458532901c58f4d9d1ea23fa7edd52.tar.gz",
220220
],
221221
patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"],
222222
patch_args = ["-p1"],

‎examples/android/helloworld/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gRPC on Android
22
==============
33

44
Note: Building the protobuf dependency for Android requires
5-
https://github.com/google/protobuf/pull/3878. This fix will be in the next
5+
https://github.com/protocolbuffers/protobuf/pull/3878. This fix will be in the next
66
protobuf release, but until then must be manually patched in to
77
`third_party/protobuf` to build gRPC for Android.
88

‎examples/cpp/compression/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
8383
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
8484
@echo "You can find it here:"
8585
@echo
86-
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
86+
@echo " https://github.com/protocolbuffers/protobuf/releases/tag/v3.0.0"
8787
@echo
8888
@echo "Here is what I get when trying to evaluate your version of protoc:"
8989
@echo

‎examples/cpp/helloworld/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
100100
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
101101
@echo "You can find it here:"
102102
@echo
103-
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
103+
@echo " https://github.com/protocolbuffers/protobuf/releases/tag/v3.0.0"
104104
@echo
105105
@echo "Here is what I get when trying to evaluate your version of protoc:"
106106
@echo

‎examples/cpp/load_balancing/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
8383
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
8484
@echo "You can find it here:"
8585
@echo
86-
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
86+
@echo " https://github.com/protocolbuffers/protobuf/releases/tag/v3.0.0"
8787
@echo
8888
@echo "Here is what I get when trying to evaluate your version of protoc:"
8989
@echo

‎examples/cpp/metadata/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
6969
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
7070
@echo "You can find it here:"
7171
@echo
72-
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
72+
@echo " https://github.com/protocolbuffers/protobuf/releases/tag/v3.0.0"
7373
@echo
7474
@echo "Here is what I get when trying to evaluate your version of protoc:"
7575
@echo

‎examples/cpp/route_guide/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ifneq ($(HAS_VALID_PROTOC),true)
8383
@echo "Please install Google protocol buffers 3.0.0 and its compiler."
8484
@echo "You can find it here:"
8585
@echo
86-
@echo " https://github.com/google/protobuf/releases/tag/v3.0.0"
86+
@echo " https://github.com/protocolbuffers/protobuf/releases/tag/v3.0.0"
8787
@echo
8888
@echo "Here is what I get when trying to evaluate your version of protoc:"
8989
@echo

‎src/android/test/interop/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gRPC on Android
22
==============
33

44
Note: Building the protobuf dependency for Android requires
5-
https://github.com/google/protobuf/pull/3878. This fix will be in the next
5+
https://github.com/protocolbuffers/protobuf/pull/3878. This fix will be in the next
66
protobuf release, but until then must be manually patched in to
77
`third_party/protobuf` to build gRPC for Android.
88

‎src/compiler/csharp_generator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace grpc_csharp_generator {
3838
namespace {
3939

4040
// This function is a massaged version of
41-
// https://github.com/google/protobuf/blob/master/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
41+
// https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
4242
// Currently, we cannot easily reuse the functionality as
4343
// google/protobuf/compiler/csharp/csharp_doc_comment.h is not a public header.
4444
// TODO(jtattermusch): reuse the functionality from google/protobuf.

‎src/compiler/python_generator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct GeneratorConfiguration {
3434
std::string grpc_package_root;
3535
// TODO(https://github.com/grpc/grpc/issues/8622): Drop this.
3636
std::string beta_package_root;
37-
// TODO(https://github.com/google/protobuf/issues/888): Drop this.
37+
// TODO(https://github.com/protocolbuffers/protobuf/issues/888): Drop this.
3838
std::string import_prefix;
3939
std::vector<std::string> prefixes_to_filter;
4040
};

‎src/compiler/python_generator_helpers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static std::string StripModulePrefixes(
6161
return raw_module_name;
6262
}
6363

64-
// TODO(https://github.com/google/protobuf/issues/888):
64+
// TODO(https://github.com/protocolbuffers/protobuf/issues/888):
6565
// Export `ModuleName` from protobuf's
6666
// `src/google/protobuf/compiler/python/python_generator.cc` file.
6767
std::string ModuleName(const std::string& filename,
@@ -74,7 +74,7 @@ std::string ModuleName(const std::string& filename,
7474
prefixes_to_filter);
7575
}
7676

77-
// TODO(https://github.com/google/protobuf/issues/888):
77+
// TODO(https://github.com/protocolbuffers/protobuf/issues/888):
7878
// Export `ModuleAlias` from protobuf's
7979
// `src/google/protobuf/compiler/python/python_generator.cc` file.
8080
std::string ModuleAlias(const std::string& filename,

‎src/compiler/ruby_generator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void PrintService(const ServiceDescriptor* service, Printer* out) {
109109
// ruby generator
110110
// to ensure compatibility (with the exception of int and string type changes).
111111
// See
112-
// https://github.com/google/protobuf/blob/master/src/google/protobuf/compiler/ruby/ruby_generator.cc#L250
112+
// https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/compiler/ruby/ruby_generator.cc#L250
113113
// TODO: keep up to date with protoc code generation, though this behavior isn't
114114
// expected to change
115115
bool IsLower(char ch) { return ch >= 'a' && ch <= 'z'; }

‎src/cpp/Protobuf-C++.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Pod::Spec.new do |s|
22
s.name = 'Protobuf-C++'
33
s.version = '3.15.8'
44
s.summary = 'Protocol Buffers v3 runtime library for C++.'
5-
s.homepage = 'https://github.com/google/protobuf'
5+
s.homepage = 'https://github.com/protocolbuffers/protobuf'
66
s.license = '3-Clause BSD License'
77
s.authors = { 'The Protocol Buffers contributors' => '[email protected]' }
88
s.cocoapods_version = '>= 1.0'
99

10-
s.source = { :git => 'https://github.com/google/protobuf.git',
10+
s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
1111
:tag => "v#{s.version}" }
1212

1313
s.source_files = 'src/google/protobuf/*.{h,cc,inc}',

‎src/csharp/Grpc.Tools/ProtoCompile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ protected override bool ValidateParameters()
354354
{
355355
Log.LogError("Proto compiler currently allows only one input when " +
356356
"--dependency_out is specified (via ProtoDepDir or DependencyOut). " +
357-
"Tracking issue: https://github.com/google/protobuf/pull/3959");
357+
"Tracking issue: https://github.com/protocolbuffers/protobuf/pull/3959");
358358
}
359359

360360
// Use ProtoDepDir to autogenerate DependencyOut

‎src/objective-c/!ProtoCompiler.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Pod::Spec.new do |s|
4545
The generated code will have a dependency on the Protobuf Objective-C runtime of the same
4646
version. The runtime can be obtained as the "Protobuf" pod.
4747
DESC
48-
s.homepage = 'https://github.com/google/protobuf'
48+
s.homepage = 'https://github.com/protocolbuffers/protobuf'
4949
s.license = {
5050
:type => 'New BSD',
5151
:text => <<-LICENSE

‎src/objective-c/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ This will download and run the [gRPC install script][].
176176
### Install _protoc_ and the gRPC plugin without using Homebrew
177177

178178
First install v3 of the Protocol Buffers compiler (_protoc_), by cloning
179-
[its Git repository](https://github.com/google/protobuf) and following these
180-
[installation instructions](https://github.com/google/protobuf#c-installation---unix)
179+
[its Git repository](https://github.com/protocolbuffers/protobuf) and following these
180+
[installation instructions](https://github.com/protocolbuffers/protobuf#c-installation---unix)
181181
(the ones titled C++; don't miss the note for Mac users).
182182

183183
Then clone this repository and execute the following commands from the root directory where it was
@@ -212,7 +212,7 @@ files:
212212

213213
* [Podspec](https://github.com/grpc/grpc/blob/master/gRPC.podspec) for the Objective-C gRPC runtime
214214
library. This can be tedious to configure manually.
215-
* [Podspec](https://github.com/google/protobuf/blob/master/Protobuf.podspec) for the
215+
* [Podspec](https://github.com/protocolbuffers/protobuf/blob/master/Protobuf.podspec) for the
216216
Objective-C Protobuf runtime library.
217217

218218
[Protocol Buffers]:https://developers.google.com/protocol-buffers/

‎src/objective-c/tests/InteropTests/InteropTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ - (void)testResponsesOverMaxSizeFailWithActionableMessage {
872872
// - If you're developing the server, consider using response streaming,
873873
// or let clients filter
874874
// responses by setting a google.protobuf.FieldMask in the request:
875-
// https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto
875+
// https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/field_mask.proto
876876
XCTAssertEqualObjects(
877877
error.localizedDescription,
878878
@"Received message larger than max (4194305 vs. 4194304)");

‎src/php/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ v1.8.0 | 3.5.0 | v1.21.3 | 3.7.0
141141

142142
If `protoc` hasn't been installed, you can download the `protoc` binary from
143143
the protocol buffers
144-
[Github repository](https://github.com/google/protobuf/releases).
144+
[Github repository](https://github.com/protocolbuffers/protobuf/releases).
145145
Then unzip this file and update the environment variable `PATH` to include the
146146
path to the protoc binary file.
147147

‎src/proto/grpc/testing/xds/v3/ads.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ service AggregatedDiscoveryService {
4040
}
4141

4242
// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
43-
// services: https://github.com/google/protobuf/issues/4221
43+
// services: https://github.com/protocolbuffers/protobuf/issues/4221
4444
message AdsPhony {
4545
}

‎src/python/grpcio_tests/tests/testing/_application_testing_common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from tests.testing.proto import services_pb2
1919

2020
# TODO(https://github.com/grpc/grpc/issues/11657): Eliminate this entirely.
21-
# TODO(https://github.com/google/protobuf/issues/3452): Eliminate this if/else.
21+
# TODO(https://github.com/protocolbuffers/protobuf/issues/3452): Eliminate this if/else.
2222
if services_pb2.DESCRIPTOR.services_by_name.get('FirstService') is None:
2323
FIRST_SERVICE = 'Fix protobuf issue 3452!'
2424
FIRST_SERVICE_UNUN = 'Fix protobuf issue 3452!'

‎src/python/grpcio_tests/tests/testing/_client_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from tests.unit.framework.common import test_constants
2929

3030

31-
# TODO(https://github.com/google/protobuf/issues/3452): Drop this skip.
31+
# TODO(https://github.com/protocolbuffers/protobuf/issues/3452): Drop this skip.
3232
@unittest.skipIf(
3333
services_pb2.DESCRIPTOR.services_by_name.get('FirstService') is None,
3434
'Fix protobuf issue 3452!')

‎templates/src/objective-c/!ProtoCompiler.podspec.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
The generated code will have a dependency on the Protobuf Objective-C runtime of the same
4848
version. The runtime can be obtained as the "Protobuf" pod.
4949
DESC
50-
s.homepage = 'https://github.com/google/protobuf'
50+
s.homepage = 'https://github.com/protocolbuffers/protobuf'
5151
s.license = {
5252
:type => 'New BSD',
5353
:text => <<-LICENSE

‎test/core/util/tsan_suppressions.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ race:ssleay_rand_add
77
race:ssleay_rand_bytes
88
race:__sleep_for
99
# protobuf has an idempotent write race in ByteSize/GetCachedSize
10-
# https://github.com/google/protobuf/issues/2169
10+
# https://github.com/protocolbuffers/protobuf/issues/2169
1111
race:ByteSize
1212
race:ByteSizeLong
1313
race:GetCachedSize

‎test/distrib/ruby/run_distrib_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ bundle install
5151
bundle exec ./distribtest.rb
5252

5353
[[ "$PACKAGE_TYPE" == "source" ]] && exit 0
54-
# Attempt to repro https://github.com/google/protobuf/issues/4210.
54+
# Attempt to repro https://github.com/protocolbuffers/protobuf/issues/4210.
5555
# This sanity check only works for linux-based distrib tests and for
5656
# binary gRPC packages.
5757
INSTALLATION_DIR="$(gem env | grep '\- INSTALLATION DIRECTORY' | awk '{ print $4 }')"

‎tools/dockerfile/grpc_dist_proto/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get -y install libgtest-dev
2323

2424
# Get the protobuf source from GitHub.
2525
RUN mkdir -p /var/local/git
26-
RUN git clone https://github.com/google/protobuf.git /var/local/git/protobuf
26+
RUN git clone https://github.com/protocolbuffers/protobuf.git /var/local/git/protobuf
2727

2828
# Build the protobuf library statically and install to /tmp/protoc_static.
2929
WORKDIR /var/local/git/protobuf

0 commit comments

Comments
 (0)