Change URLs to bazelbuild

--
MOS_MIGRATED_REVID=102022958
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 1be1e5b..282fd55 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -25,7 +25,7 @@
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source $(dirname ${SCRIPT_DIR})/release/common.sh
 
-: ${GIT_REPOSITORY_URL:=https://github.com/google/bazel}
+: ${GIT_REPOSITORY_URL:=https://github.com/bazelbuild/bazel}
 
 : ${GCS_BASE_URL:=https://storage.googleapis.com}
 : ${GCS_BUCKET:=bucket-o-bazel}
@@ -136,7 +136,7 @@
 # Please set GITHUB_TOKEN to talk to the Github API and GITHUB_RELEASE
 # for the path to the https://github.com/c4milo/github-release tool.
 # This method is also affected by GIT_REPOSITORY_URL which should be the
-# URL to the github repository (defaulted to https://github.com/google/bazel).
+# URL to the github repository (defaulted to https://github.com/bazelbuild/bazel).
 function release_to_github() {
   local url="${GIT_REPOSITORY_URL}"
   local release_name=$(get_release_name)
diff --git a/scripts/ci/build_status_command.sh b/scripts/ci/build_status_command.sh
index c95634e..259ddd8 100755
--- a/scripts/ci/build_status_command.sh
+++ b/scripts/ci/build_status_command.sh
@@ -23,7 +23,7 @@
 
 git_hash=$(git rev-parse --short HEAD)
 echo "RELEASE_GIT_HASH ${git_hash}"
-url="${GIT_REPOSITORY_URL:-https://github.com/google/bazel}"
+url="${GIT_REPOSITORY_URL:-https://github.com/bazelbuild/bazel}"
 echo "RELEASE_COMMIT_URL ${url}/commit/${git_hash}"
 if [ -n "${BUILT_BY-}" ]; then
   echo "RELEASE_BUILT_BY ${BUILT_BY}"
diff --git a/scripts/ci/rc_email.txt b/scripts/ci/rc_email.txt
index 74dbef2..022a845 100644
--- a/scripts/ci/rc_email.txt
+++ b/scripts/ci/rc_email.txt
@@ -6,7 +6,7 @@
 You can download it from:
   %url%
 
-Please report regressions to https://github.com/google/bazel/issues as soon
+Please report regressions to https://github.com/bazelbuild/bazel/issues as soon
 as possible.
 
 The release notes for version %release_name% are:
diff --git a/scripts/ci/release_email.txt b/scripts/ci/release_email.txt
index 4b0cb01..b4e02454d 100644
--- a/scripts/ci/release_email.txt
+++ b/scripts/ci/release_email.txt
@@ -4,7 +4,7 @@
   %url%
 
 If you observe any regression, please report it to
-https://github.com/google/bazel/issues as soon as possible.
+https://github.com/bazelbuild/bazel/issues as soon as possible.
 
 The release notes for version %release_name% are:
 
diff --git a/scripts/packages/package_info_generator.sh b/scripts/packages/package_info_generator.sh
index 6480dab..fa81ac2 100755
--- a/scripts/packages/package_info_generator.sh
+++ b/scripts/packages/package_info_generator.sh
@@ -52,7 +52,7 @@
   done <<<"$(cat $i)"
 done
 
-url="${url:-https://github.com/google/bazel/commit/${git_hash}}"
+url="${url:-https://github.com/bazelbuild/bazel/commit/${git_hash}}"
 
 if [ -z "${release_name}" ]; then
   # Not a release
diff --git a/scripts/release/release.sh b/scripts/release/release.sh
index bebc211..6bfec6f 100755
--- a/scripts/release/release.sh
+++ b/scripts/release/release.sh
@@ -19,10 +19,10 @@
 set -eu
 
 # Repositories to push the release branch and the release tag.
-: ${RELEASE_REPOSITORIES:="https://github.com/google/bazel"}
+: ${RELEASE_REPOSITORIES:="https://github.com/bazelbuild/bazel"}
 
 # Repositories to push the master branch
-: ${MASTER_REPOSITORIES:="https://github.com/google/bazel https://bazel.googlesource.com/bazel"}
+: ${MASTER_REPOSITORIES:="https://github.com/bazelbuild/bazel https://bazel.googlesource.com/bazel"}
 
 # Name of the default editor
 : ${EDITOR=vi}
diff --git a/site/blog/_posts/2015-04-06-Simplified-Workspace-Creation.md b/site/blog/_posts/2015-04-06-Simplified-Workspace-Creation.md
index e75ae06..ea5a67b 100644
--- a/site/blog/_posts/2015-04-06-Simplified-Workspace-Creation.md
+++ b/site/blog/_posts/2015-04-06-Simplified-Workspace-Creation.md
@@ -34,4 +34,4 @@
 
 Let us know if you have any questions or issues on the
 [mailing list](https://groups.google.com/forum/#!forum/bazel-discuss) or
-[GitHub](https://github.com/google/bazel).
+[GitHub](https://github.com/bazelbuild/bazel).
diff --git a/site/blog/_posts/2015-04-10-bash-completion.md b/site/blog/_posts/2015-04-10-bash-completion.md
index 5ee45d0..0a5d842 100644
--- a/site/blog/_posts/2015-04-10-bash-completion.md
+++ b/site/blog/_posts/2015-04-10-bash-completion.md
@@ -28,7 +28,7 @@
 If you are interested in supporting other shells, the script is made up
 of two parts:
 
-1. [`scripts/bazel-complete-header.bash`](https://github.com/google/bazel/blob/master/scripts/bazel-complete-template.bash)
+1. [`scripts/bazel-complete-header.bash`](https://github.com/bazelbuild/bazel/blob/master/scripts/bazel-complete-template.bash)
   is the completion logic.
 2. `bazel info completion` dumps the list of commands of Bazel, their options
   and for commands and options that expect a value, a description of what is
@@ -48,4 +48,4 @@
 
 Let us know if you have any questions or issues on the
 [mailing list](https://groups.google.com/forum/#!forum/bazel-discuss) or
-[GitHub](https://github.com/google/bazel).
+[GitHub](https://github.com/bazelbuild/bazel).
diff --git a/site/blog/_posts/2015-07-08-Java-Configuration.md b/site/blog/_posts/2015-07-08-Java-Configuration.md
index 858ca0c..f9beef3 100644
--- a/site/blog/_posts/2015-07-08-Java-Configuration.md
+++ b/site/blog/_posts/2015-07-08-Java-Configuration.md
@@ -15,7 +15,7 @@
 
 However, the file would becomes quickly overloaded, especially if you take
 all languages and options into account. Instead, you can tweak the
-[java_toolchain](https://github.com/google/bazel/tree/0e1680e58f01f3d443f7e68865b5a56b76c9dadf/tools/jdk/BUILD#L73)
+[java_toolchain](https://github.com/bazelbuild/bazel/tree/0e1680e58f01f3d443f7e68865b5a56b76c9dadf/tools/jdk/BUILD#L73)
 rule that specifies the various options for the java compiler. So in a
 BUILD file:
 
diff --git a/site/blog/_posts/2015-07-28-docker_build.md b/site/blog/_posts/2015-07-28-docker_build.md
index a1fd26c..055c9cd 100644
--- a/site/blog/_posts/2015-07-28-docker_build.md
+++ b/site/blog/_posts/2015-07-28-docker_build.md
@@ -16,7 +16,7 @@
 
 Googlers working on [Google Container Registry](https://gcr.io) developed a support
 for building reproducible Docker images using Skylark / Bazel that address these
-problems. We recently [shipped](https://github.com/google/bazel/commit/5f25891bb17d19cb1208ddad1e88cc4bb4a56782)
+problems. We recently [shipped](https://github.com/bazelbuild/bazel/commit/5f25891bb17d19cb1208ddad1e88cc4bb4a56782)
 it.
 
 Of course, it does not support `RUN` command, but the rule also strips
@@ -63,4 +63,4 @@
 `docker_pull` rule to interact more fluently with existing images.
 
 You can learn more about this docker support
-[here](https://github.com/google/bazel/blob/master/tools/build_defs/docker/README.md).
+[here](https://github.com/bazelbuild/bazel/blob/master/tools/build_defs/docker/README.md).
diff --git a/site/blog/_posts/2015-07-29-dashboard-dogfood.md b/site/blog/_posts/2015-07-29-dashboard-dogfood.md
index 9fdcbdb..b9d8901 100644
--- a/site/blog/_posts/2015-07-29-dashboard-dogfood.md
+++ b/site/blog/_posts/2015-07-29-dashboard-dogfood.md
@@ -28,7 +28,7 @@
 
 <img src="/assets/dash-shell.png"/>
 
-See [the README](https://github.com/google/bazel/blob/master/src/tools/dash/README.md)
+See [the README](https://github.com/bazelbuild/bazel/blob/master/src/tools/dash/README.md)
 for documentation.
 
 This is very much a work in progress. Please let us know if you have any
diff --git a/site/docs/install.md b/site/docs/install.md
index 4d4a174..277be17 100644
--- a/site/docs/install.md
+++ b/site/docs/install.md
@@ -58,7 +58,7 @@
 
 ## Download Bazel
 
-Download the [Bazel installer](https://github.com/google/bazel/releases) for
+Download the [Bazel installer](https://github.com/bazelbuild/bazel/releases) for
 your operating system.
 
 ## Run the installer
diff --git a/site/docs/supported-rules.md b/site/docs/supported-rules.md
index 6523bed..71d7632 100644
--- a/site/docs/supported-rules.md
+++ b/site/docs/supported-rules.md
@@ -8,14 +8,14 @@
 [Skylark](/docs/skylark/index.html) rules framework. These rules allow you
 to build the following:
 
-*   [Closure libraries](https://github.com/google/bazel/tree/master/tools/build_rules/closure)
-*   [Docker images](https://github.com/google/bazel/tree/master/tools/build_defs/docker)
-*   [Groovy projects](https://github.com/google/bazel/tree/master/tools/build_defs/groovy)
-*   [Java App Engine applications](https://github.com/google/bazel/tree/master/tools/build_rules/appengine)
-*   [Rust projects](https://github.com/google/bazel/tree/master/tools/build_rules/rust)
+*   [Closure libraries](https://github.com/bazelbuild/bazel/tree/master/tools/build_rules/closure)
+*   [Docker images](https://github.com/bazelbuild/bazel/tree/master/tools/build_defs/docker)
+*   [Groovy projects](https://github.com/bazelbuild/bazel/tree/master/tools/build_defs/groovy)
+*   [Java App Engine applications](https://github.com/bazelbuild/bazel/tree/master/tools/build_rules/appengine)
+*   [Rust projects](https://github.com/bazelbuild/bazel/tree/master/tools/build_rules/rust)
 
 The source for these rules are located in the
-[tools/build_rules](https://github.com/google/bazel/tree/master/tools/build_rules)
+[tools/build_rules](https://github.com/bazelbuild/bazel/tree/master/tools/build_rules)
 and
-[tools/build_defs](https://github.com/google/bazel/tree/master/tools/build_defs)
+[tools/build_defs](https://github.com/bazelbuild/bazel/tree/master/tools/build_defs)
 directories in the Bazel GitHub repo.
diff --git a/site/faq.md b/site/faq.md
index 59dd0c5..12def68 100644
--- a/site/faq.md
+++ b/site/faq.md
@@ -157,12 +157,12 @@
 
 Yes. For a simple example, see:
 
-  <https://github.com/google/bazel/blob/master/examples/cpp/BUILD>
+  <https://github.com/bazelbuild/bazel/blob/master/examples/cpp/BUILD>
 
 The Bazel source code itself provides more complex examples:
 
-  <https://github.com/google/bazel/blob/master/src/main/java/BUILD>\\
-  <https://github.com/google/bazel/blob/master/src/test/java/BUILD>
+  <https://github.com/bazelbuild/bazel/blob/master/src/main/java/BUILD>\\
+  <https://github.com/bazelbuild/bazel/blob/master/src/test/java/BUILD>
 
 What is Bazel best at?
 ----------------------
@@ -286,7 +286,7 @@
 -------------------------------------
 
 Yes, you can use our
-[Docker rules](https://github.com/google/bazel/blob/master/tools/build_defs/docker/README.md)
+[Docker rules](https://github.com/bazelbuild/bazel/blob/master/tools/build_defs/docker/README.md)
 to build reproducible Docker images.
 
 Will Bazel make my builds reproducible automatically?
@@ -357,14 +357,14 @@
 the following files for an example of generating self-contained zip
 files for python:
 
-  <https://github.com/google/bazel/blob/master/tools/build_rules/py_rules.bzl>\\
-  <https://github.com/google/bazel/tree/master/examples/py>
+  <https://github.com/bazelbuild/bazel/blob/master/tools/build_rules/py_rules.bzl>\\
+  <https://github.com/bazelbuild/bazel/tree/master/examples/py>
 
 We are working on opening up a subset of our internal Python rules, so
 they can be used as helper scripts as part of a build.
 
 Simplistic support for PEX-style binaries is at
-[here](https://github.com/google/bazel/blob/master/tools/build_rules/py_rules.bzl).
+[here](https://github.com/bazelbuild/bazel/blob/master/tools/build_rules/py_rules.bzl).
 
 
 What about Go?
@@ -390,8 +390,8 @@
 
 For the following languages, we have experimental rules:
 
-   * [Rust](https://github.com/google/bazel/blob/master/tools/build_rules/rust/README.md)
-   * [Closure](https://github.com/google/bazel/blob/master/tools/build_rules/closure/README.md)
+   * [Rust](https://github.com/bazelbuild/bazel/blob/master/tools/build_rules/rust/README.md)
+   * [Closure](https://github.com/bazelbuild/bazel/blob/master/tools/build_rules/closure/README.md)
 
 I need more functionality. Can I add rules that are compiled into Bazel?
 ------------------------------------------------------------------------
@@ -421,7 +421,7 @@
 -----------------------
 
 Send an e-mail to <bazel-discuss@googlegroups.com> or file a bug
-[on GitHub](https://github.com/google/bazel/issues).
+[on GitHub](https://github.com/bazelbuild/bazel/issues).
 
 
 
diff --git a/site/roadmap.md b/site/roadmap.md
index cb851e8..090bc7d 100644
--- a/site/roadmap.md
+++ b/site/roadmap.md
@@ -14,7 +14,7 @@
 
 *   A Google-internal repository, containing both Bazel code and
     Google-specific extensions and features
-*   An external [GitHub repository](https://github.com/google/bazel),
+*   An external [GitHub repository](https://github.com/bazelbuild/bazel),
     containing only the Bazel code.
 
 We anticipate making the external repository *primary* in the future, that is,
diff --git a/site/support.md b/site/support.md
index 04e0faf..85f5dc7 100644
--- a/site/support.md
+++ b/site/support.md
@@ -16,7 +16,7 @@
 you write in a `.bzl` file) is still subject to change.
 
 Bugs can be reported in the
-[GitHub bugtracker](https://github.com/google/bazel/issues). We will make an effort to triage all
+[GitHub bugtracker](https://github.com/bazelbuild/bazel/issues). We will make an effort to triage all
 reported issues within 2 business days.
 
 ## Releases
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
index 9ace1d3..1eedae3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
@@ -205,7 +205,7 @@
               .addOutput(zipOutput)
               .addInput(storyboardInput)
               // TODO(dmaclach): Adding realpath here should not be required once
-              // https://github.com/google/bazel/issues/285 is fixed.
+              // https://github.com/bazelbuild/bazel/issues/285 is fixed.
               .addInput(attributes.realpath())
               .build(ruleContext));
     }
@@ -274,7 +274,7 @@
               .addOutput(zipOutput)
               .addInput(original)
               // TODO(dmaclach): Adding realpath here should not be required once
-              // https://github.com/google/bazel/issues/285 is fixed.
+              // https://github.com/bazelbuild/bazel/issues/285 is fixed.
               .addInput(attributes.realpath())
               .build(ruleContext));
     }
@@ -445,7 +445,7 @@
 
     /**
      * Returns the location of the realpath tool.
-     * TODO(dmaclach): Should not be required once https://github.com/google/bazel/issues/285
+     * TODO(dmaclach): Should not be required once https://github.com/bazelbuild/bazel/issues/285
      * is fixed.
      */
     Artifact realpath() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 60e4d29..589b37f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -481,7 +481,7 @@
           .add(attr("$ibtoolwrapper", LABEL).cfg(HOST).exec()
               .value(env.getLabel("//tools/objc:ibtoolwrapper")))
           // TODO(dmaclach): Adding realpath here should not be required once
-          // https://github.com/google/bazel/issues/285 is fixed.
+          // https://github.com/bazelbuild/bazel/issues/285 is fixed.
           .add(attr("$realpath", LABEL).cfg(HOST).exec()
               .value(env.getLabel("//tools/objc:realpath")))
           .add(attr("$swiftstdlibtoolzip_deploy", LABEL).cfg(HOST)
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
index 0fba9ee..4370ece 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkNestedSet.java
@@ -59,13 +59,13 @@
         + "<code>{1, 2, 3, {4, 5}}</code> leads to <code>1 2 3 4 5</code>. "
         + "This ordering enforces that elements of the set always come before elements of "
         + "nested sets (parent-first), which may lead to situations where left-to-right "
-        + "order cannot be preserved (<a href=\"https://github.com/google/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/LinkOrderExpander.java#L56\">Example</a>)."
+        + "order cannot be preserved (<a href=\"https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/LinkOrderExpander.java#L56\">Example</a>)."
         + "</li>"
         + "<li><code>naive_link</code>: Defines \"naive\" left-to-right pre-ordering "
         + "(parent-first), i.e. <code>{1, 2, 3, {4, 5}}</code> leads to <code>1 2 3 4 5</code>. "
         + "Unlike <code>link</code> ordering, it will sacrifice the parent-first property in "
         + "order to uphold left-to-right order in cases where both properties cannot be "
-        + "guaranteed (<a href=\"https://github.com/google/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/NaiveLinkOrderExpander.java#L26\">Example</a>)."
+        + "guaranteed (<a href=\"https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/collect/nestedset/NaiveLinkOrderExpander.java#L26\">Example</a>)."
         + "</li></ul>"
         + "Except for <code>stable</code>, the above values are incompatible with each other. "
         + "Consequently, two sets can only be merged via the <code>+</code> operator or via "
diff --git a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
index 65a9f89..f9f1510 100644
--- a/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
+++ b/src/objc_tools/bundlemerge/java/com/google/devtools/build/xcode/bundlemerge/BundleMerging.java
@@ -194,7 +194,7 @@
           break;
         }
         // TODO(bazel-dev): Add support for soft links because we will need them for MacOS support
-        // in frameworks at the very least. https://github.com/google/bazel/issues/289
+        // in frameworks at the very least. https://github.com/bazelbuild/bazel/issues/289
         String name = entryNamesPrefix + zipInEntry.getName();
         if (zipInEntry.isDirectory()) {
           // If we already have a directory entry with this name then don't attempt to
diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh
index 9d26be9..c014962 100755
--- a/src/test/shell/bazel/bazel_example_test.sh
+++ b/src/test/shell/bazel/bazel_example_test.sh
@@ -103,7 +103,7 @@
 if [ "${PLATFORM}" = "darwin" ]; then
   function test_objc() {
     setup_objc_test_support
-    # https://github.com/google/bazel/issues/162
+    # https://github.com/bazelbuild/bazel/issues/162
     # prevents us from running iOS tests.
     # TODO(bazel-team): Execute iOStests here when this issue is resolved.
     assert_build_output ./bazel-bin/examples/objc/PrenotCalculator.ipa \
diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh
index 9bf2481..8c9dd22 100755
--- a/src/test/shell/bazel/bazel_rules_test.sh
+++ b/src/test/shell/bazel/bazel_rules_test.sh
@@ -149,7 +149,7 @@
   assert_test_ok //:trivial_test
 }
 
-# Regression test for https://github.com/google/bazel/issues/67
+# Regression test for https://github.com/bazelbuild/bazel/issues/67
 # C++ library depedending on C++ library fails to compile on Darwin
 function test_cpp_libdeps() {
   mkdir -p pkg