Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ If you want to contribute to the repository, here's a quick guide:
* Please add one or more tests to validate your changes.
3. Make sure everything builds/tests cleanly
4. Commit your changes
5. Push to your fork and submit a pull request to the **master** branch
5. Push to your fork and submit a pull request to the **main** branch

# Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Build Status](https://travis-ci.com/IBM/java-sdk-core.svg?branch=master)](https://travis-ci.com/IBM/java-sdk-core)
[![Build Status](https://travis-ci.com/IBM/java-sdk-core.svg?branch=main)](https://travis-ci.com/IBM/java-sdk-core)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.ibm.cloud/sdk-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.ibm.cloud/sdk-core)
[![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/java-sdk-core/branch/master/graph/badge.svg)](https://codecov.io/gh/IBM/java-sdk-core)
[![codecov](https://codecov.io/gh/IBM/java-sdk-core/branch/main/graph/badge.svg)](https://codecov.io/gh/IBM/java-sdk-core)
[![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)
[![CLA assistant](https://cla-assistant.io/readme/badge/ibm/java-sdk-core)](https://cla-assistant.io/ibm/java-sdk-core)

Expand Down
4 changes: 2 additions & 2 deletions build/publishCodeCoverage.sh
Original file line number Diff line number Diff line change
@@ -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 target/site/jacoco -t $CODECOV_TOKEN
else
Expand Down
4 changes: 2 additions & 2 deletions build/publishJavadoc.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Publish javadocs only for a tagged-release or non-PR build of master.
if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
# Publish javadocs only for a tagged-release or non-PR build of main.
if [[ -n "${TRAVIS_TAG}" || "${TRAVIS_BRANCH}" == "main" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; then

printf "\n>>>>> Publishing javadoc for release build: repo=%s branch=%s build_num=%s job_num=%s\n" ${TRAVIS_REPO_SLUG} ${TRAVIS_BRANCH} ${TRAVIS_BUILD_NUMBER} ${TRAVIS_JOB_NUMBER}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<scm>
<connection>scm:git:https://github.com/IBM/java-sdk-core</connection>
<developerConnection>scm:git:https://github.com/IBM/java-sdk-core</developerConnection>
<url>https://github.com/IBM/java-sdk-core/tree/master</url>
<url>https://github.com/IBM/java-sdk-core/tree/main</url>
</scm>

<issueManagement>
Expand Down