From 60d5349548a06ecd23fe55d818a6e0089b50e1bb Mon Sep 17 00:00:00 2001 From: clouless Date: Fri, 13 Apr 2018 17:45:23 +0200 Subject: [PATCH 1/5] ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b79884d..efe094b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ .idea target output.xml +.classpath +.project +.settings From c1ee2fb6f8f5e1d5773ab6eb4efd082c2d05724b Mon Sep 17 00:00:00 2001 From: jani Date: Wed, 17 Jul 2019 12:02:41 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2080d71..adc7389 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # java-junit-xml-merger -[![](https://codeclou.github.io/doc/badges/generated/test-coverage-100.svg?v2)](https://codeclou.github.io/java-junit-xml-merger/test-coverage/1.0.1/) +[![](https://codeclou.github.io/java-junit-xml-merger/img/github-product-logo-java-merger.png)](https://github.com/codeclou/java-junit-xml-merger) Merges multiple JUnit XML files into a single testsuites XML file. +[![](https://codeclou.github.io/doc/badges/generated/test-coverage-100.svg?v2)](https://codeclou.github.io/java-junit-xml-merger/test-coverage/1.0.1/) +  

From 31e99ca3767de01c174642e656456e1e63b72b10 Mon Sep 17 00:00:00 2001 From: jani Date: Tue, 23 Jul 2019 10:45:30 +0200 Subject: [PATCH 3/5] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index adc7389..d25cdf4 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,13 @@ -# java-junit-xml-merger +# Java JUnit XML Merger -[![](https://codeclou.github.io/java-junit-xml-merger/img/github-product-logo-java-merger.png)](https://github.com/codeclou/java-junit-xml-merger) +> Merges multiple JUnit XML files into a single testsuites XML file. Simply combine your test results from different test runners. -Merges multiple JUnit XML files into a single testsuites XML file. +[![](https://codeclou.github.io/java-junit-xml-merger/img/github-product-logo-java-merger.png)](https://github.com/codeclou/java-junit-xml-merger) [![](https://codeclou.github.io/doc/badges/generated/test-coverage-100.svg?v2)](https://codeclou.github.io/java-junit-xml-merger/test-coverage/1.0.1/)   -

- ----   @@ -65,6 +63,8 @@ java -jar junit-xml-merger.jar \ ### Demo +

+ ``` git clone https://github.com/codeclou/java-junit-xml-merger.git src cd src From d82dade0a89ae65a6f0a27821d80282b1d826511 Mon Sep 17 00:00:00 2001 From: jani Date: Tue, 23 Jul 2019 10:48:16 +0200 Subject: [PATCH 4/5] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index d25cdf4..0b1fe89 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,9 @@ [![](https://codeclou.github.io/java-junit-xml-merger/img/github-product-logo-java-merger.png)](https://github.com/codeclou/java-junit-xml-merger) [![](https://codeclou.github.io/doc/badges/generated/test-coverage-100.svg?v2)](https://codeclou.github.io/java-junit-xml-merger/test-coverage/1.0.1/) +---- -  -----   ### Is this for me? From cf9b66743c2c1b970940df3f70b023d29573847e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 03:20:52 +0000 Subject: [PATCH 5/5] Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b035007..5f5f859 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ junit junit - 4.12 + 4.13.1 test