diff --git a/.releaserc b/.releaserc index 3e5b43a921..4e896a2720 100644 --- a/.releaserc +++ b/.releaserc @@ -1,6 +1,7 @@ { "debug": true, "tagFormat": "${version}", + "branches": [ "main" ], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", diff --git a/.travis.yml b/.travis.yml index 4532fd599e..1dc381dd67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ env: stages: - name: Build-Test - name: Semantic-Release - if: branch = master AND type = push AND fork = false + if: branch = main AND type = push AND fork = false - name: Publish-Release if: tag IS present diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 63d0f2a6d8..72cddfeee9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,4 +10,4 @@ Before that, please search for similar issues. It's possible that someone has al # General Information For general guidance on contributing to this project, please see -[this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/CONTRIBUTING_java.md) +[this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/main/CONTRIBUTING_java.md) diff --git a/README.md b/README.md index a3429d6d7b..11c9728afa 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -[![Build Status](https://travis-ci.com/IBM/platform-services-java-sdk.svg?branch=master)](https://travis-ci.com/IBM/platform-services-java-sdk) +[![Build Status](https://travis-ci.com/IBM/platform-services-java-sdk.svg?branch=main)](https://travis-ci.com/IBM/platform-services-java-sdk) [![Javadoc](https://img.shields.io/static/v1?label=javadoc&message=latest&color=blue)](https://ibm.github.io/platform-services-java-sdk/docs/latest) [![Release](https://img.shields.io/github/v/release/IBM/platform-services-java-sdk)](https://github.com/IBM/platform-services-java-sdk/releases/latest) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) -[![codecov](https://codecov.io/gh/IBM/platform-services-java-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/platform-services-java-sdk) +[![codecov](https://codecov.io/gh/IBM/platform-services-java-sdk/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/platform-services-java-sdk) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) @@ -106,7 +106,7 @@ artifact coordinates (group id, artifact id and version) for the service, like t ``` ## Using the SDK -For general SDK usage information, please see [this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/master/README.md) +For general SDK usage information, please see [this link](https://github.com/IBM/ibm-cloud-sdk-common/blob/main/README.md) ## Questions diff --git a/build/publishCodeCoverage.sh b/build/publishCodeCoverage.sh index 7797760b27..d20a5a7008 100755 --- a/build/publishCodeCoverage.sh +++ b/build/publishCodeCoverage.sh @@ -1,9 +1,9 @@ #!/bin/bash -# This script will publish code coverage info for a build of the master branch +# This script will publish code coverage info for a build of the main branch # or a tagged release. -if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then +if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "main" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then printf ">>>>> Publishing code coverage info for branch: %s\n" ${TRAVIS_BRANCH} $HOME/codecov-bash.sh -s modules/coverage-reports/target/site/jacoco-aggregate -t $CODECOV_TOKEN else diff --git a/pom.xml b/pom.xml index b27e815464..3d7ed53951 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ scm:git:https://github.com/IBM/platform-services-java-sdk scm:git:https://github.com/IBM/platform-services-java-sdk - https://github.com/IBM/platform-services-java-sdk/tree/master + https://github.com/IBM/platform-services-java-sdk/tree/main