Skip to content

Commit 51f6b96

Browse files
chore: replace master references to main
1 parent d21e542 commit 51f6b96

File tree

7 files changed

+46
-46
lines changed

7 files changed

+46
-46
lines changed

.github/workflows/binaries.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Checkout the repository
1414
uses: actions/checkout@v2
1515
with:
16-
path: 'prettier-java'
16+
path: "prettier-java"
1717
- uses: actions/setup-node@v1
1818
with:
1919
node-version: 10.x
@@ -49,8 +49,8 @@ jobs:
4949
cd $GITHUB_WORKSPACE/prettier
5050
pkg package.json -o $GITHUB_WORKSPACE/prettier-java-${GITHUB_REF##*/} --targets node10-linux-x64,node10-macos-x64,node10-win-x64
5151
- name: Upload the artifacts
52-
uses: skx/github-action-publish-binaries@master
52+
uses: skx/github-action-publish-binaries@main
5353
env:
5454
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5555
with:
56-
args: 'prettier-java-*'
56+
args: "prettier-java-*"

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ yarn run
1515

1616
## Linking the java-parser to the printer
1717

18-
If you want to use the master java-parser for the prettier-plugin-java (printer), you will need to link it by running these commands in the root folder:
18+
If you want to use the main java-parser for the prettier-plugin-java (printer), you will need to link it by running these commands in the root folder:
1919

2020
```bash
2121
cd packages/java-parser

RELEASE.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ upstream [email protected]:jhipster/prettier-java (fetch)
1414
upstream [email protected]:jhipster/prettier-java (push)
1515
```
1616

17-
Update `master` branch and `release` branch in your fork.
17+
Update `main` branch and `release` branch in your fork.
1818

1919
```
2020
git checkout release
2121
git fetch upstream
2222
git rebase upstream/release
2323
24-
git checkout master
25-
git rebase upstream/master
24+
git checkout main
25+
git rebase upstream/main
2626
```
2727

2828
Be sure your dependencies is up-to-dated:
@@ -31,22 +31,22 @@ Be sure your dependencies is up-to-dated:
3131
yarn
3232
```
3333

34-
In `master` branch, launch the release, and answer the questions. It will:
34+
In `main` branch, launch the release, and answer the questions. It will:
3535

3636
- change the version (patch, minor or major, accordingly to what you choose)
3737
- tag the version
38-
- push master branch to upstream
38+
- push main branch to upstream
3939
- push the tag to upstream
4040

4141
```
4242
yarn run lerna:version
4343
```
4444

45-
Then, if everything looks OK, merge the master branch to the release branch locally, then push the release branch:
45+
Then, if everything looks OK, merge the main branch to the release branch locally, then push the release branch:
4646

4747
```
4848
git checkout release
49-
git merge master
49+
git merge main
5050
git push upstream/release
5151
```
5252

packages/java-parser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.8.2",
44
"description": "Java Parser in JavaScript",
55
"main": "src/index.js",
6-
"repository": "https://github.com/jhipster/prettier-java/tree/master/packages/java-parser",
6+
"repository": "https://github.com/jhipster/prettier-java/tree/main/packages/java-parser",
77
"license": "Apache-2.0",
88
"types": "./api.d.ts",
99
"dependencies": {

packages/java-parser/scripts/clone-samples.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,72 +25,72 @@ const sampleRepos = [
2525
},
2626
{
2727
repoUrl: "https://github.com/jhipster/jhipster",
28-
branch: "master"
28+
branch: "main"
2929
},
3030
{
3131
repoUrl: "https://github.com/jhipster/jhipster-sample-app",
32-
branch: "master"
32+
branch: "main"
3333
},
3434
{
3535
repoUrl: "https://github.com/jhipster/jhipster-online",
36-
branch: "master"
36+
branch: "main"
3737
},
3838
{
3939
repoUrl: "https://github.com/jhipster/jhipster-sample-app-microservice",
40-
branch: "master"
40+
branch: "main"
4141
},
4242
{
4343
repoUrl: "https://github.com/jhipster/jhipster-sample-app-gateway",
44-
branch: "master"
44+
branch: "main"
4545
},
4646
{
4747
repoUrl: "https://github.com/jhipster/jhipster-sample-app-oauth2",
48-
branch: "master"
48+
branch: "main"
4949
},
5050
{
5151
repoUrl: "https://github.com/jhipster/jhipster-sample-app-websocket",
52-
branch: "master"
52+
branch: "main"
5353
},
5454
{
5555
repoUrl: "https://github.com/jhipster/jhipster-sample-app-noi18n",
56-
branch: "master"
56+
branch: "main"
5757
},
5858
{
5959
repoUrl: "https://github.com/jhipster/jhipster-sample-app-nocache",
60-
branch: "master"
60+
branch: "main"
6161
},
6262
{
6363
repoUrl: "https://github.com/jhipster/jhipster-sample-app-hazelcast",
64-
branch: "master"
64+
branch: "main"
6565
},
6666

6767
{
6868
repoUrl: "https://github.com/jhipster/jhipster-sample-app-elasticsearch",
69-
branch: "master"
69+
branch: "main"
7070
},
7171
{
7272
repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto",
73-
branch: "master"
73+
branch: "main"
7474
},
7575
{
7676
repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase",
77-
branch: "master"
77+
branch: "main"
7878
},
7979
{
8080
repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra",
81-
branch: "master"
81+
branch: "main"
8282
},
8383
{
8484
repoUrl: "https://github.com/jhipster/jhipster-sample-app-mongodb",
85-
branch: "master"
85+
branch: "main"
8686
},
8787
{
8888
repoUrl: "https://github.com/jhipster/jhipster-sample-app-gradle",
89-
branch: "master"
89+
branch: "main"
9090
},
9191
{
9292
repoUrl: "https://github.com/jhipster/jhipster-sample-app-react",
93-
branch: "master"
93+
branch: "main"
9494
}
9595
];
9696

packages/prettier-plugin-java/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ We added a custom option ```entrypoint``` in order to run prettier on code snipp
121121

122122
### Usage
123123
```prettier --write MyJava.java --entrypoint compilationUnit``` \
124-
[Here](https://github.com/jhipster/prettier-java/blob/master/packages/prettier-plugin-java/src/options.js) is the exhaustive list of all entrypoints.
124+
[Here](https://github.com/jhipster/prettier-java/blob/main/packages/prettier-plugin-java/src/options.js) is the exhaustive list of all entrypoints.
125125

126126
### Example
127127
MyJavaCode.java content:

packages/prettier-plugin-java/scripts/clone-samples.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ const samplesDir = path.resolve(__dirname, "../samples");
99
const core = [
1010
{
1111
repoUrl: "https://github.com/jhipster/jhipster-sample-app",
12-
branch: "master"
12+
branch: "main"
1313
},
1414
{
1515
repoUrl: "https://github.com/jhipster/jhipster",
16-
branch: "master"
16+
branch: "main"
1717
},
1818
{
1919
repoUrl: "https://github.com/spring-projects/spring-boot.git",
@@ -28,62 +28,62 @@ const core = [
2828
const jhipster1 = [
2929
{
3030
repoUrl: "https://github.com/jhipster/jhipster-online",
31-
branch: "master"
31+
branch: "main"
3232
},
3333
{
3434
repoUrl: "https://github.com/jhipster/jhipster-sample-app-microservice",
35-
branch: "master"
35+
branch: "main"
3636
},
3737
{
3838
repoUrl: "https://github.com/jhipster/jhipster-sample-app-gateway",
39-
branch: "master"
39+
branch: "main"
4040
},
4141
{
4242
repoUrl: "https://github.com/jhipster/jhipster-sample-app-oauth2",
43-
branch: "master"
43+
branch: "main"
4444
},
4545
{
4646
repoUrl: "https://github.com/jhipster/jhipster-sample-app-websocket",
47-
branch: "master"
47+
branch: "main"
4848
},
4949
{
5050
repoUrl: "https://github.com/jhipster/jhipster-sample-app-noi18n",
51-
branch: "master"
51+
branch: "main"
5252
},
5353
{
5454
repoUrl: "https://github.com/jhipster/jhipster-sample-app-nocache",
55-
branch: "master"
55+
branch: "main"
5656
},
5757
{
5858
repoUrl: "https://github.com/jhipster/jhipster-sample-app-hazelcast",
59-
branch: "master"
59+
branch: "main"
6060
}
6161
];
6262

6363
const jhipster2 = [
6464
{
6565
repoUrl: "https://github.com/jhipster/jhipster-sample-app-elasticsearch",
66-
branch: "master"
66+
branch: "main"
6767
},
6868
{
6969
repoUrl: "https://github.com/jhipster/jhipster-sample-app-dto",
70-
branch: "master"
70+
branch: "main"
7171
},
7272
{
7373
repoUrl: "https://github.com/jhipster/jhipster-sample-app-couchbase",
74-
branch: "master"
74+
branch: "main"
7575
},
7676
{
7777
repoUrl: "https://github.com/jhipster/jhipster-sample-app-cassandra",
78-
branch: "master"
78+
branch: "main"
7979
},
8080
{
8181
repoUrl: "https://github.com/jhipster/jhipster-sample-app-mongodb",
82-
branch: "master"
82+
branch: "main"
8383
},
8484
{
8585
repoUrl: "https://github.com/jhipster/jhipster-sample-app-react",
86-
branch: "master"
86+
branch: "main"
8787
}
8888
];
8989

0 commit comments

Comments
 (0)