Switch default branch to main (#506)

Signed-off-by: Pierangelo Di Pilato <[email protected]>

Author: pierDipi

.github/workflows/branch.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - main
       - 2.[0-9]+
 
 jobs:

.github/workflows/pr.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+      - main
       - 2.[0-9]+
 
 jobs:

CONTRIBUTING.md

@@ -23,7 +23,7 @@ your code. Thanks for getting involved! :rocket:
 * [Getting Started](#getting-started)
 * [Branches](#branches)
 * [Commit Messages](#commit-messages)
-* [Staying current with master](#staying-current-with-master)
+* [Staying current with main](#staying-current-with-main)
 * [Submitting and Updating a Pull Request](#submitting-and-updating-a-pull-request)
 * [Congratulations!](#congratulations)
 
@@ -47,7 +47,7 @@ organized.
 
 ```console
 git fetch upstream
-git reset --hard upstream/master
+git reset --hard upstream/main
 git checkout FETCH_HEAD
 git checkout -b 48-fix-http-agent-error
 ```
@@ -102,19 +102,19 @@ Date:   Thu Feb 2 11:41:15 2018 -0800
 Notice the `Author` and `Signed-off-by` lines match. If they don't your PR will
 be rejected by the automated DCO check.
 
-## Staying Current with `master`
+## Staying Current with `main`
 
-As you are working on your branch, changes may happen on `master`. Before
+As you are working on your branch, changes may happen on `main`. Before
 submitting your pull request, be sure that your branch has been updated
 with the latest commits.
 
 ```console
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 ```
 
 This may cause conflicts if the files you are changing on your branch are
-also changed on master. Error messages from `git` will indicate if conflicts
+also changed on main. Error messages from `git` will indicate if conflicts
 exist and what files need attention. Resolve the conflicts in each file, then
 continue with the rebase with `git rebase --continue`.
 
@@ -131,15 +131,15 @@ git push -f origin 48-fix-http-agent-error
 Before submitting a pull request, you should make sure that all of the tests
 successfully pass.
 
-Once you have sent your pull request, `master` may continue to evolve
-before your pull request has landed. If there are any commits on `master`
+Once you have sent your pull request, `main` may continue to evolve
+before your pull request has landed. If there are any commits on `main`
 that conflict with your changes, you may need to update your branch with
 these changes before the pull request can land. Resolve conflicts the same
 way as before.
 
 ```console
 git fetch upstream
-git rebase upstream/master
+git rebase upstream/main
 # fix any potential conflicts
 git push -f origin 48-fix-http-agent-error
 ```
@@ -156,7 +156,7 @@ for details.
 
 ```console
 git commit -m "fixup: fix typo"
-git rebase -i upstream/master # follow git instructions
+git rebase -i upstream/main # follow git instructions
 ```
 
 Once you have rebased your commits, you can force push to your fork as before.

MAINTAINERS.md

@@ -10,7 +10,7 @@ Currently, active maintainers who may be found in the CNCF Slack.
 
 The release process is automated with Github actions. In order to perform a release:
 
-1. Check if master CI pass.
+1. Check if main CI pass.
 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.
 1. Check the release PR, merge it and cleanup the created branch.
 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
 
 ## Branch Management
 
-The `master` branch is the bleeding edge. New major versions of the module
+The `main` branch is the bleeding edge. New major versions of the module
 are cut from this branch and tagged. If you intend to submit a pull request
-you should use `master HEAD` as your starting point.
+you should use `main HEAD` as your starting point.
 
 Each major release will result in a new branch and tag. For example, the
 release of version 1.0.0 of the module will result in a `v1.0.0` tag on the
 release commit, and a new branch `v1.x.y` for subsequent minor and patch
 level releases of that major version. However, development will continue
-apace on `master` for the next major version - e.g. 2.0.0. Version branches
+apace on `main` for the next major version - e.g. 2.0.0. Version branches
 are only created for each major version. Minor and patch level releases
 are simply tagged.

README.md

@@ -98,13 +98,13 @@ You can check out the examples in the [examples](examples) directory.
 
 Each SDK may have its own unique processes, tooling and guidelines, common
 governance related material can be found in the
-[CloudEvents `community`](https://github.com/cloudevents/spec/tree/master/community)
+[CloudEvents `community`](https://github.com/cloudevents/spec/tree/main/docs)
 directory. In particular, in there you will find information concerning how SDK
 projects are
-[managed](https://github.com/cloudevents/spec/blob/master/community/SDK-GOVERNANCE.md),
-[guidelines](https://github.com/cloudevents/spec/blob/master/community/SDK-maintainer-guidelines.md)
+[managed](https://github.com/cloudevents/spec/blob/main/docs/SDK-GOVERNANCE.md),
+[guidelines](https://github.com/cloudevents/spec/blob/main/docs/SDK-maintainer-guidelines.md)
 for how PR reviews and approval, and our
-[Code of Conduct](https://github.com/cloudevents/spec/blob/master/community/GOVERNANCE.md#additional-information)
+[Code of Conduct](https://github.com/cloudevents/spec/blob/main/docs/GOVERNANCE.md#additional-information)
 information.
 
 [http4k]: https://www.http4k.org/guide/reference/cloud_events/

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

@@ -26,7 +26,7 @@
 /**
  * This extension embeds context from Distributed Tracing so that distributed systems can include traces that span an event-driven system.
  *
- * @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>
+ * @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>
  */
 public final class DistributedTracingExtension implements CloudEventExtension {
 

docs/_config.yml

@@ -11,7 +11,7 @@ search_enabled: true
 gh_edit_link: true
 gh_edit_link_text: "Edit this page on GitHub."
 gh_edit_repository: "https://github.com/cloudevents/sdk-java"
-gh_edit_branch: "master"
+gh_edit_branch: "main"
 gh_edit_source: docs
 gh_edit_view_mode: "tree"
 

docs/amqp-proton.md

@@ -43,5 +43,5 @@ public class ProtonAmqpMessageFactory {
 The example uses the `vertx-proton` integration to send/receive CloudEvent
 messages over AMQP:
 
--   [Vertx AmqpServer](https://github.com/cloudevents/sdk-java/tree/master/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpServer.java)
--   [Vertx AmqpClient](https://github.com/cloudevents/sdk-java/tree/master/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpClient.java)
+-   [Vertx AmqpServer](https://github.com/cloudevents/sdk-java/tree/main/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpServer.java)
+-   [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

@@ -48,6 +48,6 @@ public class HttpMessageFactory {
 
 ## Examples
 
-- [Standard Java HttpServer](https://github.com/cloudevents/sdk-java/tree/master/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/BasicHttpServer.java)
-- [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)
-- [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)
+- [Standard Java HttpServer](https://github.com/cloudevents/sdk-java/tree/main/examples/basic-http/src/main/java/io/cloudevents/examples/http/basic/BasicHttpServer.java)
+- [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)
+- [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

@@ -133,5 +133,5 @@ To migrate to use EE 9+ supported package - replace `cloudevents-http-restful-ws
 
 ## Examples
 
-- [Microprofile and Liberty](https://github.com/cloudevents/sdk-java/tree/master/examples/restful-ws-micropofile-liberty)
+- [Microprofile and Liberty](https://github.com/cloudevents/sdk-java/tree/main/examples/restful-ws-micropofile-liberty)
 

docs/http-jakarta-restful-ws.md

@@ -118,5 +118,5 @@ public class CloudEventSender {
 
 ## Examples
 
-- [Quarkus and Resteasy](https://github.com/cloudevents/sdk-java/tree/master/examples/restful-ws-quarkus)
-- [Jersey and Spring Boot](https://github.com/cloudevents/sdk-java/tree/master/examples/restful-ws-spring-boot)
+- [Quarkus and Resteasy](https://github.com/cloudevents/sdk-java/tree/main/examples/restful-ws-quarkus)
+- [Jersey and Spring Boot](https://github.com/cloudevents/sdk-java/tree/main/examples/restful-ws-spring-boot)

docs/http-vertx.md

@@ -95,4 +95,4 @@ public class CloudEventClientVerticle extends AbstractVerticle {
 
 ## Examples:
 
-- [Vert.x Client and Server](https://github.com/cloudevents/sdk-java/tree/master/examples/vertx)
+- [Vert.x Client and Server](https://github.com/cloudevents/sdk-java/tree/main/examples/vertx)

docs/index.md

@@ -75,7 +75,7 @@ and related interfaces, in order to interoperate with the other components of
 the SDK, check out the [API module documentation](api.md).
 
 You can also check out the
-[**Examples**](https://github.com/cloudevents/sdk-java/tree/master/examples).
+[**Examples**](https://github.com/cloudevents/sdk-java/tree/main/examples).
 
 ## Modules
 
@@ -121,17 +121,17 @@ You can look at the latest published artifacts on
 [HTTP Protocol Binding]: https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md
 [Kafka Protocol Binding]: https://github.com/cloudevents/spec/blob/v1.0/kafka-protocol-binding.md
 [AMQP Protocol Binding]: https://github.com/cloudevents/spec/blob/v1.0/amqp-protocol-binding.md
-[`cloudevents-api`]: https://github.com/cloudevents/sdk-java/tree/master/api
-[`cloudevents-bom`]: https://github.com/cloudevents/sdk-java/tree/master/bom
-[`cloudevents-core`]: https://github.com/cloudevents/sdk-java/tree/master/core
-[`cloudevents-json-jackson`]: https://github.com/cloudevents/sdk-java/tree/master/formats/json-jackson
-[`cloudevents-protobuf`]: https://github.com/cloudevents/sdk-java/tree/master/formats/protobuf
-[`cloudevents-xml`]: https://github.com/cloudevents/sdk-java/tree/master/formats/xml
-[`cloudevents-http-vertx`]: https://github.com/cloudevents/sdk-java/tree/master/http/vertx
-[`cloudevents-http-basic`]: https://github.com/cloudevents/sdk-java/tree/master/http/basic
-[`cloudevents-http-restful-ws`]: https://github.com/cloudevents/sdk-java/tree/master/http/restful-ws
-[`cloudevents-http-restful-ws-jakarta`]: https://github.com/cloudevents/sdk-java/tree/master/http/restful-ws-jakarta
-[`cloudevents-kafka`]: https://github.com/cloudevents/sdk-java/tree/master/kafka
-[`cloudevents-amqp-proton`]: https://github.com/cloudevents/sdk-java/tree/master/amqp
-[`cloudevents-spring`]: https://github.com/cloudevents/sdk-java/tree/master/spring
+[`cloudevents-api`]: https://github.com/cloudevents/sdk-java/tree/main/api
+[`cloudevents-bom`]: https://github.com/cloudevents/sdk-java/tree/main/bom
+[`cloudevents-core`]: https://github.com/cloudevents/sdk-java/tree/main/core
+[`cloudevents-json-jackson`]: https://github.com/cloudevents/sdk-java/tree/main/formats/json-jackson
+[`cloudevents-protobuf`]: https://github.com/cloudevents/sdk-java/tree/main/formats/protobuf
+[`cloudevents-xml`]: https://github.com/cloudevents/sdk-java/tree/main/formats/xml
+[`cloudevents-http-vertx`]: https://github.com/cloudevents/sdk-java/tree/main/http/vertx
+[`cloudevents-http-basic`]: https://github.com/cloudevents/sdk-java/tree/main/http/basic
+[`cloudevents-http-restful-ws`]: https://github.com/cloudevents/sdk-java/tree/main/http/restful-ws
+[`cloudevents-http-restful-ws-jakarta`]: https://github.com/cloudevents/sdk-java/tree/main/http/restful-ws-jakarta
+[`cloudevents-kafka`]: https://github.com/cloudevents/sdk-java/tree/main/kafka
+[`cloudevents-amqp-proton`]: https://github.com/cloudevents/sdk-java/tree/main/amqp
+[`cloudevents-spring`]: https://github.com/cloudevents/sdk-java/tree/main/spring
 [http4k]: https://www.http4k.org/guide/modules/cloud_events/

docs/kafka.md

@@ -10,7 +10,7 @@ nav_order: 5
 Implementation of Kafka Protocol Binding to send and receive CloudEvents.
 
 For Maven based projects, use the following to configure the
-[Kafka Protocol Binding](https://github.com/cloudevents/spec/blob/master/kafka-protocol-binding.md):
+[Kafka Protocol Binding](https://github.com/cloudevents/spec/blob/main/kafka-protocol-binding.md):
 
 ```xml
 
@@ -64,7 +64,7 @@ public class CloudEventProducer {
 You can configure the Encoding and EventFormat to use to emit the event.
 
 Check out the
-[`CloudEventSerializer`](https://github.com/cloudevents/sdk-java/tree/master/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java)
+[`CloudEventSerializer`](https://github.com/cloudevents/sdk-java/tree/main/kafka/src/main/java/io/cloudevents/kafka/CloudEventSerializer.java)
 javadoc for more info.
 
 ### Partition key extension
@@ -81,7 +81,7 @@ producerProps.put(
 
 When using in your producer, this interceptor will pick the `partitionkey`
 extension from the event and will set it as record key, regardless of the input record key.
-Check out the [`PartitionKeyExtensionInterceptor`](https://github.com/cloudevents/sdk-java/tree/master/kafka/src/main/java/io/cloudevents/kafka/PartitionKeyExtensionInterceptor.java)
+Check out the [`PartitionKeyExtensionInterceptor`](https://github.com/cloudevents/sdk-java/tree/main/kafka/src/main/java/io/cloudevents/kafka/PartitionKeyExtensionInterceptor.java)
 javadoc for more info.
 
 ## Consuming CloudEvents

docs/spring.md

@@ -194,12 +194,12 @@ public Mono<CloudEvent> event(@RequestBody Mono<CloudEvent> body) {
 
 Check out the integration tests and samples:
 
--   [spring-reactive](https://github.com/cloudevents/sdk-java/tree/master/examples/spring-reactive)
+-   [spring-reactive](https://github.com/cloudevents/sdk-java/tree/main/examples/spring-reactive)
     shows how to receive and send CloudEvents through HTTP using Spring Boot and
     Webflux.
 
--   [spring-rsocket](https://github.com/cloudevents/sdk-java/tree/master/examples/spring-rsocket)
+-   [spring-rsocket](https://github.com/cloudevents/sdk-java/tree/main/examples/spring-rsocket)
     shows how to receive and send CloudEvents through RSocket using Spring Boot.
 
--   [spring-cloud-function](https://github.com/cloudevents/sdk-java/tree/master/examples/spring-function)
+-   [spring-cloud-function](https://github.com/cloudevents/sdk-java/tree/main/examples/spring-function)
     shows how to consume and process CloudEvents via Spring Cloud Function.

examples/kafka/src/main/java/io/cloudevents/examples/kafka/SampleProducer.java

@@ -43,7 +43,7 @@ public static void main(String[] args) {
 
         // Create an event template to set basic CloudEvent attributes
         CloudEventBuilder eventTemplate = CloudEventBuilder.v1()
-            .withSource(URI.create("https://github.com/cloudevents/sdk-java/tree/master/examples/kafka"))
+            .withSource(URI.create("https://github.com/cloudevents/sdk-java/tree/main/examples/kafka"))
             .withType("producer.example");
 
         for (int i = 0; i < MESSAGE_COUNT; i++) {

examples/vertx/src/main/java/io/cloudevents/examples/vertx/SampleHTTPClient.java

@@ -32,7 +32,7 @@ public static void main(String[] args) {
 
         // Create an event template to set basic CloudEvent attributes.
         CloudEventBuilder eventTemplate = CloudEventBuilder.v1()
-            .withSource(URI.create("https://github.com/cloudevents/sdk-java/tree/master/examples/vertx"))
+            .withSource(URI.create("https://github.com/cloudevents/sdk-java/tree/main/examples/vertx"))
             .withType("vertx.example");
 
         // Send NUM_EVENTS events.

formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java

@@ -233,7 +233,7 @@ private boolean shouldSkipExtensionName(String extensionName) {
          *
          * @param name the extension name
          * @return true if extension name is valid, false otherwise
-         * @see <a href="https://github.com/cloudevents/spec/blob/master/spec.md#attribute-naming-convention">attribute-naming-convention</a>
+         * @see <a href="https://github.com/cloudevents/spec/blob/main/spec.md#attribute-naming-convention">attribute-naming-convention</a>
          */
         private boolean isValidExtensionName(String name) {
             for (int i = 0; i < name.length(); i++) {

http/restful-ws-jakarta/README.md

@@ -4,4 +4,4 @@ Javadocs: [![Javadocs](http://www.javadoc.io/badge/io.cloudevents/cloudevents-ht
 
 Documentation: https://cloudevents.github.io/sdk-java/http-jakarta-restful-ws
 
-The code for this package lies within the [restful-ws](https://github.com/cloudevents/sdk-java/tree/master/http/restful-ws) directory and is copied within here and has `javax.` replaced with `jakarta.`
+The code for this package lies within the [restful-ws](https://github.com/cloudevents/sdk-java/tree/main/http/restful-ws) directory and is copied within here and has `javax.` replaced with `jakarta.`

kafka/src/main/java/io/cloudevents/kafka/PartitionKeyExtensionInterceptor.java

@@ -9,7 +9,7 @@
 
 /**
  * This {@link ProducerInterceptor} implements the partitioning extension,
- * as described in the <a href="https://github.com/cloudevents/spec/blob/master/kafka-protocol-binding.md#31-key-mapping">CloudEvents Kafka specification</a>.
+ * as described in the <a href="https://github.com/cloudevents/spec/blob/main/kafka-protocol-binding.md#31-key-mapping">CloudEvents Kafka specification</a>.
  * <p>
  * When using in your {@link org.apache.kafka.clients.producer.KafkaProducer},
  * it will pick the {@code partitionkey} extension from the event and will set it as record key.