Renamed master to main

jgebal · jgebal · commit 631d6da109b9 · 2020-06-14T16:28:54.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -74,7 +74,7 @@ before_install:
   - git fetch --unshallow
   # download latest utPLSQL release
   #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
-  - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
+  - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
   # download latest utPLSQL-cli release
   - curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
 
diff --git a/.travis/push_docs_to_github_io.sh b/.travis/push_docs_to_github_io.sh
@@ -15,7 +15,7 @@
 # Required ENV Variables
 LATEST_DOCS_BRANCH="develop"
 GITHUB_IO_REPO='utPLSQL/utPLSQL.github.io'
-GITHUB_IO_BRANCH='master'
+GITHUB_IO_BRANCH='main'
 
 #  TRAVIS_* variables are set by travis directly and only need to be if testing externally
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ development/install.sh
 
 You now have the following:
 - sources from `develop` branch of your fork of utPLSQL repository in `utPLSQL/ut3_latest_release` directory
-- sources from `master` branch of utPLSQL/utPLSQL repository in `utPLSQL/ut3_latest_release` directory
+- sources from `main` branch of utPLSQL/utPLSQL repository in `utPLSQL/ut3_latest_release` directory
 - binaries of `utplsql-cli` in `utPLSQL/utPLSQL-cli` directory
 - database users created
 - your current branch of utPLSQL deployed into `ut3` schema
diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh
@@ -5,10 +5,10 @@ git rev-parse && cd "$(git rev-parse --show-cdup)"
 
 . development/env.sh
 
-# remove sub-direcotry containing master branch shallow copy
+# remove sub-direcotry containing main branch shallow copy
 rm -rf ${UTPLSQL_DIR:-utPLSQL_latest_release}
-# clone utPLSQL master branch from upstream into utPLSQL sub-directory of your project
-git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR:-utPLSQL_latest_release}
+# clone utPLSQL main branch from upstream into utPLSQL sub-directory of your project
+git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPLSQL/utPLSQL.git ${UTPLSQL_DIR:-utPLSQL_latest_release}
 
 rm -rf utPLSQL-cli/*
 # download latest release version of utPLSQL-cli
diff --git a/development/releasing.md b/development/releasing.md
@@ -8,19 +8,19 @@ This step is performed, to confirm that the update of versions works properly.
    - create release branch from development branch and make sure to name the release branch: `release/vX.Y.Z`
    - update, commit and push at least one file change in the release branch, to kickoff a Travis build
    - wait for th build to complete successfully
-   - merge the release branch to master and wait for master build to complete successfully  (do not use Squash/rebase for merge operation)
-   - create a Github release from the master branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
+   - merge the release branch to main and wait for main build to complete successfully  (do not use Squash/rebase for merge operation)
+   - create a Github release from the main branch using [github releases page](https://github.com/utPLSQL/utPLSQL/releases) and populate release description using information found on the issues and pull requests since previous release.
    To find issues closed after certain date use [advanced filters](https://help.github.com/articles/searching-issues-and-pull-requests/#search-by-open-or-closed-state). 
    Example: [`is:issue closed:>2018-07-22`](https://github.com/utPLSQL/utPLSQL/issues?utf8=%E2%9C%93&q=is%3Aissue+closed%3A%3E2018-07-22+)
-   - After A build was completed on a TAG (github release) was successful, merge master branch back into develop branch.
-   - At this point, master branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. 
+   - After A build was completed on a TAG (github release) was successful, merge main branch back into develop branch.
+   - At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release. 
    - After develop branch was built, update version number in `VERSION` file to represent next planned release version.
    - Clone `utplsql.githug.io` project and add a new announcement about next version being released in `_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly.
 
 The following will happen:
    - build executed on branch `release/vX.Y.Z-[something]` updates files `sonar-project.properties`, `VERSION` with project version derived from the release branch name
    - changes to those two files are committed and pushed back to release branch by Travis
-   - builds on master branch are **not getting executed**
+   - builds on main branch are **not getting executed**
    - when a Github release is created, a new tag is added in on the repository and a tag build is executed
    - the documentation for new release is published on `utplsql.github.io` and installation archives are added to the tag.
 
diff --git a/readme.md b/readme.md
@@ -8,7 +8,7 @@
 [![chat](http://img.shields.io/badge/slack-team--chat-blue.svg)](https://join.slack.com/t/utplsql/shared_invite/zt-d6zor80g-WWqAhbLWioJZUtLYeXetzA)
 [![twitter](https://img.shields.io/twitter/follow/utPLSQL.svg?style=social&label=Follow)](https://twitter.com/utPLSQL)
 
-[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/master.svg?label=master%20branch)](https://travis-ci.org/utPLSQL/utPLSQL)
+[![build](https://img.shields.io/travis/utPLSQL/utPLSQL/main.svg?label=main%20branch)](https://travis-ci.org/utPLSQL/utPLSQL)
 [![build](https://img.shields.io/travis/utPLSQL/utPLSQL/develop.svg?label=develop%20branch)](https://travis-ci.org/utPLSQL/utPLSQL)
 [![sonar](https://sonarcloud.io/api/project_badges/measure?project=utPLSQL&metric=sqale_rating)](https://sonarcloud.io/dashboard/index?id=utPLSQL)
 [![Coveralls coverage](https://coveralls.io/repos/github/utPLSQL/utPLSQL/badge.svg?branch=develop)](https://coveralls.io/github/utPLSQL/utPLSQL?branch=develop)
