Skip to content

Commit

Permalink
master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
bodewig committed Jul 4, 2020
1 parent c261b72 commit cf0e547
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -26,13 +26,13 @@ Wiki](https://github.com/xmlunit/user-guide/wiki).
Because XMLUnit is developed for Java and .NET, both Projects shares the same test-resources.
The test-resources folder is integrated as git submodule.
This means you need to run 'git submodule update --init' once inside your
working copies after merging github's master branches of xmlunit or
working copies after merging github's main branches of xmlunit or
xmlunit.net.

### Preparing a Pull Request

+ Create a topic branch from where you want to base your work (this is
usually the master branch).
usually the main branch).
+ Make commits of logical units.
+ Respect the original code style:
+ Only use spaces for indentation.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@ XMLUnit for Java 2.x

[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.xmlunit/xmlunit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.xmlunit/xmlunit-core)

[![Build Status XMLUnit 2.x for Java](https://travis-ci.org/xmlunit/xmlunit.svg?branch=master)](https://travis-ci.org/xmlunit/xmlunit) [![Coverage Status](https://coveralls.io/repos/xmlunit/xmlunit/badge.svg)](https://coveralls.io/r/xmlunit/xmlunit)
[![Build Status XMLUnit 2.x for Java](https://travis-ci.org/xmlunit/xmlunit.svg?branch=main)](https://travis-ci.org/xmlunit/xmlunit) [![Coverage Status](https://coveralls.io/repos/xmlunit/xmlunit/badge.svg)](https://coveralls.io/r/xmlunit/xmlunit)

XMLUnit is a library that supports testing XML output in several ways.

Expand Down
6 changes: 3 additions & 3 deletions src/main/javadoc/overview.html
Expand Up @@ -62,16 +62,16 @@
<ul>
<li><a href="https://www.xmlunit.org/">XMLUnit's home page</a></li>
<li><a href="https://github.com/xmlunit/xmlunit">Source Code</a></li>
<li><a href="https://github.com/xmlunit/xmlunit/blob/master/CONTRIBUTING.md">Contributing Guide</a></li>
<li><a href="https://github.com/xmlunit/xmlunit/blob/main/CONTRIBUTING.md">Contributing Guide</a></li>
<li><a href="https://github.com/xmlunit/xmlunit/issues">Reporting Issues</a></li>
<li><a href="https://github.com/xmlunit/user-guide/wiki">User Guide</a></li>
<li><a href="https://github.com/xmlunit/xmlunit/wiki">Developer Wiki</a></li>
</ul>

<p>XMLUnit for Java is licensed
under <a href="https://github.com/xmlunit/xmlunit/blob/master/LICENSE">the
under <a href="https://github.com/xmlunit/xmlunit/blob/main/LICENSE">the
Apache License, Version 2.0</a>. The legacy jar uses
the <a href="https://github.com/xmlunit/xmlunit/blob/master/xmlunit-legacy/LICENSE.txt">three
the <a href="https://github.com/xmlunit/xmlunit/blob/main/xmlunit-legacy/LICENSE.txt">three
clause BSD license</a>, the same license as XMLUnit for Java 1.x
did.</p>
</body>
Expand Down
2 changes: 1 addition & 1 deletion test-resources
2 changes: 1 addition & 1 deletion xmlunit-legacy/pom.xml
Expand Up @@ -35,7 +35,7 @@
<licenses>
<license>
<name>The BSD 3-Clause License</name>
<url>https://github.com/xmlunit/xmlunit/blob/master/xmlunit-legacy/LICENSE.txt</url>
<url>https://github.com/xmlunit/xmlunit/blob/main/xmlunit-legacy/LICENSE.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down

0 comments on commit cf0e547

Please sign in to comment.