Skip to content

Commit

Permalink
Replace master branch by main
Browse files Browse the repository at this point in the history
  • Loading branch information
joel-costigliola committed Jun 20, 2020
1 parent 41f546b commit cda5a81
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

AssertJ examples is divided in two : assertions-examples (core, guava and joda assertions) and AssertJ swing modules.

The **master** branch contains examples with the latest released version of AssertJ modules (for Java 8).
The **main** branch contains examples with the latest released version of AssertJ modules (for Java 8).

There are several branches that contain examples for the ongoing development versions of AssertJ modules. That means you have to build the according AssertJ modules by your own before new features compile. The following table contains these special branches that are merged into the master each time the module is released.
There are several branches that contain examples for the ongoing development versions of AssertJ modules. That means you have to build the according AssertJ modules by your own before new features compile. The following table contains these special branches that are merged into the main each time the module is released.

| Branch | Modules |
| ----------------------------- | ------------------------------------------ |
Expand All @@ -17,7 +17,7 @@ There are several branches that contain examples for the ongoing development ver
**assertj-examples/assertions-examples** contains executable AssertJ assertions examples that you can run as JUnit tests.
Please have a look at **[assertions examples sources](assertions-examples/src/test/java/org/assertj/examples)**.

The **master** branch contains examples with the latest released version of AssertJ modules for Java 8, similarly the **java-7** branch contains examples of AssertJ modules for Java 7.
The **main** branch contains examples with the latest released version of AssertJ modules for Java 8, similarly the **java-7** branch contains examples of AssertJ modules for Java 7.
You should be able to build those two branches with `mvn clean install` command.

In your IDE, add `src/test/generated-assertions` to the project java test sources otherwise you will have errors/missing classes.
Expand All @@ -31,7 +31,7 @@ Building **with-latest-snapshot-versions** is a little more complicated :

### AssertJ-Swing examples

The **master** branch contains examples with the latest released version of AssertJ modules => you should be able to build it with mvn clean install command.
The **main** branch contains examples with the latest released version of AssertJ modules => you should be able to build it with mvn clean install command.

**assertj-swing-aut** contains the AUT (application under test) that is tested by the examples.

Expand All @@ -45,8 +45,8 @@ Please have a look at **[swing-testng-examples sources](assertj-swing-testng-exa
## Contributing

Contributing is easy, only two rules to follow :
* Checkout the snapshot branch corresponding to your examples, it should be `with-latest-snapshot-versions` most of the time (not master!)
* Use **[AssertJ code Eclipse formatting preferences](https://github.com/joel-costigliola/assertj-core/blob/master/src/ide-support/assertj-eclipse-formatter.xml)** (for Idea users, it is possible to import it)
* Checkout the snapshot branch corresponding to your examples, it should be `with-latest-snapshot-versions` most of the time (not main!)
* Use **[AssertJ code Eclipse formatting preferences](https://github.com/joel-costigliola/assertj-core/blob/main/src/ide-support/assertj-eclipse-formatter.xml)** (for Idea users, it is possible to import it)
* Add FUN examples ! ;-)

Thanks !

0 comments on commit cda5a81

Please sign in to comment.