apacheGH-31148: [Dev] Update URLs in the repo to point to main (apach…

…e#34218) * Closes: apache#31148 * Closes: apache#33215 * Closes: apache#32804 * Closes: apache#34232 Authored-by: Joris Van den Bossche <[email protected]> Signed-off-by: Joris Van den Bossche <[email protected]>
obin1000 · Feb 17, 2023 · 157b8f5 · 157b8f5
1 parent fe19160
commit 157b8f5
Show file tree

Hide file tree

Showing 72 changed files with 164 additions and 175 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -55,7 +55,7 @@ To contribute a patch:
 harder to merge in a large change with a lot of disjoint features.
 2. If one doesn't already exist, create a JIRA for your patch on the [Arrow Project
 JIRA](https://issues.apache.org/jira/browse/ARROW).
-3. Submit the patch as a GitHub pull request against the master branch. For a
+3. Submit the patch as a GitHub pull request against the main branch. For a
 tutorial, see the GitHub guides on [forking a repo](https://help.github.com/en/articles/fork-a-repo)
 and [sending a pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork). So that your pull request syncs with the JIRA issue, prefix your pull request
 name with the JIRA issue id (ex: [ARROW-767: [C++] Filesystem abstraction](https://github.com/apache/arrow/pull/4225))
@@ -67,6 +67,6 @@ file.
 Thank you in advance for your contributions!
 
 [1]: mailto:[email protected]
-[2]: https://github.com/apache/arrow/tree/master/format
+[2]: https://github.com/apache/arrow/tree/main/format
 [3]: https://issues.apache.org/jira/browse/ARROW
 [4]: https://github.com/apache/arrow
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,7 @@ to contribute here:
   * [Contributing Overview](https://arrow.apache.org/docs/dev/developers/overview.html)
 
 
-If this is not a [minor PR](https://github.com/apache/arrow/blob/master/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose
+If this is not a [minor PR](https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose
 
 Opening GitHub issues ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project.
 

diff --git a/.github/workflows/dev_pr/title_check.md b/.github/workflows/dev_pr/title_check.md
@@ -19,7 +19,7 @@
 
 Thanks for opening a pull request!
 
-If this is not a [minor PR](https://github.com/apache/arrow/blob/master/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose
+If this is not a [minor PR](https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose
 
 Opening GitHub issues ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project.
 

diff --git a/.github/workflows/java_nightly.yml b/.github/workflows/java_nightly.yml
@@ -48,15 +48,15 @@ jobs:
           fetch-depth: 1
           path: arrow
           repository: apache/arrow
-          ref: master
+          ref: main
           submodules: recursive
       - name: Checkout Crossbow
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
           path: crossbow
           repository: ursacomputing/crossbow
-          ref: master
+          ref: main
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/r_nightly.yml b/.github/workflows/r_nightly.yml
@@ -50,7 +50,7 @@ jobs:
           fetch-depth: 1
           path: arrow
           repository: apache/arrow
-          ref: master
+          ref: main
           submodules: recursive
       - name: Checkout Crossbow
         uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
 # Apache Arrow
 
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arrow.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arrow)
-[![License](http://img.shields.io/:license-Apache%202-blue.svg)](https://github.com/apache/arrow/blob/master/LICENSE.txt)
+[![License](http://img.shields.io/:license-Apache%202-blue.svg)](https://github.com/apache/arrow/blob/main/LICENSE.txt)
 [![Twitter Follow](https://img.shields.io/twitter/follow/apachearrow.svg?style=social&label=Follow)](https://twitter.com/apachearrow)
 
 ## Powering In-Memory Analytics
@@ -30,27 +30,27 @@ set of technologies that enable big data systems to process and move data fast.
 
 Major components of the project include:
 
- - [The Arrow Columnar In-Memory Format](https://github.com/apache/arrow/blob/master/docs/source/format/Columnar.rst):
+ - [The Arrow Columnar In-Memory Format](https://github.com/apache/arrow/blob/main/docs/source/format/Columnar.rst):
    a standard and efficient in-memory representation of various datatypes, plain or nested
- - [The Arrow IPC Format](https://github.com/apache/arrow/blob/master/docs/source/format/Columnar.rst#serialization-and-interprocess-communication-ipc):
+ - [The Arrow IPC Format](https://github.com/apache/arrow/blob/main/docs/source/format/Columnar.rst#serialization-and-interprocess-communication-ipc):
    an efficient serialization of the Arrow format and associated metadata,
    for communication between processes and heterogeneous environments
- - [The Arrow Flight RPC protocol](https://github.com/apache/arrow/tree/master/format/Flight.proto):
+ - [The Arrow Flight RPC protocol](https://github.com/apache/arrow/tree/main/format/Flight.proto):
    based on the Arrow IPC format, a building block for remote services exchanging
    Arrow data with application-defined semantics (for example a storage server or a database)
- - [C++ libraries](https://github.com/apache/arrow/tree/master/cpp)
- - [C bindings using GLib](https://github.com/apache/arrow/tree/master/c_glib)
- - [C# .NET libraries](https://github.com/apache/arrow/tree/master/csharp)
- - [Gandiva](https://github.com/apache/arrow/tree/master/cpp/src/gandiva):
+ - [C++ libraries](https://github.com/apache/arrow/tree/main/cpp)
+ - [C bindings using GLib](https://github.com/apache/arrow/tree/main/c_glib)
+ - [C# .NET libraries](https://github.com/apache/arrow/tree/main/csharp)
+ - [Gandiva](https://github.com/apache/arrow/tree/main/cpp/src/gandiva):
    an [LLVM](https://llvm.org)-based Arrow expression compiler, part of the C++ codebase
- - [Go libraries](https://github.com/apache/arrow/tree/master/go)
- - [Java libraries](https://github.com/apache/arrow/tree/master/java)
- - [JavaScript libraries](https://github.com/apache/arrow/tree/master/js)
- - [Plasma Object Store](https://github.com/apache/arrow/tree/master/cpp/src/plasma):
+ - [Go libraries](https://github.com/apache/arrow/tree/main/go)
+ - [Java libraries](https://github.com/apache/arrow/tree/main/java)
+ - [JavaScript libraries](https://github.com/apache/arrow/tree/main/js)
+ - [Plasma Object Store](https://github.com/apache/arrow/tree/main/cpp/src/plasma):
    a shared-memory blob store, part of the C++ codebase
- - [Python libraries](https://github.com/apache/arrow/tree/master/python)
- - [R libraries](https://github.com/apache/arrow/tree/master/r)
- - [Ruby libraries](https://github.com/apache/arrow/tree/master/ruby)
+ - [Python libraries](https://github.com/apache/arrow/tree/main/python)
+ - [R libraries](https://github.com/apache/arrow/tree/main/r)
+ - [Ruby libraries](https://github.com/apache/arrow/tree/main/ruby)
  - [Rust libraries](https://github.com/apache/arrow-rs)
 
 Arrow is an [Apache Software Foundation](https://www.apache.org) project. Learn more at
@@ -78,8 +78,8 @@ The reference Arrow libraries contain many distinct software components:
 
 The official Arrow libraries in this repository are in different stages of
 implementing the Arrow format and related features.  See our current
-[feature matrix](https://github.com/apache/arrow/blob/master/docs/source/status.rst)
-on git master.
+[feature matrix](https://github.com/apache/arrow/blob/main/docs/source/status.rst)
+on git main.
 
 ## How to Contribute
 
@@ -98,7 +98,7 @@ integrations in other projects, we'd be happy to have you involved:
 - Contribute code to one of the reference implementations
 
 [1]: mailto:[email protected]
-[2]: https://github.com/apache/arrow/tree/master/format
+[2]: https://github.com/apache/arrow/tree/main/format
 [3]: https://github.com/apache/arrow/issues
 [4]: https://github.com/apache/arrow
-[5]: https://github.com/apache/arrow/blob/master/docs/source/developers/contributing.rst
+[5]: https://github.com/apache/arrow/blob/main/docs/source/developers/contributing.rst
diff --git a/c_glib/README.md b/c_glib/README.md
@@ -20,7 +20,7 @@
 # Arrow GLib
 
 Arrow GLib is a wrapper library for [Arrow
-C++](https://github.com/apache/arrow/tree/master/cpp). Arrow GLib
+C++](https://github.com/apache/arrow/tree/main/cpp). Arrow GLib
 provides C API.
 
 Arrow GLib supports [GObject
@@ -54,7 +54,7 @@ recommended that you use packages.
 
 We use Meson and Ninja as build tools. If you find problems when
 installing please see [common build
-problems](https://github.com/apache/arrow/blob/master/c_glib/README.md#common-build-problems).
+problems](https://github.com/apache/arrow/blob/main/c_glib/README.md#common-build-problems).
 
 ### Packages
 

diff --git a/cpp/README.md b/cpp/README.md
@@ -31,4 +31,4 @@ to install pre-compiled binary versions of the library.
 
 Please refer to our latest [C++ Development Documentation][1].
 
-[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/cpp
+[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/cpp
diff --git a/cpp/build-support/get-upstream-commit.sh b/cpp/build-support/get-upstream-commit.sh
@@ -18,7 +18,7 @@
 # under the License.
 #
 # Script which tries to determine the most recent git hash in the current
-# branch which originates from master by checking for the 
+# branch which originates from main by checking for the 
 # 'ARROW-1234: Description` commit message
 set -e
 

diff --git a/cpp/examples/arrow/engine_substrait_consumption.cc b/cpp/examples/arrow/engine_substrait_consumption.cc
@@ -89,7 +89,7 @@ arrow::Future<std::shared_ptr<arrow::Buffer>> GetSubstraitFromServer(
     "extension_uris": [
       {
         "extension_uri_anchor": 7,
-        "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml"
+        "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml"
       }
     ],
     "extensions": [

diff --git a/cpp/src/arrow/engine/substrait/extension_set.h b/cpp/src/arrow/engine/substrait/extension_set.h
@@ -283,7 +283,7 @@ class ARROW_ENGINE_EXPORT ExtensionIdRegistry {
 };
 
 constexpr std::string_view kArrowExtTypesUri =
-    "https://github.com/apache/arrow/blob/master/format/substrait/"
+    "https://github.com/apache/arrow/blob/main/format/substrait/"
     "extension_types.yaml";
 
 /// A default registry with all supported functions and data types registered

diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc b/cpp/src/arrow/engine/substrait/serde_test.cc
@@ -1970,7 +1970,7 @@ TEST(Substrait, AggregateWithFilter) {
     }],
     "extensionUris": [{
       "extension_uri_anchor": 0,
-      "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml"
+      "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml"
     }],
     "extensions": [{
       "extension_function": {
@@ -2044,7 +2044,7 @@ TEST(Substrait, AggregateBadPhase) {
     }],
     "extensionUris": [{
       "extension_uri_anchor": 0,
-      "uri": "https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml"
+      "uri": "https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml"
     }],
     "extensions": [{
       "extension_function": {

diff --git a/cpp/thirdparty/README.md b/cpp/thirdparty/README.md
@@ -22,4 +22,4 @@
 See the "Build Dependency Management" section in the [C++ Developer
 Documentation][1].
 
-[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/cpp/building.rst
+[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/cpp/building.rst
diff --git a/csharp/README.md b/csharp/README.md
@@ -21,7 +21,7 @@
 
 An implementation of Arrow targeting .NET Standard.
 
-See our current [feature matrix](https://github.com/apache/arrow/blob/master/docs/source/status.rst)
+See our current [feature matrix](https://github.com/apache/arrow/blob/main/docs/source/status.rst)
 for currently available features.
 
 # Implementation

diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py
@@ -373,9 +373,7 @@ def default_branch_name(self):
                 target_name_tokenized = target_name.split("/")
                 default_branch_name = target_name_tokenized[-1]
             except KeyError:
-                # TODO: ARROW-18011 to track changing the hard coded default
-                # value from "master" to "main".
-                default_branch_name = "master"
+                default_branch_name = "main"
                 warnings.warn('Unable to determine default branch name: '
                               'ARCHERY_DEFAULT_BRANCH environment variable is '
                               'not set. Git repository does not contain a '
@@ -792,9 +790,6 @@ def __init__(self, head, branch, remote, version, r_version, email=None):
         self.r_version = r_version
         self.no_rc_version = re.sub(r'-rc\d+\Z', '', version)
         self.no_rc_r_version = re.sub(r'-rc\d+\Z', '', r_version)
-        # TODO(ARROW-17552): Remove "master" from default_branch after
-        #                    migration to "main".
-        self.default_branch = ['main', 'master']
         # Semantic Versioning 1.0.0: https://semver.org/spec/v1.0.0.html
         #
         # > A pre-release version number MAY be denoted by appending an
@@ -872,9 +867,7 @@ def from_repo(cls, repo, head=None, branch=None, remote=None, version=None,
                    version=version, r_version=r_version)
 
     def is_default_branch(self):
-        # TODO(ARROW-17552): Switch the condition to "is" instead of "in"
-        #                    once "master" is removed from "default_branch".
-        return self.branch in self.default_branch
+        return self.branch == 'main'
 
 
 class Task(Serializable):

diff --git a/dev/archery/archery/release/core.py b/dev/archery/archery/release/core.py
@@ -451,9 +451,7 @@ def default_branch(self):
                 default_branch_name = origin_head_name_tokenized[-1]
             except (KeyError, IndexError):
                 # Use a hard-coded default value to set default_branch_name
-                # TODO: ARROW-18011 to track changing the hard coded default
-                # value from "master" to "main".
-                default_branch_name = "master"
+                default_branch_name = "main"
                 warnings.warn('Unable to determine default branch name: '
                               'ARCHERY_DEFAULT_BRANCH environment variable is '
                               'not set. Git repository does not contain a '

diff --git a/dev/tasks/r/github.macos.brew.yml b/dev/tasks/r/github.macos.brew.yml
@@ -36,9 +36,7 @@ jobs:
           # for testing
           brew install minio
           
-          # TODO: Update the TODO for ARROW-16907 below to refer to main instead of master
-          #       after migrating the default branch to main.
-          # TODO(ARROW-16907): apache/arrow@master seems to be installed already
+          # TODO(ARROW-16907): apache/arrow@main seems to be installed already
           # so this does nothing on a branch/PR
           brew install -v --HEAD apache-arrow
 

diff --git a/docs/README.md b/docs/README.md
@@ -26,5 +26,5 @@ Instructions for building the documentation site are found in
 [docs/source/developers/documentation.rst][1]. The build depends on the API
 documentation for some of the project subcomponents.
 
-[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/documentation.rst
-[2]: https://github.com/apache/arrow/tree/master/docs/source/format
+[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/documentation.rst
+[2]: https://github.com/apache/arrow/tree/main/docs/source/format
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -249,7 +249,7 @@
     # "switcher_template_url": "http://0.0.0.0:8000/docs/{version}",
     "github_user": "apache",
     "github_repo": "arrow",
-    "github_version": "master",
+    "github_version": "main",
     "doc_path": "docs/source",
 }
 

diff --git a/docs/source/cpp/examples/cmake_minimal_build.rst b/docs/source/cpp/examples/cmake_minimal_build.rst
@@ -24,5 +24,5 @@ Minimal build using CMake
 The folder ``cpp/examples/minimal_build/`` located inside the source tree
 contains a Docker-based example of building and using Arrow from a
 third-party project, using CMake.  The
-`README <https://github.com/apache/arrow/tree/master/cpp/examples/minimal_build/README.md>`_
+`README <https://github.com/apache/arrow/tree/main/cpp/examples/minimal_build/README.md>`_
 file in that folder has more information.
diff --git a/docs/source/cpp/examples/row_columnar_conversion.rst b/docs/source/cpp/examples/row_columnar_conversion.rst
@@ -49,7 +49,7 @@ provides several utilities:
 
 The following example shows how to implement conversion between ``rapidjson::Document``
 and Arrow objects. You can read the full code example at
-https://github.com/apache/arrow/blob/master/cpp/examples/arrow/rapidjson_row_converter.cc
+https://github.com/apache/arrow/blob/main/cpp/examples/arrow/rapidjson_row_converter.cc
 
 Writing conversions to Arrow
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -87,7 +87,7 @@ an iterator of the column values for the current field across the rows. In
 row-based structures that are flat (such as a vector of values) this may be
 trivial to implement. But if the schema is nested, as in the case of JSON documents,
 a special iterator is needed to navigate the levels of nesting. See the
-`full example <https://github.com/apache/arrow/blob/master/cpp/examples/arrow/rapidjson_row_converter.cc>`_
+`full example <https://github.com/apache/arrow/blob/main/cpp/examples/arrow/rapidjson_row_converter.cc>`_
 for the implementation details of ``DocValuesIterator``.
 
 .. literalinclude:: ../../../../cpp/examples/arrow/rapidjson_row_converter.cc

diff --git a/docs/source/cpp/gdb.rst b/docs/source/cpp/gdb.rst
@@ -77,7 +77,7 @@ and here is a :class:`arrow::Decimal128Scalar`::
 
 Fortunately, GDB also allows custom extensions to override the default printing
 for specific types.  We provide a
-`GDB extension <https://github.com/apache/arrow/blob/master/cpp/gdb_arrow.py>`_
+`GDB extension <https://github.com/apache/arrow/blob/main/cpp/gdb_arrow.py>`_
 written in Python that enables pretty-printing for common Arrow C++ classes,
 so as to enable a more productive debugging experience.  For example,
 here is how the aforementioned :class:`arrow::Status` instance will be
@@ -94,7 +94,7 @@ Manual loading
 --------------
 
 To enable the GDB extension for Arrow, you can simply
-`download it <https://github.com/apache/arrow/blob/master/cpp/gdb_arrow.py>`_
+`download it <https://github.com/apache/arrow/blob/main/cpp/gdb_arrow.py>`_
 somewhere on your computer and ``source`` it from the GDB prompt::
 
    (gdb) source path/to/gdb_arrow.py

diff --git a/docs/source/cpp/streaming_execution.rst b/docs/source/cpp/streaming_execution.rst
@@ -278,7 +278,7 @@ Functions
      * ``approx_count_distinct``
 
  * The functions above should be referenced using the URI
-   ``https://github.com/apache/arrow/blob/master/format/substrait/extension_types.yaml``
+   ``https://github.com/apache/arrow/blob/main/format/substrait/extension_types.yaml``
      * Alternatively, the URI can be left completely empty and Acero will match
        based only on function name.  This fallback mechanism is non-standard and should
        be avoided if possible.

diff --git a/docs/source/developers/benchmarks.rst b/docs/source/developers/benchmarks.rst
@@ -59,7 +59,7 @@ One goal with benchmarking is to detect performance regressions. To this end,
 diff`` sub-command.
 
 In the default invocation, it will compare the current source (known as the
-current workspace in git) with local master branch:
+current workspace in git) with local main branch:
 
 .. code-block:: shell
 

diff --git a/docs/source/developers/continuous_integration/overview.rst b/docs/source/developers/continuous_integration/overview.rst
@@ -54,7 +54,7 @@ The ``.yml`` files in ``.github/worflows`` are workflows which are run on GitHub
 
   - ``@github-actions crossbow submit ...`` - runs the specified Crossbow command
   - ``@github-actions autotune`` - runs a number of stylers/formatters, builds some of the docs, and commits the results
-  - ``@github-actions rebase`` - rebases the PR onto the master branch
+  - ``@github-actions rebase`` - rebases the PR onto the main branch
 - ``dev.yml`` - runs any time there is activity on a PR, or a PR is merged; it runs the linter and tests that the PR can be merged
 - ``dev_pr.yml`` - runs any time a PR is opened or updated; checks the formatting of the PR title, adds assignee to the appropriate GitHub issue if needed (or adds a comment requesting the user to include the issue id in the title), and adds any relevant GitHub labels
 

diff --git a/docs/source/developers/contributing.rst b/docs/source/developers/contributing.rst
@@ -187,4 +187,4 @@ Connection to the specific language development pages:
 
    .. tab-item:: Ruby
 
-      * `Red Arrow - Apache Arrow Ruby <https://github.com/apache/arrow/tree/master/ruby/red-arrow#development>`_
+      * `Red Arrow - Apache Arrow Ruby <https://github.com/apache/arrow/tree/main/ruby/red-arrow#development>`_
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,4 +31,4 @@ to install pre-compiled binary versions of the library.

		Please refer to our latest [C++ Development Documentation][1].

		[1]: https://github.com/apache/arrow/blob/master/docs/source/developers/cpp
		[1]: https://github.com/apache/arrow/blob/main/docs/source/developers/cpp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -187,4 +187,4 @@ Connection to the specific language development pages:

		.. tab-item:: Ruby

		* `Red Arrow - Apache Arrow Ruby <https://github.com/apache/arrow/tree/master/ruby/red-arrow#development>`_
		* `Red Arrow - Apache Arrow Ruby <https://github.com/apache/arrow/tree/main/ruby/red-arrow#development>`_