diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d2eed416..99fd996f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/README.md b/README.md index bd5df81a..8cae5fe7 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html index 13be3b38..fede6905 100644 --- a/src/main/javadoc/overview.html +++ b/src/main/javadoc/overview.html @@ -62,16 +62,16 @@

XMLUnit for Java is licensed - under the + under the Apache License, Version 2.0. The legacy jar uses - the three + the three clause BSD license, the same license as XMLUnit for Java 1.x did.

diff --git a/test-resources b/test-resources index a6ee962d..67a7aa5a 160000 --- a/test-resources +++ b/test-resources @@ -1 +1 @@ -Subproject commit a6ee962d8441db799f160e0d43ce96a08f925894 +Subproject commit 67a7aa5ac345fa46bfcb5fc1154ed14807e3f87d diff --git a/xmlunit-legacy/pom.xml b/xmlunit-legacy/pom.xml index 80f76608..859b2a04 100644 --- a/xmlunit-legacy/pom.xml +++ b/xmlunit-legacy/pom.xml @@ -35,7 +35,7 @@ The BSD 3-Clause License - https://github.com/xmlunit/xmlunit/blob/master/xmlunit-legacy/LICENSE.txt + https://github.com/xmlunit/xmlunit/blob/main/xmlunit-legacy/LICENSE.txt repo