This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch OPENNLP-1418_-_Rename_master_to_main in repository https://gitbox.apache.org/repos/asf/opennlp-site.git
commit a1b5d7cbbb45de8b7de404a28267be76572a41a2 Author: Richard Zowalla <[email protected]> AuthorDate: Wed Dec 21 18:58:31 2022 +0100 OPENNLP-1418 - Rename master to main --- .github/workflows/{master.yml => main.yml} | 4 ++-- README.md | 2 +- src/main/jbake/content/release.ad | 2 +- src/main/jbake/content/using-git.ad | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/main.yml similarity index 97% rename from .github/workflows/master.yml rename to .github/workflows/main.yml index 483a9ac9..dfcfcf17 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/main.yml @@ -17,9 +17,9 @@ name: Java CI on: push: - branches: [ "master" ] + branches: [ "main" ] pull_request: - branches: [ "master" ] + branches: [ "main" ] workflow_dispatch: jobs: diff --git a/README.md b/README.md index eb585e2c..c047ebd1 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Welcome to OpenNLP Site Source Code ==================================== [](https://github.com/apache/opennlp-site/actions) -[](https://raw.githubusercontent.com/apache/opennlp/master/LICENSE) +[](https://raw.githubusercontent.com/apache/opennlp/main/LICENSE) [](https://twitter.com/ApacheOpenNLP) #### Build diff --git a/src/main/jbake/content/release.ad b/src/main/jbake/content/release.ad index 9346aa34..3396aaf6 100644 --- a/src/main/jbake/content/release.ad +++ b/src/main/jbake/content/release.ad @@ -61,7 +61,7 @@ svn commit -m"Added Key for <name>" KEYS ## Release Steps -- Checkout the Apache OpenNLP master branch: `git clone [email protected]:apache/opennlp.git` +- Checkout the Apache OpenNLP main branch: `git clone [email protected]:apache/opennlp.git` - Execute a complete test (it can take several hours): `mvn test -DOPENNLP_DATA_DIR=/path/to/opennlp-test-data/ -Peval-tests` - Do a trial build: `mvn package -Papache-release` - Prepare the release: `mvn release:prepare` Answer the questions appropriately. The tag name format should be *opennlp-x.y.z*. diff --git a/src/main/jbake/content/using-git.ad b/src/main/jbake/content/using-git.ad index b7721d04..d726c214 100644 --- a/src/main/jbake/content/using-git.ad +++ b/src/main/jbake/content/using-git.ad @@ -22,7 +22,7 @@ :jbake-status: published :idprefix: -There are several ways to set up Git for committers and contributors. Contributors can safely set up Git in any way they choose, but committers should take extra care since they can push new commits to the upstream/master at Apache and various policies there make backing out mistakes problematic. +There are several ways to set up Git for committers and contributors. Contributors can safely set up Git in any way they choose, but committers should take extra care since they can push new commits to the upstream/main at Apache and various policies there make backing out mistakes problematic. ## One time setup @@ -50,7 +50,7 @@ Your repository should have two remotes, the upstream remote, and the default or ## Merge a Pull Request via GitHub -Please do not commit directly to the master branch. All changes are done via Pull Requests, and a Pull Request needs to get two positive reviews and no change requests until it https://git-scm.com/docs/git-merge#_fast_forward_merge[can be merged]. The PR can be merged via the Github UI as described below or manually. Please also note that we do not use merge commits, the merge should be done using https://git-scm.com/docs/git-merge#_fast_forward_merge[fast forward merging]. +Please do not commit directly to the main branch. All changes are done via Pull Requests, and a Pull Request needs to get two positive reviews and no change requests until it https://git-scm.com/docs/git-merge#_fast_forward_merge[can be merged]. The PR can be merged via the Github UI as described below or manually. Please also note that we do not use merge commits, the merge should be done using https://git-scm.com/docs/git-merge#_fast_forward_merge[fast forward merging]. To merge a PR via Github follow these steps:
