Skip to content

Commit f1d71a6

Browse files
authored
chore(java): rename master branch to main (GoogleCloudPlatform#6134)
* chore: rename master to main * chore: revert a few incorrect updates
1 parent 96c4f10 commit f1d71a6

File tree

51 files changed

+69
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+69
-69
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Fixes #issue
22

33
> It's a good idea to open an issue first for discussion.
44
5-
- [ ] I have followed [Sample Format Guide](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/master/SAMPLE_FORMAT.md)
5+
- [ ] I have followed [Sample Format Guide](https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md)
66
- [ ] `pom.xml` parent set to latest `shared-configuration`
77
- [ ] Appropriate changes to README are included in PR
88
- [ ] API's need to be enabled to test (tell us)

.github/sync-repo-settings.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rebaseMergeAllowed: true
22
squashMergeAllowed: true
33
mergeCommitAllowed: false
44
branchProtectionRules:
5-
- pattern: master
5+
- pattern: main
66
isAdminEnforced: true
77
requiredStatusCheckContexts:
88
- 'Kokoro CI - Java 11'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Getting the sample code
22

33
Get the latest sample code from GitHub using Git or download the repository as a ZIP file.
4-
([Download](https://github.com/GoogleCloudPlatform/java-docs-samples/archive/master.zip))
4+
([Download](https://github.com/GoogleCloudPlatform/java-docs-samples/archive/main.zip))
55

66
git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git
77

.kokoro/java11/presubmit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
2020
value: "github/java-docs-samples/.kokoro/tests/run_tests.sh"
2121
}
22-
# Only diff from master
22+
# Only diff from main
2323
env_vars: {
2424
key: "GIT_DIFF"
25-
value: "origin/master... ."
25+
value: "origin/main... ."
2626
}

.kokoro/java8/presubmit.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ env_vars: {
1919
key: "TRAMPOLINE_BUILD_FILE"
2020
value: "github/java-docs-samples/.kokoro/tests/run_tests.sh"
2121
}
22-
# Only diff from master
22+
# Only diff from main
2323
env_vars: {
2424
key: "GIT_DIFF"
25-
value: "origin/master... ."
25+
value: "origin/main... ."
2626
}

.kokoro/lint/presubmit.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Tell the trampoline which build file to use.
1818
env_vars: {
1919
key: "GIT_DIFF"
20-
value: "origin/master... ."
20+
value: "origin/main... ."
2121
}

.kokoro/tests/run_test_java.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if [[ "$file" == "run/"* ]]; then
6767
fi
6868

6969
# If this is a periodic build, send the test log to the FlakyBot.
70-
# See https://github.com/googleapis/repo-automation-bots/tree/master/packages/flakybot.
70+
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
7171
if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
7272
chmod +x $KOKORO_GFILE_DIR/linux_amd64/flakybot
7373
$KOKORO_GFILE_DIR/linux_amd64/flakybot

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Google Cloud Platform Java Samples
22

33
![Kokoro Build Status](https://storage.googleapis.com/cloud-devrel-kokoro-resources/java/badges/java-docs-samples.png)
4-
[![Coverage Status](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples/branch/master/graph/badge.svg)](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples)
4+
[![Coverage Status](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples/branch/main/graph/badge.svg)](https://codecov.io/gh/GoogleCloudPlatform/java-docs-samples)
55

66
<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=README.md">
77
<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>

SAMPLE_FORMAT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
This doc maintains an outline for 'snippet' samples specific to Java. Currently, the Java canonical
3636
samples in this format are located
37-
[here](https://github.com/googleapis/java-dlp/tree/master/samples/snippets).
37+
[here](https://github.com/googleapis/java-dlp/tree/main/samples/snippets).
3838

3939
Larger sample applications should attempt to follow these guidelines as well, but some may
4040
be ignored or waived as there can be many structural differences between applications and snippets.
@@ -131,7 +131,7 @@ mind when setting up tests.
131131
* **Environment variables**
132132
Minimize additional environment variables that need to be set to run the tests.
133133
If you do require additional environment variables, they should be added to
134-
[run_tests.sh](../../blob/master/.kokoro/tests/run_tests.sh).
134+
[run_tests.sh](../../blob/main/.kokoro/tests/run_tests.sh).
135135

136136
Existing environment variables include:
137137
* `GOOGLE_APPLICATION_CREDENTIALS`

appengine-java8/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ access control, billing, and services.
4343
This sample demonstrates how to deploy an application on Google App Engine.
4444

4545
- [Documentation][ae-docs]
46-
- [Code](https://github.com/GoogleCloudPlatform/getting-started-java/tree/master/appengine-standard-java8/helloworld)
46+
- [Code](https://github.com/GoogleCloudPlatform/getting-started-java/tree/main/appengine-standard-java8/helloworld)
4747

4848
### Sending Email
4949

0 commit comments

Comments
 (0)