Skip to content

Commit f71303b

Browse files
authored
Switch default branch to main (#506)
Signed-off-by: Pierangelo Di Pilato <[email protected]>
1 parent d59b333 commit f71303b

File tree

20 files changed

+56
-54
lines changed

20 files changed

+56
-54
lines changed

.github/workflows/branch.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- main
78
- 2.[0-9]+
89

910
jobs:

.github/workflows/pr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- master
7+
- main
78
- 2.[0-9]+
89

910
jobs:

CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ your code. Thanks for getting involved! :rocket:
2323
* [Getting Started](#getting-started)
2424
* [Branches](#branches)
2525
* [Commit Messages](#commit-messages)
26-
* [Staying current with master](#staying-current-with-master)
26+
* [Staying current with main](#staying-current-with-main)
2727
* [Submitting and Updating a Pull Request](#submitting-and-updating-a-pull-request)
2828
* [Congratulations!](#congratulations)
2929

@@ -47,7 +47,7 @@ organized.
4747

4848
```console
4949
git fetch upstream
50-
git reset --hard upstream/master
50+
git reset --hard upstream/main
5151
git checkout FETCH_HEAD
5252
git checkout -b 48-fix-http-agent-error
5353
```
@@ -102,19 +102,19 @@ Date: Thu Feb 2 11:41:15 2018 -0800
102102
Notice the `Author` and `Signed-off-by` lines match. If they don't your PR will
103103
be rejected by the automated DCO check.
104104

105-
## Staying Current with `master`
105+
## Staying Current with `main`
106106

107-
As you are working on your branch, changes may happen on `master`. Before
107+
As you are working on your branch, changes may happen on `main`. Before
108108
submitting your pull request, be sure that your branch has been updated
109109
with the latest commits.
110110

111111
```console
112112
git fetch upstream
113-
git rebase upstream/master
113+
git rebase upstream/main
114114
```
115115

116116
This may cause conflicts if the files you are changing on your branch are
117-
also changed on master. Error messages from `git` will indicate if conflicts
117+
also changed on main. Error messages from `git` will indicate if conflicts
118118
exist and what files need attention. Resolve the conflicts in each file, then
119119
continue with the rebase with `git rebase --continue`.
120120

@@ -131,15 +131,15 @@ git push -f origin 48-fix-http-agent-error
131131
Before submitting a pull request, you should make sure that all of the tests
132132
successfully pass.
133133

134-
Once you have sent your pull request, `master` may continue to evolve
135-
before your pull request has landed. If there are any commits on `master`
134+
Once you have sent your pull request, `main` may continue to evolve
135+
before your pull request has landed. If there are any commits on `main`
136136
that conflict with your changes, you may need to update your branch with
137137
these changes before the pull request can land. Resolve conflicts the same
138138
way as before.
139139

140140
```console
141141
git fetch upstream
142-
git rebase upstream/master
142+
git rebase upstream/main
143143
# fix any potential conflicts
144144
git push -f origin 48-fix-http-agent-error
145145
```
@@ -156,7 +156,7 @@ for details.
156156

157157
```console
158158
git commit -m "fixup: fix typo"
159-
git rebase -i upstream/master # follow git instructions
159+
git rebase -i upstream/main # follow git instructions
160160
```
161161

162162
Once you have rebased your commits, you can force push to your fork as before.

MAINTAINERS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Currently, active maintainers who may be found in the CNCF Slack.
1010

1111
The release process is automated with Github actions. In order to perform a release:
1212

13-
1. Check if master CI pass.
13+
1. Check if main CI pass.
1414
1. Open the Github repository main page and go in the tab "Actions". Trigger the workflow "Bump version" and insert the new version to release. This will create a new release PR.
1515
1. Check the release PR, merge it and cleanup the created branch.
1616
1. Wait for the CI to complete the deploy of the modules to OSSRH.
@@ -44,14 +44,14 @@ When landing pull requests, be sure to check the first line uses an appropriate
4444

4545
## Branch Management
4646

47-
The `master` branch is the bleeding edge. New major versions of the module
47+
The `main` branch is the bleeding edge. New major versions of the module
4848
are cut from this branch and tagged. If you intend to submit a pull request
49-
you should use `master HEAD` as your starting point.
49+
you should use `main HEAD` as your starting point.
5050

5151
Each major release will result in a new branch and tag. For example, the
5252
release of version 1.0.0 of the module will result in a `v1.0.0` tag on the
5353
release commit, and a new branch `v1.x.y` for subsequent minor and patch
5454
level releases of that major version. However, development will continue
55-
apace on `master` for the next major version - e.g. 2.0.0. Version branches
55+
apace on `main` for the next major version - e.g. 2.0.0. Version branches
5656
are only created for each major version. Minor and patch level releases
5757
are simply tagged.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ You can check out the examples in the [examples](examples) directory.
9898

9999
Each SDK may have its own unique processes, tooling and guidelines, common
100100
governance related material can be found in the
101-
[CloudEvents `community`](https://github.com/cloudevents/spec/tree/master/community)
101+
[CloudEvents `community`](https://github.com/cloudevents/spec/tree/main/docs)
102102
directory. In particular, in there you will find information concerning how SDK
103103
projects are
104-
[managed](https://github.com/cloudevents/spec/blob/master/community/SDK-GOVERNANCE.md),
105-
[guidelines](https://github.com/cloudevents/spec/blob/master/community/SDK-maintainer-guidelines.md)
104+
[managed](https://github.com/cloudevents/spec/blob/main/docs/SDK-GOVERNANCE.md),
105+
[guidelines](https://github.com/cloudevents/spec/blob/main/docs/SDK-maintainer-guidelines.md)
106106
for how PR reviews and approval, and our
107-
[Code of Conduct](https://github.com/cloudevents/spec/blob/master/community/GOVERNANCE.md#additional-information)
107+
[Code of Conduct](https://github.com/cloudevents/spec/blob/main/docs/GOVERNANCE.md#additional-information)
108108
information.
109109

110110
[http4k]: https://www.http4k.org/guide/reference/cloud_events/

core/src/main/java/io/cloudevents/core/extensions/DistributedTracingExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/**
2727
* This extension embeds context from Distributed Tracing so that distributed systems can include traces that span an event-driven system.
2828
*
29-
* @see <a href="https://github.com/cloudevents/spec/blob/master/extensions/distributed-tracing.md">https://github.com/cloudevents/spec/blob/master/extensions/distributed-tracing.md</a>
29+
* @see <a href="https://github.com/cloudevents/spec/blob/main/extensions/distributed-tracing.md">https://github.com/cloudevents/spec/blob/main/extensions/distributed-tracing.md</a>
3030
*/
3131
public final class DistributedTracingExtension implements CloudEventExtension {
3232

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ search_enabled: true
1111
gh_edit_link: true
1212
gh_edit_link_text: "Edit this page on GitHub."
1313
gh_edit_repository: "https://github.com/cloudevents/sdk-java"
14-
gh_edit_branch: "master"
14+
gh_edit_branch: "main"
1515
gh_edit_source: docs
1616
gh_edit_view_mode: "tree"
1717

docs/amqp-proton.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ public class ProtonAmqpMessageFactory {
4343
The example uses the `vertx-proton` integration to send/receive CloudEvent
4444
messages over AMQP:
4545

46-
- [Vertx AmqpServer](https://github.com/cloudevents/sdk-java/tree/master/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpServer.java)
47-
- [Vertx AmqpClient](https://github.com/cloudevents/sdk-java/tree/master/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpClient.java)
46+
- [Vertx AmqpServer](https://github.com/cloudevents/sdk-java/tree/main/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpServer.java)
47+
- [Vertx AmqpClient](https://github.com/cloudevents/sdk-java/tree/main/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpClient.java)

docs/http-basic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ public class HttpMessageFactory {
4848

4949
## Examples
5050

51-
- [Standard Java HttpServer](https://github.com/cloudevents/sdk-java/tree/master/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/BasicHttpServer.java)
52-
- [Http Client with HttpURLConnection](https://github.com/cloudevents/sdk-java/tree/master/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/HttpURLConnectionClient.java)
53-
- [Http Servlet with Jetty](https://github.com/cloudevents/sdk-java/tree/master/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/JettyServer.java)
51+
- [Standard Java HttpServer](https://github.com/cloudevents/sdk-java/tree/main/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/BasicHttpServer.java)
52+
- [Http Client with HttpURLConnection](https://github.com/cloudevents/sdk-java/tree/main/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/HttpURLConnectionClient.java)
53+
- [Http Servlet with Jetty](https://github.com/cloudevents/sdk-java/tree/main/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/JettyServer.java)

docs/http-jakarta-restful-ws-jakarta.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,5 @@ To migrate to use EE 9+ supported package - replace `cloudevents-http-restful-ws
133133

134134
## Examples
135135

136-
- [Microprofile and Liberty](https://github.com/cloudevents/sdk-java/tree/master/examples/restful-ws-micropofile-liberty)
136+
- [Microprofile and Liberty](https://github.com/cloudevents/sdk-java/tree/main/examples/restful-ws-micropofile-liberty)
137137

0 commit comments

Comments
 (0)