Replace repo links.

afe98de3 · Feng Xiao · 228530e2 · afe98de3 · afe98de3 · afe98de3
Commit afe98de3 authored Aug 22, 2018 by Feng Xiao
52 changed files
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -102,7 +102,7 @@
  Planned Future Changes
  * Make C++ implementation C++11 only: we plan to require C++11 to build
    protobuf code starting from 3.6.0 release. Please join this github issue:
-    https://github.com/google/protobuf/issues/2780 to provide your feedback.
+    https://github.com/protocolbuffers/protobuf/issues/2780 to provide your feedback.
  protoc
  * Fixed a bug introduced in 3.5.0 and protoc in Windows now accepts non-ascii
@@ -133,7 +133,7 @@
  Planned Future Changes
  * Make C++ implementation C++11 only: we plan to require C++11 to build
    protobuf code starting from 3.6.0 release. Please join this github issue:
-    https://github.com/google/protobuf/issues/2780 to provide your feedback.
+    https://github.com/protocolbuffers/protobuf/issues/2780 to provide your feedback.
  General
  * Unknown fields are now preserved in proto3 for most of the language
@@ -220,14 +220,14 @@
        For issues and discussions:
-          https://github.com/google/protobuf/issues/272
+          https://github.com/protocolbuffers/protobuf/issues/272
      - Make C++ implementation C++11 only: we plan to require C++11 to build
        protobuf code starting from 3.5.0 or 3.6.0 release, after unknown fields
        semantic changes are finished. Please join this
        github issue:
-          https://github.com/google/protobuf/issues/2780
+          https://github.com/protocolbuffers/protobuf/issues/2780
        to provide your feedback.
@@ -347,14 +347,14 @@
        for the timeline and follow up this github issue:
-          https://github.com/google/protobuf/issues/272
+          https://github.com/protocolbuffers/protobuf/issues/272
        for discussion.
      - Make C++ implementation C++11 only: we plan to require C++11 to build
        protobuf code starting from 3.4.0 or 3.5.0 release. Please join this
        github issue:
-          https://github.com/google/protobuf/issues/2780
+          https://github.com/protocolbuffers/protobuf/issues/2780
        to provide your feedback.

--- a/Protobuf.podspec
+++ b/Protobuf.podspec
@@ -7,12 +7,12 @@ Pod::Spec.new do |s|
  s.name     = 'Protobuf'
  s.version  = '3.6.1'
  s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
-  s.homepage = 'https://github.com/google/protobuf'
+  s.homepage = 'https://github.com/protocolbuffers/protobuf'
  s.license  = '3-Clause BSD License'
  s.authors  = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
  s.cocoapods_version = '>= 1.0'
-  s.source = { :git => 'https://github.com/google/protobuf.git',
+  s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
               :tag => "v#{s.version}" }
  s.source_files = 'objectivec/*.{h,m}',

--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ with the C++ runtime.
 For non-C++ users, the simplest way to install the protocol compiler is to
 download a pre-built binary from our release page:
-  [https://github.com/google/protobuf/releases](https://github.com/google/protobuf/releases)
+  [https://github.com/protocolbuffers/protobuf/releases](https://github.com/protocolbuffers/protobuf/releases)
 In the downloads section of each release, you can find pre-built binaries in
 zip packages: protoc-$VERSION-$PLATFORM.zip. It contains the protoc binary

--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -5,7 +5,7 @@ This directory contains benchmarking schemas and data sets that you
 can use to test a variety of performance scenarios against your
 protobuf language runtime. If you are looking for performance 
 numbers of officially support languages, see [here](
-https://github.com/google/protobuf/blob/master/docs/performance.md)
+https://github.com/protocolbuffers/protobuf/blob/master/docs/performance.md)
 ## Prerequisite
@@ -63,7 +63,7 @@ PHP benchmark's requirement is the same as PHP protobuf's requirements. The benc
 include PHP protobuf's src and build the c extension if required.
 ### Node.js
-Node.js benchmark need [node](https://nodejs.org/en/)(higher than V6) and [npm](https://www.npmjs.com/) package manager installed. This benchmark is using the [benchmark](https://www.npmjs.com/package/benchmark) framework to test, which needn't to manually install. And another prerequisite is [protobuf js](https://github.com/google/protobuf/tree/master/js), which needn't to manually install either
+Node.js benchmark need [node](https://nodejs.org/en/)(higher than V6) and [npm](https://www.npmjs.com/) package manager installed. This benchmark is using the [benchmark](https://www.npmjs.com/package/benchmark) framework to test, which needn't to manually install. And another prerequisite is [protobuf js](https://github.com/protocolbuffers/protobuf/tree/master/js), which needn't to manually install either
 ### Big data

--- a/cmake/README.md
+++ b/cmake/README.md
@@ -43,7 +43,7 @@ Getting Sources
 You can get the latest stable source packages from the release page:
-    https://github.com/google/protobuf/releases/latest
+    https://github.com/protocolbuffers/protobuf/releases/latest
 For example: if you only need C++, download `protobuf-cpp-[VERSION].tar.gz`; if
 you need C++ and Java, download `protobuf-java-[VERSION].tar.gz` (every package
@@ -52,7 +52,7 @@ download `protobuf-all-[VERSION].tar.gz`.
 Or you can use git to clone from protobuf git repository.
-     C:\Path\to> git clone -b [release_tag] https://github.com/google/protobuf.git
+     C:\Path\to> git clone -b [release_tag] https://github.com/protocolbuffers/protobuf.git
 Where *[release_tag]* is a git tag like *v3.0.0-beta-1* or a branch name like *master*
 if you want to get the latest code.

--- a/conformance/README.md
+++ b/conformance/README.md
@@ -57,10 +57,10 @@ Testing other Protocol Buffer implementations
 To run these tests against a new Protocol Buffers implementation, write a
 program in your language that uses the protobuf implementation you want
 to test.  This program should implement the testing protocol defined in
-[conformance.proto](https://github.com/google/protobuf/blob/master/conformance/conformance.proto).
+[conformance.proto](https://github.com/protocolbuffers/protobuf/blob/master/conformance/conformance.proto).
 This is designed to be as easy as possible: the C++ version is only
 150 lines and is a good example for what this program should look like
-(see [conformance_cpp.cc](https://github.com/google/protobuf/blob/master/conformance/conformance_cpp.cc)).
+(see [conformance_cpp.cc](https://github.com/protocolbuffers/protobuf/blob/master/conformance/conformance_cpp.cc)).
 The program only needs to be able to read from stdin and write to stdout.
 Portability

--- a/csharp/Google.Protobuf.Tools.nuspec
+++ b/csharp/Google.Protobuf.Tools.nuspec
@@ -8,8 +8,8 @@
    <version>3.6.1</version>
    <authors>Google Inc.</authors>
    <owners>protobuf-packages</owners>
-    <licenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</licenseUrl>
+    <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/google/protobuf</projectUrl>
+    <projectUrl>https://github.com/protocolbuffers/protobuf</projectUrl>
    <requireLicenseAcceptance>false</requireLicenseAcceptance>
    <releaseNotes>Tools for Protocol Buffers</releaseNotes>
    <copyright>Copyright 2015, Google Inc.</copyright>

--- a/csharp/README.md
+++ b/csharp/README.md
@@ -77,7 +77,7 @@ History of C# protobufs
 This subtree was originally imported from https://github.com/jskeet/protobuf-csharp-port
 and represents the latest development version of C# protobufs, that will now be developed
 and maintained by Google. All the development will be done in open, under this repository
-(https://github.com/google/protobuf).
+(https://github.com/protocolbuffers/protobuf).
 The previous project differs from this project in a number of ways:

--- a/csharp/compatibility_tests/v3.0.0/protos/csharp/protos/unittest_issues.proto
+++ b/csharp/compatibility_tests/v3.0.0/protos/csharp/protos/unittest_issues.proto
@@ -19,7 +19,7 @@ message Issue307 {
 }
 // Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13
-// New issue 309: https://github.com/google/protobuf/issues/309
+// New issue 309: https://github.com/protocolbuffers/protobuf/issues/309
 // message A {
 //    optional int32 _A = 1;
@@ -35,7 +35,7 @@ message Issue307 {
 // Similar issue with numeric names
 // Java code failed too, so probably best for this to be a restriction.
-// See https://github.com/google/protobuf/issues/308
+// See https://github.com/protocolbuffers/protobuf/issues/308
 // message NumberField {
 //    optional int32 _01 = 1;
 // }

--- a/csharp/protos/unittest_issues.proto
+++ b/csharp/protos/unittest_issues.proto
@@ -18,7 +18,7 @@ message Issue307 {
 }
 // Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13
-// New issue 309: https://github.com/google/protobuf/issues/309
+// New issue 309: https://github.com/protocolbuffers/protobuf/issues/309
 // message A {
 //    optional int32 _A = 1;
@@ -34,7 +34,7 @@ message Issue307 {
 // Similar issue with numeric names
 // Java code failed too, so probably best for this to be a restriction.
-// See https://github.com/google/protobuf/issues/308
+// See https://github.com/protocolbuffers/protobuf/issues/308
 // message NumberField {
 //    optional int32 _01 = 1;
 // }

--- a/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
+++ b/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
@@ -227,7 +227,7 @@ namespace Google.Protobuf
        {
            // We used to have an awful hash algorithm where only the last four
            // bytes were relevant. This is a regression test for
-            // https://github.com/google/protobuf/issues/2511
+            // https://github.com/protocolbuffers/protobuf/issues/2511
            ByteString b1 = ByteString.CopyFrom(100, 1, 2, 3, 4);
            ByteString b2 = ByteString.CopyFrom(200, 1, 2, 3, 4);

--- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -13,10 +13,10 @@
    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
    <PackageTags>Protocol;Buffers;Binary;Serialization;Format;Google;proto;proto3</PackageTags>
    <PackageReleaseNotes>C# proto3 support</PackageReleaseNotes>
-    <PackageProjectUrl>https://github.com/google/protobuf</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/protocolbuffers/protobuf</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/google/protobuf/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</PackageLicenseUrl>
    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/google/protobuf.git</RepositoryUrl>
+    <RepositoryUrl>https://github.com/protocolbuffers/protobuf.git</RepositoryUrl>
  </PropertyGroup>
  <!-- 

--- a/docs/options.md
+++ b/docs/options.md
@@ -7,8 +7,8 @@ extension numbers.
 If you need an extension number for your custom option (see [custom options](
 https://developers.google.com/protocol-buffers/docs/proto#customoptions)),
-please [send us a pull request](https://github.com/google/protobuf/pulls) to
+please [send us a pull request](https://github.com/protocolbuffers/protobuf/pulls) to
-add an entry to this doc, or [create an issue](https://github.com/google/protobuf/issues)
+add an entry to this doc, or [create an issue](https://github.com/protocolbuffers/protobuf/issues)
 with info about your project (name and website) so we can add an entry for you.
 ## Existing Registered Extensions

--- a/docs/performance.md
+++ b/docs/performance.md
@@ -301,4 +301,4 @@ This table contains 3 languages' results:
 </tr>
 </tbody></table>
-\* The cpp performance can be improved by using [tcmalloc](https://gperftools.github.io/gperftools/tcmalloc.html), please follow the (instruction)[https://github.com/google/protobuf/blob/master/benchmarks/README.md] to link with tcmalloc to get the faster result.
+\* The cpp performance can be improved by using [tcmalloc](https://gperftools.github.io/gperftools/tcmalloc.html), please follow the (instruction)[https://github.com/protocolbuffers/protobuf/blob/master/benchmarks/README.md] to link with tcmalloc to get the faster result.
--- a/examples/WORKSPACE
+++ b/examples/WORKSPACE
@@ -3,7 +3,7 @@
 http_archive(
    name = "com_google_protobuf",
    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/google/protobuf/archive/master.zip"],
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
 )
 # This com_google_protobuf_cc repository is required for cc_proto_library
@@ -13,14 +13,14 @@ http_archive(
 http_archive(
    name = "com_google_protobuf_cc",
    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/google/protobuf/archive/master.zip"],
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
 )
 # Similar to com_google_protobuf_cc but for Java (i.e., java_proto_library).
 http_archive(
    name = "com_google_protobuf_java",
    strip_prefix = "protobuf-master",
-    urls = ["https://github.com/google/protobuf/archive/master.zip"],
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/master.zip"],
 )
 # Similar to com_google_protobuf_cc but for Java lite. If you are building
@@ -29,7 +29,7 @@ http_archive(
 http_archive(
    name = "com_google_protobuf_javalite",
    strip_prefix = "protobuf-javalite",
-    urls = ["https://github.com/google/protobuf/archive/javalite.zip"],
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/javalite.zip"],
 )
 http_archive(

--- a/examples/add_person.go
+++ b/examples/add_person.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"github.com/golang/protobuf/proto"
-	pb "github.com/google/protobuf/examples/tutorial"
+	pb "github.com/protocolbuffers/protobuf/examples/tutorial"
 )
 func promptForAddress(r io.Reader) (*pb.Person, error) {

--- a/examples/add_person_test.go
+++ b/examples/add_person_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"github.com/golang/protobuf/proto"
-	pb "github.com/google/protobuf/examples/tutorial"
+	pb "github.com/protocolbuffers/protobuf/examples/tutorial"
 )
 func TestPromptForAddressReturnsAddress(t *testing.T) {

--- a/examples/list_people.go
+++ b/examples/list_people.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"github.com/golang/protobuf/proto"
-	pb "github.com/google/protobuf/examples/tutorial"
+	pb "github.com/protocolbuffers/protobuf/examples/tutorial"
 )
 func writePerson(w io.Writer, p *pb.Person) {

--- a/examples/list_people_test.go
+++ b/examples/list_people_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
-	pb "github.com/google/protobuf/examples/tutorial"
+	pb "github.com/protocolbuffers/protobuf/examples/tutorial"
 )
 func TestWritePersonWritesPerson(t *testing.T) {

--- a/generate_changelog.py
+++ b/generate_changelog.py
@@ -62,4 +62,4 @@ for language in languages:
  print("")
 print("To view a commit on GitHub: " +
-      "https://github.com/google/protobuf/commit/<commit id>")
+      "https://github.com/protocolbuffers/protobuf/commit/<commit id>")
--- a/java/compatibility_tests/v2.5.0/test.sh
+++ b/java/compatibility_tests/v2.5.0/test.sh
@@ -65,7 +65,7 @@ echo "Running compatibility tests between $VERSION_NUMBER and $OLD_VERSION"
 # Download old version source for the compatibility test
 [ -d protobuf ] || {
-  git clone https://github.com/google/protobuf.git
+  git clone https://github.com/protocolbuffers/protobuf.git
  cd protobuf
  git reset --hard v$TEST_VERSION
  cd ..

--- a/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
+++ b/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
@@ -562,7 +562,7 @@ public class CodedOutputStreamTest extends TestCase {
    }
  }
-  /** Regression test for https://github.com/google/protobuf/issues/292 */
+  /** Regression test for https://github.com/protocolbuffers/protobuf/issues/292 */
  public void testCorrectExceptionThrowWhenEncodingStringsWithoutEnoughSpace() throws Exception {
    String testCase = "Foooooooo";
    assertEquals(

--- a/java/pom.xml
+++ b/java/pom.xml
@@ -44,8 +44,8 @@
  </licenses>
  <scm>
-    <url>https://github.com/google/protobuf</url>
+    <url>https://github.com/protocolbuffers/protobuf</url>
-    <connection>scm:git:https://github.com/google/protobuf.git</connection>
+    <connection>scm:git:https://github.com/protocolbuffers/protobuf.git</connection>
  </scm>
  <distributionManagement>

--- a/js/README.md
+++ b/js/README.md
@@ -25,7 +25,7 @@ To use Protocol Buffers with JavaScript, you need two main components:
 2. The Protocol Compiler `protoc`.  This translates `.proto` files
   into `.js` files.  The compiler is not currently available via
   npm, but you can download a pre-built binary
-   [on GitHub](https://github.com/google/protobuf/releases)
+   [on GitHub](https://github.com/protocolbuffers/protobuf/releases)
   (look for the `protoc-*.zip` files under **Downloads**).
@@ -33,11 +33,11 @@ Setup
 =====
 First, obtain the Protocol Compiler.  The easiest way is to download
-a pre-built binary from [https://github.com/google/protobuf/releases](https://github.com/google/protobuf/releases).
+a pre-built binary from [https://github.com/protocolbuffers/protobuf/releases](https://github.com/protocolbuffers/protobuf/releases).
 If you want, you can compile `protoc` from source instead.  To do this
 follow the instructions in [the top-level
-README](https://github.com/google/protobuf/blob/master/src/README.md).
+README](https://github.com/protocolbuffers/protobuf/blob/master/src/README.md).
 Once you have `protoc` compiled, you can run the tests by typing:
@@ -135,7 +135,7 @@ The syntax of the `--js_out` flag is:
 Where `OPTIONS` are separated by commas.  Options are either `opt=val` or
 just `opt` (for options that don't take a value).  The available options
 are specified and documented in the `GeneratorOptions` struct in
-[src/google/protobuf/compiler/js/js_generator.h](https://github.com/google/protobuf/blob/master/src/google/protobuf/compiler/js/js_generator.h#L53).
+[src/google/protobuf/compiler/js/js_generator.h](https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/compiler/js/js_generator.h#L53).
 Some examples:

--- a/js/package.json
+++ b/js/package.json
@@ -19,7 +19,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "https://github.com/google/protobuf/tree/master/js"
+    "url": "https://github.com/protocolbuffers/protobuf/tree/master/js"
  },
  "author": "Google Protocol Buffers Team",
  "license": "BSD-3-Clause"

--- a/kokoro/linux/32-bit/Dockerfile
+++ b/kokoro/linux/32-bit/Dockerfile
@@ -96,7 +96,7 @@ RUN php -r "unlink('composer-setup.php');"
 RUN composer config -g -- disable-tls true
 RUN composer config -g -- secure-http false
 RUN cd /tmp && \
-  git clone https://github.com/google/protobuf.git && \
+  git clone https://github.com/protocolbuffers/protobuf.git && \
  cd protobuf/php && \
  git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
  ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \

--- a/kokoro/linux/64-bit/Dockerfile
+++ b/kokoro/linux/64-bit/Dockerfile
@@ -127,7 +127,7 @@ ENV MAVEN_REPO /var/maven_local_repository
 ENV MVN mvn --batch-mode
 RUN cd /tmp && \
-  git clone https://github.com/google/protobuf.git && \
+  git clone https://github.com/protocolbuffers/protobuf.git && \
  cd protobuf && \
  git reset --hard 129a6e2aca95dcfb6c3e717d7b9cca1f104fde39 && \
  ./autogen.sh && \
@@ -180,7 +180,7 @@ RUN composer config -g -- disable-tls true
 RUN composer config -g -- secure-http false
 RUN cd /tmp && \
  rm -rf protobuf && \
-  git clone https://github.com/google/protobuf.git && \
+  git clone https://github.com/protocolbuffers/protobuf.git && \
  cd protobuf && \
  git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
  cd php && \

--- a/kokoro/linux/benchmark/build.sh
+++ b/kokoro/linux/benchmark/build.sh
@@ -68,8 +68,8 @@ cd $oldpwd
 export PATH="`pwd`/src:$PATH"
 export GOPATH="$HOME/gocode"
 mkdir -p "$GOPATH/src/github.com/google"
-rm -f "$GOPATH/src/github.com/google/protobuf"
+rm -f "$GOPATH/src/github.com/protocolbuffers/protobuf"
-ln -s "`pwd`" "$GOPATH/src/github.com/google/protobuf"
+ln -s "`pwd`" "$GOPATH/src/github.com/protocolbuffers/protobuf"
 export PATH="$GOPATH/bin:$PATH"
 go get github.com/golang/protobuf/protoc-gen-go

--- a/objectivec/GPBCodedInputStream.m
+++ b/objectivec/GPBCodedInputStream.m
@@ -46,9 +46,9 @@ NSString *const GPBCodedInputStreamErrorDomain =
    GPBNSStringifySymbol(GPBCodedInputStreamErrorDomain);
 // Matching:
-// https://github.com/google/protobuf/blob/master/java/core/src/main/java/com/google/protobuf/CodedInputStream.java#L62
+// https://github.com/protocolbuffers/protobuf/blob/master/java/core/src/main/java/com/google/protobuf/CodedInputStream.java#L62
 //  private static final int DEFAULT_RECURSION_LIMIT = 100;
-// https://github.com/google/protobuf/blob/master/src/google/protobuf/io/coded_stream.cc#L86
+// https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/io/coded_stream.cc#L86
 //  int CodedInputStream::default_recursion_limit_ = 100;
 static const NSUInteger kDefaultRecursionLimit = 100;

--- a/objectivec/Tests/GPBMessageTests.m
+++ b/objectivec/Tests/GPBMessageTests.m
@@ -1981,7 +1981,7 @@
 }
 - (void)testOneBasedEnumHolder {
-  // Test case for https://github.com/google/protobuf/issues/1453
+  // Test case for https://github.com/protocolbuffers/protobuf/issues/1453
  // Message with no explicit defaults, but a non zero default for an enum.
  MessageWithOneBasedEnum *enumMsg = [MessageWithOneBasedEnum message];
  XCTAssertEqual(enumMsg.enumField, MessageWithOneBasedEnum_OneBasedEnum_One);

--- a/objectivec/Tests/unittest_objc.proto
+++ b/objectivec/Tests/unittest_objc.proto
@@ -433,7 +433,7 @@ message EnumTestMsg {
  repeated MyEnum mumble = 4;
 }
-// Test case for https://github.com/google/protobuf/issues/1453
+// Test case for https://github.com/protocolbuffers/protobuf/issues/1453
 // Message with no explicit defaults, but a non zero default for an enum.
 message MessageWithOneBasedEnum {
  enum OneBasedEnum {

--- a/php/tests/compatibility_test.sh
+++ b/php/tests/compatibility_test.sh
@@ -92,7 +92,7 @@ echo "Running compatibility tests between $VERSION_NUMBER and $OLD_VERSION"
 # Download old test.
 rm -rf protobuf
-git clone https://github.com/google/protobuf.git
+git clone https://github.com/protocolbuffers/protobuf.git
 pushd protobuf
 git checkout v$OLD_VERSION
 popd

--- a/protoc-artifacts/README.md
+++ b/protoc-artifacts/README.md
@@ -90,7 +90,7 @@ To checkout protobuf (run within the container):
 ```
 $ # Replace v3.5.1 with the version you want
-$ wget -O - https://github.com/google/protobuf/archive/v3.5.1.tar.gz | tar xvzp
+$ wget -O - https://github.com/protocolbuffers/protobuf/archive/v3.5.1.tar.gz | tar xvzp
 ```
 ### Windows build

--- a/protoc-artifacts/build-zip.sh
+++ b/protoc-artifacts/build-zip.sh
@@ -82,7 +82,7 @@ copy the contents of the 'include' directory somewhere as well, for example
 into '/usr/local/include/'.
 Please refer to our official github site for more installation instructions:
-  https://github.com/google/protobuf
+  https://github.com/protocolbuffers/protobuf
 EOF
 mkdir -p dist

--- a/protoc-artifacts/pom.xml
+++ b/protoc-artifacts/pom.xml
@@ -27,9 +27,9 @@
    </license>
  </licenses>
  <scm>
-    <url>https://github.com/google/protobuf</url>
+    <url>https://github.com/protocolbuffers/protobuf</url>
    <connection>
-      scm:git:https://github.com/google/protobuf.git
+      scm:git:https://github.com/protocolbuffers/protobuf.git
    </connection>
  </scm>
  <build>

--- a/python/compatibility_tests/v2.5.0/setup.py
+++ b/python/compatibility_tests/v2.5.0/setup.py
@@ -59,7 +59,7 @@ if __name__ == '__main__':
  setup(
      name='protobuf',
      description='Protocol Buffers',
-      download_url='https://github.com/google/protobuf/releases',
+      download_url='https://github.com/protocolbuffers/protobuf/releases',
      long_description="Protocol Buffers are Google's data interchange format",
      url='https://developers.google.com/protocol-buffers/',
      maintainer='protobuf@googlegroups.com',

--- a/python/release.sh
+++ b/python/release.sh
@@ -108,7 +108,7 @@ if [ $TESTING_ONLY -eq 0 ]; then
  # include files you may not want in the package. E.g., if you have built
  # and tested with --cpp_implemenation, bdist_xxx will include the _message.so
  # file even when you no longer pass the --cpp_implemenation flag. See:
-  #   https://github.com/google/protobuf/issues/3042
+  #   https://github.com/protocolbuffers/protobuf/issues/3042
  python setup.py clean build bdist_egg bdist_wheel upload
 else
  # Set the version number back (i.e., remove dev suffix).

--- a/python/release/wheel/protobuf_optimized_pip.sh
+++ b/python/release/wheel/protobuf_optimized_pip.sh
@@ -39,7 +39,7 @@ PYTHON_VERSIONS=('cp27-cp27mu' 'cp33-cp33m' 'cp34-cp34m' 'cp35-cp35m' 'cp36-cp36
 mkdir -p ${DIR}
 cd ${DIR}
-curl -SsL -O https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz
+curl -SsL -O https://github.com/protocolbuffers/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz
 tar xzf v${PROTOBUF_VERSION}.tar.gz
 cd $DIR/protobuf-${PROTOBUF_VERSION}

--- a/python/setup.py
+++ b/python/setup.py
@@ -239,7 +239,7 @@ if __name__ == '__main__':
      name='protobuf',
      version=GetVersion(),
      description='Protocol Buffers',
-      download_url='https://github.com/google/protobuf/releases',
+      download_url='https://github.com/protocolbuffers/protobuf/releases',
      long_description="Protocol Buffers are Google's data interchange format",
      url='https://developers.google.com/protocol-buffers/',
      maintainer='protobuf@googlegroups.com',

--- a/ruby/ext/google/protobuf_c/wrap_memcpy.c
+++ b/ruby/ext/google/protobuf_c/wrap_memcpy.c
@@ -33,7 +33,7 @@
 // On x86-64 Linux with glibc, we link against the 2.2.5 version of memcpy so
 // that we avoid depending on the 2.14 version of the symbol. This way,
 // distributions that are using pre-2.14 versions of glibc can successfully use
-// the gem we distribute (https://github.com/google/protobuf/issues/2783).
+// the gem we distribute (https://github.com/protocolbuffers/protobuf/issues/2783).
 //
 // This wrapper is enabled by passing the linker flags -Wl,-wrap,memcpy in
 // extconf.rb.

--- a/ruby/pom.xml
+++ b/ruby/pom.xml
@@ -27,9 +27,9 @@
      </license>
    </licenses>
    <scm>
-      <url>https://github.com/google/protobuf</url>
+      <url>https://github.com/protocolbuffers/protobuf</url>
      <connection>
-        scm:git:https://github.com/google/protobuf.git
+        scm:git:https://github.com/protocolbuffers/protobuf.git
      </connection>
    </scm>

--- a/src/README.md
+++ b/src/README.md
@@ -29,7 +29,7 @@ install them before proceeding.
 To get the source, download one of the release .tar.gz or .zip packages in the
 release page:
-    https://github.com/google/protobuf/releases/latest
+    https://github.com/protocolbuffers/protobuf/releases/latest
 For example: if you only need C++, download `protobuf-cpp-[VERSION].tar.gz`; if
 you need C++ and Java, download `protobuf-java-[VERSION].tar.gz` (every package
@@ -40,7 +40,7 @@ You can also get the source by "git clone" our git repository. Make sure you
 have also cloned the submodules and generated the configure script (skip this
 if you are using a release .tar.gz or .zip package):
-    $ git clone https://github.com/google/protobuf.git
+    $ git clone https://github.com/protocolbuffers/protobuf.git
    $ cd protobuf
    $ git submodule update --init --recursive
    $ ./autogen.sh
@@ -184,7 +184,7 @@ C++ Installation - Windows
 If you only need the protoc binary, you can download it from the release
 page:
-    https://github.com/google/protobuf/releases/latest
+    https://github.com/protocolbuffers/protobuf/releases/latest
 In the downloads section, download the zip file protoc-$VERSION-win32.zip.
 It contains the protoc binary as well as public proto files of protobuf

--- a/src/google/protobuf/compiler/java/java_file.cc
+++ b/src/google/protobuf/compiler/java/java_file.cc
@@ -232,7 +232,7 @@ bool FileGenerator::Validate(string* error) {
        << "will be ignored by protoc in the future and protoc will always "
        << "generate full runtime code for Java. To use Java Lite runtime, "
        << "users should use the Java Lite plugin instead. See:\n"
-        << "  https://github.com/google/protobuf/blob/master/java/lite.md";
+        << "  https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md";
  }
  return true;
 }

--- a/src/google/protobuf/proto3_arena_unittest.cc
+++ b/src/google/protobuf/proto3_arena_unittest.cc
@@ -178,7 +178,7 @@ TEST(Proto3ArenaTest, ReleaseMessage) {
 }
 TEST(Proto3ArenaTest, MessageFieldClear) {
-  // GitHub issue #310: https://github.com/google/protobuf/issues/310
+  // GitHub issue #310: https://github.com/protocolbuffers/protobuf/issues/310
  Arena arena;
  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
  arena_message->mutable_optional_nested_message()->set_bb(118);

--- a/src/google/protobuf/util/delimited_message_util.cc
+++ b/src/google/protobuf/util/delimited_message_util.cc
 // Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/google/protobuf/pull/710 for details.
+// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
 #include <google/protobuf/util/delimited_message_util.h>

--- a/src/google/protobuf/util/delimited_message_util.h
+++ b/src/google/protobuf/util/delimited_message_util.h
 // Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/google/protobuf/pull/710 for details.
+// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
 #ifndef GOOGLE_PROTOBUF_UTIL_DELIMITED_MESSAGE_UTIL_H__
 #define GOOGLE_PROTOBUF_UTIL_DELIMITED_MESSAGE_UTIL_H__

--- a/src/google/protobuf/util/delimited_message_util_test.cc
+++ b/src/google/protobuf/util/delimited_message_util_test.cc
 // Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/google/protobuf/pull/710 for details.
+// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
 #include <google/protobuf/util/delimited_message_util.h>

--- a/src/google/protobuf/util/field_comparator_test.cc
+++ b/src/google/protobuf/util/field_comparator_test.cc
@@ -38,7 +38,7 @@
 // This gtest header is put after mathutil.h intentionally. We have to do
 // this because mathutil.h includes mathlimits.h which requires cmath not
 // being included to compile on some versions of gcc:
-//   https://github.com/google/protobuf/blob/818c5eee08840355d70d2f3bdf1a2f17986a5e70/src/google/protobuf/stubs/mathlimits.h#L48
+//   https://github.com/protocolbuffers/protobuf/blob/818c5eee08840355d70d2f3bdf1a2f17986a5e70/src/google/protobuf/stubs/mathlimits.h#L48
 // and the opensource version gtest.h header includes cmath transitively
 // somehow.
 #include <gtest/gtest.h>

--- a/src/google/protobuf/util/internal/protostream_objectwriter.cc
+++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc
@@ -483,7 +483,7 @@ ProtoStreamObjectWriter* ProtoStreamObjectWriter::StartObject(
    // stream, we write those values.
    if (master_type_.name() == kStructType) {
      // Struct has a map<string, Value> field called "fields".
-      // https://github.com/google/protobuf/blob/master/src/google/protobuf/struct.proto
+      // https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/struct.proto
      // "fields": [
      Push("fields", Item::MAP, true, true);
      return this;
@@ -494,7 +494,7 @@ ProtoStreamObjectWriter* ProtoStreamObjectWriter::StartObject(
      // object within that type is a struct type. So start a struct.
      //
      // The struct field in Value type is named "struct_value"
-      // https://github.com/google/protobuf/blob/master/src/google/protobuf/struct.proto
+      // https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/struct.proto
      // Also start the map field "fields" within the struct.
      // "struct_value": {
      //   "fields": [
@@ -649,7 +649,7 @@ ProtoStreamObjectWriter* ProtoStreamObjectWriter::StartList(
      // we have to start the "list_value" within google.protobuf.Value.
      //
      // See
-      // https://github.com/google/protobuf/blob/master/src/google/protobuf/struct.proto
+      // https://github.com/protocolbuffers/protobuf/blob/master/src/google/protobuf/struct.proto
      //
      // Render
      // "<name>": {

--- a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
@@ -270,7 +270,7 @@ TEST_P(ProtoStreamObjectWriterTest, CustomJsonName) {
 }
 // Test that two messages can have different fields mapped to the same JSON
-// name. See: https://github.com/google/protobuf/issues/1415
+// name. See: https://github.com/protocolbuffers/protobuf/issues/1415
 TEST_P(ProtoStreamObjectWriterTest, ConflictingJsonName) {
  ResetTypeInfo(TestJsonName1::descriptor());
  TestJsonName1 message1;

--- a/src/google/protobuf/util/internal/testdata/books.proto
+++ b/src/google/protobuf/util/internal/testdata/books.proto
@@ -196,7 +196,7 @@ message Cyclic {
 }
 // Test that two messages can have different fields mapped to the same JSON
-// name. See: https://github.com/google/protobuf/issues/1415
+// name. See: https://github.com/protocolbuffers/protobuf/issues/1415
 message TestJsonName1 {
  optional int32 one_value = 1 [json_name = "value"];
 }

--- a/tests.sh
+++ b/tests.sh
@@ -106,8 +106,8 @@ build_golang() {
  export GOPATH="$HOME/gocode"
  mkdir -p "$GOPATH/src/github.com/google"
-  rm -f "$GOPATH/src/github.com/google/protobuf"
+  rm -f "$GOPATH/src/github.com/protocolbuffers/protobuf"
-  ln -s "`pwd`" "$GOPATH/src/github.com/google/protobuf"
+  ln -s "`pwd`" "$GOPATH/src/github.com/protocolbuffers/protobuf"
  export PATH="$GOPATH/bin:$PATH"
  go get github.com/golang/protobuf/protoc-gen-go