Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
Closes gh-368
  • Loading branch information
sdeleuze committed Apr 2, 2021
1 parent 6ccf3c4 commit a0162bb
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.adoc
Expand Up @@ -36,7 +36,7 @@ If you want to build the project, install the artifacts in the local Maven repos

Here is the semi-automated release process (to be improved) with `O.x` being the version to release and `0.y` the new version:

* Warn on Slack that the release process starts and that no commit is allowed on `master`.
* Warn on Slack that the release process starts and that no commit is allowed on `main`.
* Check https://ci.spring.io/teams/spring-fu/pipelines/spring-fu[the CI] is green.
* Replace in the `build.gradle.kts` and `pom.xml` `0.x-SNAPSHOT` by `0.x`
* Set `:spring-fu-version: 0.x` in `jafu/README.adoc` and `kofu/README.adoc`
Expand All @@ -45,7 +45,7 @@ Here is the semi-automated release process (to be improved) with `O.x` being the
* `git push`
* `git push --tags`
* Wait the green build on https://ci.spring.io/teams/spring-fu/pipelines/spring-fu[the CI].
* Check the JaFu documentation badge link on https://github.com/spring-projects-experimental/spring-fu/tree/master/jafu and the koFu one on https://github.com/spring-projects-experimental/spring-fu/tree/master/kofu
* Check the JaFu documentation badge link on https://github.com/spring-projects-experimental/spring-fu/tree/main/jafu and the koFu one on https://github.com/spring-projects-experimental/spring-fu/tree/main/kofu
* https://github.com/spring-projects-experimental/spring-fu/milestones[Close the milestone]
* Publish a https://github.com/spring-projects-experimental/spring-fu/releases/new[new release]:
** Tag: `v0.x`
Expand All @@ -55,7 +55,7 @@ Here is the semi-automated release process (to be improved) with `O.x` being the
* Replace in the `build.gradle.kts` and `pom.xml` `0.x` by `0.y-SNAPSHOT`
* `git commit -a -m "Switch to 0.y-SNAPSHOT"`
* `git push`
* Warn on Slack that the release process is finished and that commits are allowed on `master` again.
* Warn on Slack that the release process is finished and that commits are allowed on `main` again.
* Announce the release (Slack, Twitter, potentially blog post)

=== Contributor License Agreement
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
@@ -1,7 +1,7 @@
image:https://ci.spring.io/api/v1/teams/spring-fu/pipelines/spring-fu/badge["Build Status", link="https://ci.spring.io/teams/spring-fu/pipelines/spring-fu"]

Spring Fu is an incubator for https://github.com/spring-projects-experimental/spring-fu/tree/master/jafu[JaFu] (Java DSL)
and https://github.com/spring-projects-experimental/spring-fu/tree/master/kofu[KoFu] (Kotlin DSL) designed to configure
Spring Fu is an incubator for https://github.com/spring-projects-experimental/spring-fu/tree/main/jafu[JaFu] (Java DSL)
and https://github.com/spring-projects-experimental/spring-fu/tree/main/kofu[KoFu] (Kotlin DSL) designed to configure
Spring Boot explicitly with code in a declarative way with great discoverability thanks to auto-complete.
It provides fast startup (40% faster than regular auto-configuration on a minimal Spring MVC app), low memory consumption
and is a good fit with https://www.graalvm.org/docs/reference-manual/native-image/[GraalVM native] thanks to its (almost) reflection-less approach.
Expand Down
2 changes: 1 addition & 1 deletion ci/pipeline.yml
Expand Up @@ -3,7 +3,7 @@ resources:
type: git
source:
uri: https://github.com/spring-projects/spring-fu
branch: master
branch: main
jobs:
- name: build
public: true
Expand Down
4 changes: 2 additions & 2 deletions jafu/README.adoc
Expand Up @@ -7,7 +7,7 @@ image:https://img.shields.io/badge/JaFu%20documentation-blue.svg["JaFu documenta

JaFu (for **Ja**va and **Fu**nctional) is an alternative way of configuring explicitly your Spring Boot application,
different from regular auto-configuration, using a Java DSL. It is based on Spring Boot infrastructure, but
https://github.com/spring-projects/spring-fu/tree/master/autoconfigure-adapter[used via functional bean definitions]
https://github.com/spring-projects/spring-fu/tree/main/autoconfigure-adapter[used via functional bean definitions]
instead of JavaConfig.

=== API reference
Expand Down Expand Up @@ -55,7 +55,7 @@ public class Application {

```

See also sample projects https://github.com/spring-projects/spring-fu/tree/master/samples[here].
See also sample projects https://github.com/spring-projects/spring-fu/tree/main/samples[here].

=== Differences with regular Boot applications

Expand Down
4 changes: 2 additions & 2 deletions kofu/README.adoc
Expand Up @@ -7,7 +7,7 @@ image:https://img.shields.io/badge/KoFu%20documentation-blue.svg["KoFu documenta

KoFu (for **Ko**tlin and **Fu**nctional) is an alternative way of configuring explicitly your Spring Boot application,
different from regular auto-configuration, using a Kotlin DSL. It is based on Spring Boot infrastructure, but
https://github.com/spring-projects/spring-fu/tree/master/autoconfigure-adapter[used via functional bean definitions]
https://github.com/spring-projects/spring-fu/tree/main/autoconfigure-adapter[used via functional bean definitions]
instead of JavaConfig.

It leverages other Spring Kotlin DSLs available in Spring like:
Expand Down Expand Up @@ -92,7 +92,7 @@ fun main() {
}
```

See also sample projects https://github.com/spring-projects/spring-fu/tree/master/samples[here].
See also sample projects https://github.com/spring-projects/spring-fu/tree/main/samples[here].

You can now also benefits of
https://docs.spring.io/spring/docs/5.2.x/spring-framework-reference/[Spring Framework reference documentation]
Expand Down
24 changes: 12 additions & 12 deletions samples/README.adoc
Expand Up @@ -2,80 +2,80 @@

=== jafu-reactive-minimal

https://github.com/spring-projects/spring-fu/tree/master/samples/jafu-reactive-minimal[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/jafu-reactive-minimal[Browse source]

This is a sample project for a Spring Boot Reactive web application with Jafu configuration which provides a
`http://localhost:8080/` endpoint that displays "Hello world!" and an `http://localhost:8080/api` with a JSON
endpoint.

=== jafu-reactive-r2dbc

https://github.com/spring-projects/spring-fu/tree/master/samples/jafu-reactive-r2dbc[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/jafu-reactive-r2dbc[Browse source]

This is a sample project for a Spring Boot Reactive web application with Jafu configuration and a R2DBC backend.

=== jafu-servlet-minimal

https://github.com/spring-projects/spring-fu/tree/master/samples/jafu-servlet-minimal[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/jafu-servlet-minimal[Browse source]

This is a sample project for a Spring Boot web application based on WebMvc.fn (functional variant of Spring MVC) with Kofu configuration which provides a
`http://localhost:8080/` endpoint that displays "Hello world!" and an `http://localhost:8080/api` with a JSON
endpoint.

=== kofu-reactive-minimal

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-reactive-minimal[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-reactive-minimal[Browse source]

This is a sample project for a Spring Boot Reactive web application with Kofu configuration which provides a
`http://localhost:8080/` endpoint that displays "Hello world!" and an `http://localhost:8080/api` with a JSON
endpoint.

=== kofu-reactive-mongodb

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-reactive-mongodb[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-reactive-mongodb[Browse source]

This is a sample project for a Spring Boot Reactive web application with Kofu configuration and a Reactive MongoDB backend.

=== kofu-reactive-r2dbc

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-reactive-r2dbc[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-reactive-r2dbc[Browse source]

This is a sample project for a Spring Boot Reactive web application with Kofu configuration and a R2DBC backend.

=== kofu-reactive-validation

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-reactive-validation[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-reactive-validation[Browse source]

This is a sample project for a Spring Boot Reactive web application with Kofu configuration and validation using https://github.com/making/yavi[YAVI].

=== kofu-coroutines-mongodb

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-coroutines-mongodb[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-coroutines-mongodb[Browse source]

This is a sample project for a Spring Boot Coroutines web application with Kofu configuration and a Reactive MongoDB backend.

=== kofu-coroutines-r2dbc

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-coroutines-r2dbc[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-coroutines-r2dbc[Browse source]

This is a sample project for a Spring Boot Coroutines web application with Kofu configuration and a R2DBC backend.

=== kofu-coroutines-validation

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-coroutines-validation[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-coroutines-validation[Browse source]

This is a sample project for a Spring Boot Coroutines web application with Kofu configuration and validation using https://github.com/making/yavi[YAVI].

=== kofu-servlet-minimal

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-servlet-minimal[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-servlet-minimal[Browse source]

This is a sample project for a Spring Boot web application based on WebMvc.fn (functional variant of Spring MVC) with Kofu configuration which provides a
`http://localhost:8080/` endpoint that displays "Hello world!" and an `http://localhost:8080/api` with a JSON
endpoint.

=== kofu-servlet-validation

https://github.com/spring-projects/spring-fu/tree/master/samples/kofu-servlet-validation[Browse source]
https://github.com/spring-projects/spring-fu/tree/main/samples/kofu-servlet-validation[Browse source]

This is a sample project for a Spring Boot web application based on WebMvc.fn (functional variant of Spring MVC) with Kofu configuration and validation using https://github.com/making/yavi[YAVI].

0 comments on commit a0162bb

Please sign in to comment.