Skip to content

Commit 0930b66

Browse files
committed
Renamed default branch from "master" to "main"
1 parent bf54b1f commit 0930b66

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2525
with:
2626
path-to-signatures: 'cla/version1/signatures/cla.json'
27-
path-to-document: 'https://github.com/cowwoc/requirements.java/blob/master/cla/version1/cla.md' # e.g. a CLA or a DCO document
27+
path-to-document: 'https://github.com/cowwoc/requirements.java/blob/main/cla/version1/cla.md' # e.g. a CLA or a DCO document
2828
# branch should not be protected
2929
branch: 'main'
3030
allowlist: cowwoc

.github/workflows/deploy_to_maven_central.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Open release
2222
runs-on: ubuntu-latest
2323
outputs:
24-
INITIAL_MASTER_POSITION: ${{ steps.create-tag.outputs.INITIAL_MASTER_POSITION }}
24+
INITIAL_MAIN_POSITION: ${{ steps.create-tag.outputs.INITIAL_MAIN_POSITION }}
2525
INITIAL_GH_PAGES_POSITION: ${{ steps.create-tag.outputs.INITIAL_GH_PAGES_POSITION }}
2626
TAG: ${{ steps.create-tag.outputs.TAG }}
2727
VERSION: ${{ steps.create-tag.outputs.VERSION }}
@@ -67,7 +67,7 @@ jobs:
6767
- name: Create tag
6868
id: create-tag
6969
run: |
70-
echo "INITIAL_MASTER_POSITION=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
70+
echo "INITIAL_MAIN_POSITION=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
7171
./mvnw release:prepare --batch-mode -V -e
7272
TAG=$(git describe --tag --abbrev=0)
7373
echo "TAG=${TAG}" >> "$GITHUB_OUTPUT"
@@ -224,12 +224,12 @@ jobs:
224224
-d '{"data": {"stagedRepositoryId": "${{ needs.open-release.outputs.STAGING_REPOSITORY_ID }}", "description": "Dropping repository"}}'
225225
'https://${{ env.STAGING_HOST }}/service/local/staging/profiles/${{ needs.open-release.outputs.STAGING_PROFILE_ID }}/drop'
226226
227-
- name: Restore the master ref to its original position
228-
if: needs.open-release.outputs.INITIAL_MASTER_POSITION != ''
227+
- name: Restore the main ref to its original position
228+
if: needs.open-release.outputs.INITIAL_MAIN_POSITION != ''
229229
run: |
230230
CURRENT_REF_POSITION=$(git rev-parse HEAD)
231-
if [ "${CURRENT_REF_POSITION}" != "${{ needs.open-release.outputs.INITIAL_MASTER_POSITION }}" ]; then
232-
git reset --hard ${{ needs.open-release.outputs.INITIAL_MASTER_POSITION }}
231+
if [ "${CURRENT_REF_POSITION}" != "${{ needs.open-release.outputs.INITIAL_MAIN_POSITION }}" ]; then
232+
git reset --hard ${{ needs.open-release.outputs.INITIAL_MAIN_POSITION }}
233233
if [ "${{ github.ref_type }}" == "tag" ]; then
234234
git ${{ github.ref_type }} -f ${{ github.ref_name }}
235235
fi

docs/Changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Minor updates involving cosmetic changes have been omitted from this list.
22

3-
See https://github.com/cowwoc/requirements.java/commits/master for a full list.
3+
See https://github.com/cowwoc/requirements.java/commits/main for a full list.
44

55
## Version 10.2 - 2024/12/07
66

java/src/main/java/com/github/cowwoc/requirements10/java/validator/component/ObjectComponent.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public interface ObjectComponent<S, T>
132132
* @param expected the expected value
133133
* @return this
134134
* @throws IllegalArgumentException if the value is not equal to {@code expected}
135-
* @see <a href="https://github.com/cowwoc/requirements.java/blob/master/docs/Textual_Diff.md">An
135+
* @see <a href="https://github.com/cowwoc/requirements.java/blob/main/docs/Textual_Diff.md">An
136136
* explanation of the output format</a>
137137
*/
138138
S isEqualTo(Object expected);
@@ -152,7 +152,7 @@ public interface ObjectComponent<S, T>
152152
* the validator context</li>
153153
* <li>the value is not equal to {@code expected}</li>
154154
* </ul>
155-
* @see <a href="https://github.com/cowwoc/requirements.java/blob/master/docs/Textual_Diff.md">An
155+
* @see <a href="https://github.com/cowwoc/requirements.java/blob/main/docs/Textual_Diff.md">An
156156
* explanation of the output format</a>
157157
*/
158158
S isEqualTo(Object expected, String name);
@@ -163,7 +163,7 @@ public interface ObjectComponent<S, T>
163163
* @param unwanted the unwanted value
164164
* @return this
165165
* @throws IllegalArgumentException if the value is equal to {@code expected}
166-
* @see <a href="https://github.com/cowwoc/requirements.java/blob/master/docs/Textual_Diff.md">An
166+
* @see <a href="https://github.com/cowwoc/requirements.java/blob/main/docs/Textual_Diff.md">An
167167
* explanation of the output format</a>
168168
*/
169169
S isNotEqualTo(Object unwanted);
@@ -183,7 +183,7 @@ public interface ObjectComponent<S, T>
183183
* the validator context</li>
184184
* <li>the value is equal to the {@code unwanted} value</li>
185185
* </ul>
186-
* @see <a href="https://github.com/cowwoc/requirements.java/blob/master/docs/Textual_Diff.md">An
186+
* @see <a href="https://github.com/cowwoc/requirements.java/blob/main/docs/Textual_Diff.md">An
187187
* explanation of the output format</a>
188188
*/
189189
S isNotEqualTo(Object unwanted, String name);

0 commit comments

Comments
 (0)