File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed
Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ function fetch_ci_scripts() {
44 local inc_dir
55 local inc_url
66 inc_dir=" $( dirname " $0 " ) /inc"
7- inc_url=" ${PMD_CI_SCRIPTS_URL:- https:// raw.githubusercontent.com/ pmd/ build-tools/ master / scripts} /inc"
7+ inc_url=" ${PMD_CI_SCRIPTS_URL:- https:// raw.githubusercontent.com/ pmd/ build-tools/ main / scripts} /inc"
88
99 mkdir -p " ${inc_dir} "
1010
Original file line number Diff line number Diff line change 44 push :
55 branches :
66 - main
7- - master
87 tags :
98 - ' **'
109 pull_request :
3736 run : |
3837 echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
3938 echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3" >> $GITHUB_ENV
40- echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/master /scripts" >> $GITHUB_ENV
39+ echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/26 /scripts" >> $GITHUB_ENV
4140 - name : Check Environment
4241 shell : bash
4342 run : |
Original file line number Diff line number Diff line change @@ -71,19 +71,19 @@ BlueJ's extension2 directory.
7171
7272### Releasing a new version
7373
74- * Update [ ReleaseNotes.md] ( https://github.com/pmd/pmd-bluej/blob/master /ReleaseNotes.md )
74+ * Update [ ReleaseNotes.md] ( https://github.com/pmd/pmd-bluej/blob/main /ReleaseNotes.md )
7575 with new version a release date
7676* Update the version: ` ./mvnw versions:set -DnewVersion=2.2.0 `
7777* Commit: ` git commit -a -m "Prepare new version 2.2.0" `
7878* Tag: ` git tag 2.2.0 `
79- * Push: ` git push origin master ; git push origin tag 2.2.0 `
79+ * Push: ` git push origin main ; git push origin tag 2.2.0 `
8080* The tag will be built by [ Github Actions] ( https://github.com/pmd/pmd-bluej/actions?query=workflow%3Abuild ) .
8181* After it is done, a new release including the jar file should be available here:
8282 * < https://github.com/pmd/pmd-bluej/releases >
8383 * < https://sourceforge.net/projects/pmd/files/pmd-bluej/ >
8484* Update the version: ` ./mvnw versions:set -DnewVersion=2.3.0-SNAPSHOT `
85- * Update [ ReleaseNotes.md] ( https://github.com/pmd/pmd-bluej/blob/master /ReleaseNotes.md )
85+ * Update [ ReleaseNotes.md] ( https://github.com/pmd/pmd-bluej/blob/main /ReleaseNotes.md )
8686 and add a placeholder for the next version
8787* Commit: ` git commit -a -m "Prepare next development version 2.3.0-SNAPSHOT" `
88- * Push: ` git push origin master `
88+ * Push: ` git push origin main `
8989* Post a news on < https://sourceforge.net/p/pmd/news/ > .
Original file line number Diff line number Diff line change 22
33## ??-????-???? - 5.0.2
44
5+ * New Git default branch - "main":
6+ We are joining the Git community and updating "master" to "main". Using the term "master" for the main
7+ development branch can be offensive to some people. Existing versions of Git have been always capable of
8+ working with any branch name and since 2.28.0 (July 2020) the default initial branch is configurable
9+ (` init.defaultBranch ` ). Since October 2020, the default branch for new repositories on GitHub
10+ is "main". Finally, PMD will also use this new name for the main branch in all our own repositories.
11+
512## 26-January-2024 - 5.0.1
613
714* Support PMD 7 (in addition to PMD 6)
You can’t perform that action at this time.
0 commit comments