You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2021/03/31 11:06:12 UTC
[qpid-broker-j] branch main updated: NO-JIRA: update build status
and instructions after default branch renamed to main
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new 32c2838 NO-JIRA: update build status and instructions after default branch renamed to main
32c2838 is described below
commit 32c2838e2f6d2e63f8a8e47a5901b70a1f5b1e93
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Mar 31 12:05:25 2021 +0100
NO-JIRA: update build status and instructions after default branch renamed to main
---
README.md | 2 +-
doc/developer-guide/src/main/markdown/quick-start.md | 6 +++---
doc/developer-guide/src/main/markdown/release-instructions.md | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 3c4a495..443a652 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
|CI Process|Status|
|---|---|
-|Travis CI Build|[](https://travis-ci.com/apache/qpid-broker-j?branch=master)|
+|Travis CI Build|[](https://travis-ci.com/apache/qpid-broker-j?branch=main)|
|Apache Jenkins CI Build|[](https://ci-builds.apache.org/job/Qpid/job/Qpid-Broker-J-TestMatrix/)|
---
diff --git a/doc/developer-guide/src/main/markdown/quick-start.md b/doc/developer-guide/src/main/markdown/quick-start.md
index a6beb6a..28cbe21 100644
--- a/doc/developer-guide/src/main/markdown/quick-start.md
+++ b/doc/developer-guide/src/main/markdown/quick-start.md
@@ -108,11 +108,11 @@ The changes can be submitted as pull request against github mirror of Apache Qpi
## How to contribute changes to Qpid Broker-J
Here is a set of simple instructions to follow in order to contribute changes.
-Please note, that changes need to be implemented on master branch first before they can be ported into specific version support branch.
+Please note, that changes need to be implemented on main branch first before they can be ported into specific version support branch.
* Raise JIRA ticket
* Fork github mirror of broker-j repository, if it is not forked yet
-* Create working branch from master in forked repo
+* Create working branch from main in forked repo
* Implement required changes and unit/integration tests
* Verify that implementation follows [Qpid code standard](code-guide.md) and [clean code practices](https://en.wikipedia.org/wiki/SOLID)
* Verify that all tests are passing locally on a developer machine
@@ -120,5 +120,5 @@ Please note, that changes need to be implemented on master branch first before t
* Create pull request in github mirror of broker-j repository
* Verify that all tests executed for PR by project Continuous Integration tools are still passing
* Address comments submitted by pull request reviewers if any and applicable
-* The reviewed changes needs to be applied into the master branch by project committer
+* The reviewed changes needs to be applied into the main branch by project committer
* Close the JIRA ticket
diff --git a/doc/developer-guide/src/main/markdown/release-instructions.md b/doc/developer-guide/src/main/markdown/release-instructions.md
index fda2b8e..d57baa8 100644
--- a/doc/developer-guide/src/main/markdown/release-instructions.md
+++ b/doc/developer-guide/src/main/markdown/release-instructions.md
@@ -51,7 +51,7 @@ Sources are kept in a Git repository. Thus a git client is required.
## Release Steps
1. Checkout Qpid Broker-J Sources
- * For new major/minor release; checkout sources master
+ * For new major/minor release; checkout sources main branch
git clone https://gitbox.apache.org/repos/asf/qpid-broker-j.git qpid-broker-j
* For bugfix release
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org