Ranaming master branch to main.

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
 
   push:
     branches:
-      - master
+      - main
       - develop
 
   pull_request:
@@ -39,7 +39,7 @@ jobs:
             BRANCH=${GITHUB_REF##*/}
           fi
           echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          if [ "$BRANCH" == "master" ]; then
+          if [ "$BRANCH" == "main" ]; then
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -94,7 +94,7 @@ jobs:
             BRANCH=${GITHUB_REF##*/}
           fi
           echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          if [ "$BRANCH" == "master" ]; then
+          if [ "$BRANCH" == "main" ]; then
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -139,7 +139,7 @@ jobs:
             BRANCH=${GITHUB_REF##*/}
           fi
           echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          if [ "$BRANCH" == "master" ]; then
+          if [ "$BRANCH" == "main" ]; then
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV
@@ -216,7 +216,7 @@ jobs:
             BRANCH=${GITHUB_REF##*/}
           fi
           echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          if [ "$BRANCH" == "master" ]; then
+          if [ "$BRANCH" == "main" ]; then
             echo "CLOWDER_VERSION=$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')" >> $GITHUB_ENV
           elif [ "$BRANCH" == "develop" ]; then
             echo "CLOWDER_VERSION=develop" >> $GITHUB_ENV

.github/workflows/docker.yml

@@ -5,7 +5,7 @@ name: Docker
 # and would not set the right version flags.
 
 # This will run when:
-# - when new code is pushed to master/develop to push the tags
+# - when new code is pushed to main/develop to push the tags
 #   latest and develop
 # - when a pull request is created and updated  to make sure the
 #   Dockerfile is still valid.
@@ -16,14 +16,14 @@ name: Docker
 on:
   push:
     branches:
-      - master
+      - main
       - develop
 
   pull_request:
 
-# Certain actions will only run when this is the master repo.
+# Certain actions will only run when this is the main repo.
 env:
-  MASTER_REPO: clowder-framework/clowder
+  main_REPO: clowder-framework/clowder
   DOCKERHUB_ORG: clowder
 
 jobs:
@@ -77,7 +77,7 @@ jobs:
             BRANCH=${GITHUB_REF##*/}
           fi
 
-          if [ "$BRANCH" == "master" ]; then
+          if [ "$BRANCH" == "main" ]; then
             version="$(awk '/version = / { print $4 }' project/Build.scala | sed 's/"//g')"
             tags="latest"
             oldversion=""
@@ -198,7 +198,7 @@ jobs:
 
       # update README at DockerHub
       - name: Docker Hub Description
-        if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.MASTER_REPO && env.BRANCH == 'master'
+        if: env.dockerhub != '' && matrix.README != '' && github.event_name == 'push' && github.repository == env.main_REPO && env.BRANCH == 'main'
         uses: peter-evans/dockerhub-description@v2
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

.github/workflows/swagger.yml

@@ -1,14 +1,14 @@
 name: swagger
 
 # This will run when:
-# - when new code is pushed to master/develop to make sure the
+# - when new code is pushed to main/develop to make sure the
 #   code does compile.
 # - when a pull request is created and updated to make sure the
 #   code does compile.
 on:
   push:
     branches:
-      - master
+      - main
       - develop
 
   pull_request:

CONTRIBUTING.md

@@ -5,7 +5,7 @@ below. By participating in this project, you agree to abide by the [code of cond
 Before your code can be accepted, you will have to sign a [CLA](https://clowderframework.org/pdf/Clowder-CLA.pdf)
 and mail it to [email protected].
 
-Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to 
+Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `` and `develop` branches are pushed to 
 [GitHub][github] nightly.
 
 We encourage contributors to create an account on [NCSA Bitbucket][bitbucket] and make pull requests there. We also accept 

INSTALL.md

@@ -85,7 +85,7 @@ Next we install the script that will install or update clowder.
 cat > /home/browndog/update-clowder.sh << EOF
 #!/bin/bash
 
-# CATS-WWW (master) is the main branch for this server
+# CATS-WWW () is the main branch for this server
 # CATS-WWW1 (develop) if you want the latest version
 clowder_BRANCH=${clowder_BRANCH:-"CATS-WWW1"}
 

doc/src/sphinx/develop/previewers.rst

@@ -12,4 +12,4 @@ Previewer can work together with extractors and external services.
 
 
 Here is a list of previewer embedded with the core
-`source <https://github.com/clowder-framework/clowder/tree/master/public/javascripts/previewers>`_.
+`source <https://github.com/clowder-framework/clowder/tree//public/javascripts/previewers>`_.

doc/src/sphinx/index.rst

@@ -25,7 +25,7 @@ be customized and deployed on your own cloud.
     `NCSA Opensource <https://opensource.ncsa.illinois.edu/projects/CATS>`_. A copy of the source code can also be found
     on `GitHub <https://github.com/clowder-framework>`_.
 
-  * We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob/master/CONTRIBUTING.md>`_.
+  * We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob//CONTRIBUTING.md>`_.
 
 ********
 Contents

project/Build.scala

@@ -18,7 +18,7 @@ object ApplicationBuild extends Build {
 
   def appVersion: String = {
     gitBranchName match {
-      case "master" => getVersion
+      case "" => getVersion
       case _ => s"${getVersion}-develop"
     }
   }

public/swagger.yml

@@ -16,7 +16,7 @@ info:
     url: https://clowder.ncsa.illinois.edu/clowder/email
   license:
     name: The University of Illinois/NCSA Open Source License (NCSA)
-    url: https://github.com/clowder-framework/clowder/blob/master/LICENSE
+    url: https://github.com/clowder-framework/clowder/blob//LICENSE
 
 ################################################################################
 # Servers                                                                      #

release.sh

@@ -4,7 +4,7 @@
 set -e
 
 # can use the following to push to isda-registry for testing:
-# BRANCH="master" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh
+# BRANCH="" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh
 
 # use DEBUG=echo ./release.sh to print all commands
 DEBUG=${DEBUG:-""}
@@ -19,7 +19,7 @@ BRANCH=${BRANCH:-"$(git rev-parse --abbrev-ref HEAD)"}
 BRANCH=${BRANCH} VERSION=${TMPVERSION} DEBUG=${DEBUG} $(dirname $0)/docker.sh
 
 # find out the version
-if [ "${BRANCH}" = "master" ]; then
+if [ "${BRANCH}" = "" ]; then
     VERSION=${VERSION:-""}
     if [ "${VERSION}" = "" ]; then
         TMPVERSION=$(awk '/version = / { print $4 }' $(dirname $0)/project/Build.scala | sed 's/"//g')