Skip to content

Commit

Permalink
Replace "master" with "main"
Browse files Browse the repository at this point in the history
  • Loading branch information
marcphilipp committed Jun 21, 2020
1 parent 50a285d commit bef3bca
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install:
stages:
- test
- name: deploy
if: (branch = master) AND (NOT type IN (pull_request))
if: (branch = main) AND (NOT type IN (pull_request))

jobs:
include:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We love pull requests. Here is a quick guide:

1. You need to have Maven and a JDK (at least version 1.5) installed.
2. [Fork the repo](https://help.github.com/articles/fork-a-repo).
3. [Create a new branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) from master.
3. [Create a new branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) from `main`.
4. Ensure that you have a clean state by running `./mvnw verify`.
5. Add your change together with a test (tests are not needed for refactorings and documentation changes).
6. Format your code: Import the JUnit project in Eclipse and use its formatter or apply the rules in the `CODING_STYLE` file manually. Only format the code you've changed; reformatting unrelated code makes it harder for us to review your changes.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ For more information, please visit:
* [Download and Install guide](https://github.com/junit-team/junit4/wiki/Download-and-Install)
* [Getting Started](https://github.com/junit-team/junit4/wiki/Getting-started)

[![Build Status](https://travis-ci.org/junit-team/junit4.svg?branch=master)](https://travis-ci.org/junit-team/junit4)
[![Build Status](https://travis-ci.org/junit-team/junit4.svg?branch=main)](https://travis-ci.org/junit-team/junit4)
2 changes: 1 addition & 1 deletion doc/ReleaseNotes4.13.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ then it throws an `IllegalArgumentException` instead of returning an already exi
### [Pull request #1335](https://github.com/junit-team/junit4/pull/1335): Fix ExternalResource: the test failure could be lost
When both the test failed and closing the resource failed, only the exception coming from the `after()` method was propagated, as per semantics of the try-finally (see also http://docs.oracle.com/javase/specs/jls/se8/html/jls-14.html#jls-14.20.2).

The new behavior is compatible with @After method semantics, as implemented in [RunAfters](https://github.com/junit-team/junit4/blob/master/src/main/java/org/junit/internal/runners/statements/RunAfters.java).
The new behavior is compatible with @After method semantics, as implemented in [RunAfters](https://github.com/junit-team/junit4/blob/HEAD/src/main/java/org/junit/internal/runners/statements/RunAfters.java).

### [Pull request #1435](https://github.com/junit-team/junit4/pull/1435): @BeforeParam/@AfterParam method annotations for Parameterized tests.
This allows having preparation and/or cleanup in tests for specific parameter values.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<scm>
<connection>scm:git:git://github.com/junit-team/junit4.git</connection>
<developerConnection>scm:git:[email protected]:junit-team/junit4.git</developerConnection>
<url>http://github.com/junit-team/junit4/tree/master</url>
<url>https://github.com/junit-team/junit4</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
Expand Down
6 changes: 3 additions & 3 deletions src/site/fml/faq.fml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<question>Where do I get the latest version of this
FAQ?</question>
<answer>
<p>The master copy of this FAQ is available
<p>The latest copy of this FAQ is available
at

<a href="http://junit.sourceforge.net/doc/faq/faq.htm">
http://junit.sourceforge.net/doc/faq/faq.htm</a>.</p>
<a href="https://junit.org/junit4/faq.html">
https://junit.org/junit4/faq.html</a>.</p>
<p>The JUnit distribution also includes this FAQ in
the

Expand Down
14 changes: 7 additions & 7 deletions src/site/xdoc/index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@
<li><a href="https://github.com/junit-team/junit4/wiki/Getting-started">Getting started</a></li>
<li>Release Notes
<ul>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.13.md">4.13</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md">4.12</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.11.md">4.11</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.10.md">4.10</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.9.1.md">4.9.1</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.9.md">4.9</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.13.md">4.13</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.12.md">4.12</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.11.md">4.11</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.10.md">4.10</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.9.1.md">4.9.1</a></li>
<li><a href="https://github.com/junit-team/junit4/blob/HEAD/doc/ReleaseNotes4.9.md">4.9</a></li>
</ul>
</li>
<li><a href="https://github.com/junit-team/junit4/wiki/Maintainer-documentation">Maintainer Documentation</a></li>
Expand Down Expand Up @@ -137,7 +137,7 @@
<li>
<a href="https://github.com/MichaelTamm/junit-toolbox">JUnit Toolbox</a> - Provides runners for parallel testing, a <code>PoolingWait</code> class to ease asynchronous testing, and a <code>WildcardPatternSuite</code> which allow you to specify wildcard patterns instead of explicitly listing all classes when you create a suite class.</li>
<li>
<a href="https://github.com/pholser/junit-quickcheck">junit-quickcheck</a> - QuickCheck-style parameter suppliers for JUnit theories. Uses <a href="https://github.com/junit-team/junit.contrib/tree/master/theories">junit.contrib's version of the theories machinery</a>, which respects generics on theory parameters.</li> </ul>
<a href="https://github.com/pholser/junit-quickcheck">junit-quickcheck</a> - QuickCheck-style parameter suppliers for JUnit theories. Uses <a href="https://github.com/junit-team/junit.contrib/tree/HEAD/theories">junit.contrib's version of the theories machinery</a>, which respects generics on theory parameters.</li> </ul>
</div>
</div>
</div>
Expand Down

0 comments on commit bef3bca

Please sign in to comment.