diff --git a/.gitignore b/.gitignore
index 7474ba7..d6a8c88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,17 @@
/junit-platform-suite-api-1.3.1.pom
/junit-platform-surefire-provider-1.3.1.pom
/junit-vintage-engine-5.3.1.pom
+/junit5-5.4.0.tar.gz
+/junit-jupiter-api-5.4.0.pom
+/junit-jupiter-engine-5.4.0.pom
+/junit-jupiter-migrationsupport-5.4.0.pom
+/junit-jupiter-params-5.4.0.pom
+/junit-platform-commons-1.4.0.pom
+/junit-platform-console-1.4.0.pom
+/junit-platform-console-standalone-1.4.0.pom
+/junit-platform-engine-1.4.0.pom
+/junit-platform-launcher-1.4.0.pom
+/junit-platform-runner-1.4.0.pom
+/junit-platform-suite-api-1.4.0.pom
+/junit-vintage-engine-5.4.0.pom
+/junit-platform-reporting-1.4.0.pom
diff --git a/aggregator.pom b/aggregator.pom
index 0df513e..3129653 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -10,9 +10,9 @@
junit-platform-console-standalone
junit-platform-engine
junit-platform-launcher
+ junit-platform-reporting
junit-platform-runner
junit-platform-suite-api
- junit-platform-surefire-provider
junit-jupiter-api
junit-jupiter-engine
junit-jupiter-migrationsupport
diff --git a/junit5.spec b/junit5.spec
index b0b73d2..3f85184 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -8,15 +8,14 @@
%bcond_with console
Name: junit5
-Version: 5.3.1
-Release: 2%{?dist}
+Version: 5.4.0
+Release: 1%{?dist}
Summary: Java regression testing framework
-# junit-platform-surefire-provider is under ASL 2.0, all other modules use EPL-2.0 (see LICENSE.md)
-License: EPL-2.0 and ASL 2.0
+License: EPL-2.0
URL: http://junit.org/junit5/
BuildArch: noarch
-Source0: https://github.com/junit-team/junit5/archive/r%{version}.tar.gz
+Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
# Aggregator POM (used for packaging only)
Source100: aggregator.pom
@@ -28,7 +27,7 @@ Source203: https://repo1.maven.org/maven2/org/junit/platform/junit-platform
Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/%{platform_version}/junit-platform-launcher-%{platform_version}.pom
Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-runner/%{platform_version}/junit-platform-runner-%{platform_version}.pom
Source207: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/%{platform_version}/junit-platform-suite-api-%{platform_version}.pom
-Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-surefire-provider/%{platform_version}/junit-platform-surefire-provider-%{platform_version}.pom
+Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom
# Jupiter POMs
Source301: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/%{jupiter_version}/junit-jupiter-api-%{jupiter_version}.pom
Source302: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/%{jupiter_version}/junit-jupiter-engine-%{jupiter_version}.pom
@@ -41,8 +40,6 @@ BuildRequires: maven-local
BuildRequires: mvn(com.univocity:univocity-parsers)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.surefire:common-java5)
-BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
BuildRequires: mvn(org.apiguardian:apiguardian-api)
BuildRequires: mvn(org.opentest4j:opentest4j)
@@ -78,9 +75,6 @@ JUnit 5 User Guide.
%setup -q -n %{name}-r%{version}
find -name \*.jar -delete
-cp -p junit-jupiter-api/LICENSE.md LICENSE-Eclipse.md
-cp -p junit-platform-surefire-provider/LICENSE.md LICENSE-Apache.md
-
cp -p %{SOURCE100} pom.xml
cp -p %{SOURCE200} junit-platform-commons/pom.xml
cp -p %{SOURCE201} junit-platform-console/pom.xml
@@ -89,7 +83,7 @@ cp -p %{SOURCE203} junit-platform-engine/pom.xml
cp -p %{SOURCE205} junit-platform-launcher/pom.xml
cp -p %{SOURCE206} junit-platform-runner/pom.xml
cp -p %{SOURCE207} junit-platform-suite-api/pom.xml
-cp -p %{SOURCE208} junit-platform-surefire-provider/pom.xml
+cp -p %{SOURCE208} junit-platform-reporting/pom.xml
cp -p %{SOURCE301} junit-jupiter-api/pom.xml
cp -p %{SOURCE302} junit-jupiter-engine/pom.xml
cp -p %{SOURCE303} junit-jupiter-migrationsupport/pom.xml
@@ -110,9 +104,6 @@ done
%pom_add_dep net.sf.jopt-simple:jopt-simple:5.0.4 junit-platform-console
%pom_add_dep com.univocity:univocity-parsers:2.5.4 junit-jupiter-params
-# Incorrect scope - whoever needs Surefire provider will have to depend on Surefire.
-%pom_xpath_set "pom:dependency[pom:groupId='org.apache.maven.surefire']/pom:scope" provided junit-platform-surefire-provider
-
# Incorrect scope - Junit4 is needed for compilation too, not only runtime.
%pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine
@@ -143,15 +134,20 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
%if %{with console}
%{_bindir}/%{name}
%endif
-%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
+%license LICENSE.md LICENSE-notice.md
%files javadoc -f .mfiles-javadoc
-%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
+%license LICENSE.md LICENSE-notice.md
%files guide
%doc documentation/src/docs/*
%changelog
+* Wed Mar 06 2019 Mat Booth - 5.4.0-1
+- Update to latest upstream release
+- License switched to EPL only now the surefire provider was moved to the
+ Apache Surefire project
+
* Fri Feb 01 2019 Fedora Release Engineering - 5.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 9002fca..64801bb 100644
--- a/sources
+++ b/sources
@@ -1,14 +1,14 @@
-SHA512 (r5.3.1.tar.gz) = f81c140b7e8d8d4349929794e9467875592be2f5a5037dbdabe487c6dfa30063f12e09cef608679fba900702140708dcbd6b6dc7e5fd92b8afe7a785e821a7d8
-SHA512 (junit-jupiter-api-5.3.1.pom) = 85859b67143971f45877be7daf3d98c0b89bbe2b35c69fafe4c680cc7bb018f453c5e1c58adf7fb72b9bb62741596844b66c688575ff9f474761c702f9743724
-SHA512 (junit-jupiter-engine-5.3.1.pom) = dc6d708c8fc1e8298976c2387cfbbc49beb0ce78d490eb76eaaf796556029f8480aef3e012aeab9eba2972359fbd0cf72c3f92ef476bfe7b0578aea8d1a167d2
-SHA512 (junit-jupiter-migrationsupport-5.3.1.pom) = d0db14030ab618d62920cb1c24413d4f28bbf4123f8b5bbe3c7b010237b9d7fe7d15d96e4cc8fa22c214333b8c582ecab17440204de7ac635b92f1283faecbe3
-SHA512 (junit-jupiter-params-5.3.1.pom) = ef839733ddebb129f4fb6b2428d122ea6d8705832565657277f6c9306a7794b6ccd32ca5387e033337d0de73f3c6878bcb86f949a433bf908c285774f45023be
-SHA512 (junit-platform-commons-1.3.1.pom) = 171ef32b964d39ad52597a2e7150b6502c28794e94187d6c97ee5ed50d19440f349b04b9dc6583c05d600155ef2dd0832736e6183bc371fe186a09139da2e3dd
-SHA512 (junit-platform-console-1.3.1.pom) = 17ae1e00dc6101aded315998bae2106ed9f970a9662096a06cd33bf2c331bd3d56d45d3195afc08c4b2c4481a9839f5fc6b81a1e86bb4b2ef5de337474fbc0b6
-SHA512 (junit-platform-console-standalone-1.3.1.pom) = 6eb5d7dffb8c7b60187af95c8791eb83648c16cbbe57eb02878f9e7fc5624d78c3bfed3eb322c12c4b207c5d4aba87d596ff2382c8836d98f8eba9c849254308
-SHA512 (junit-platform-engine-1.3.1.pom) = 581f925fd7631d5c3636461d6c1f2ccb828c2f0d4864364824b7773a507db94dee78502822e43108d2232927e07bb75c2ea93732b44ee466aef124c95ccb8382
-SHA512 (junit-platform-launcher-1.3.1.pom) = 210f6b6d4eb9dff85434ca3a893d40d8b2eb8a8a7380908a88ef11f5e6a260c29f74512871b108a4b0b6082cd3222a8ab15a576613e2126598dd6c5ef9253cdd
-SHA512 (junit-platform-runner-1.3.1.pom) = 6147e2fb5090ab584a69c9e61792031d4485d7ae748062cd11ff796114fc8c140d831603e30649583c73dfb0684fecbb747fc2e202d6b80a7d73a1a551088a11
-SHA512 (junit-platform-suite-api-1.3.1.pom) = 16bc38472e247d71976e33c09eb1f54e591067513ee284a6cc4fed2b766452958dfed699515a5e591904fe90b8ef5f63caceda3bc231aea9d0e263a7b7897493
-SHA512 (junit-platform-surefire-provider-1.3.1.pom) = a5d83337ffb50ce265bf0f20ad688ee5e97de703ed41b9ca686c0521cd48e5cc375a525f1cfafadcd303f1976a7e4e09305aa15aab8f9ce0f1577eba5f5d123a
-SHA512 (junit-vintage-engine-5.3.1.pom) = c0b18b55fafac9a46bb0e6a7c9af71fcd86d3badd5d96a6d3bdb423d6e0e78bc4171958d050ff4550348262c6959a5a3314d29cacb9e74e85ac39c0202104ec5
+SHA512 (junit5-5.4.0.tar.gz) = 6d5b176750d4e5785a5f7657510badccc4cc09b40040510dea0b34422d4729a530855f7f698cff6261e202480848a6cc2d997eb557267ebb1d0b5a2ad42cbc01
+SHA512 (junit-jupiter-api-5.4.0.pom) = 7f7e0a34af3d2e8b702870591b38819319ad261d2bd72aedcc9b67b6cdbe7a7269395a61e37ff066a88534f7fc40d8138ff571536701389856d214a92e8ce5cd
+SHA512 (junit-jupiter-engine-5.4.0.pom) = 8dbfc8f218f52d42148643016defe505862a3d5405024269c2922a3c69c7b646ba305c14758acf46f77102145fcd4b12055c655da7289fafc38f1bc569316aeb
+SHA512 (junit-jupiter-migrationsupport-5.4.0.pom) = efd89818ea21e0f2d284f4a36b6db781b7d34dee40432943ab042c9d1e4424022110df62a4c2402deadb8975804dea19f43453aef7c25f81fb6efff969edefa0
+SHA512 (junit-jupiter-params-5.4.0.pom) = c188fb6c7f6db323059eb53044b562ea19f4ce85bf7138b2212b74eee7148ad3881d37b643a6189e4cf954150f4b7bbc515678a57247315d2e7adb3df5457754
+SHA512 (junit-platform-commons-1.4.0.pom) = e5dcf69d495528b07ac5b7fad20b1273685a6cc6e69ba5748a0e104be8db5829b50302bbd9fe77b78ee57e7d90d03e1d54850ba12d4bc9fbed4129edf9c0f8e7
+SHA512 (junit-platform-console-1.4.0.pom) = 1f5507cf5ff5da740b38e52b57673567302acc03a784b7271534870c41d191d686622e4a2b6864998315ab84d6f4faaf9648c2092e2eabd81f82dacb6d690213
+SHA512 (junit-platform-console-standalone-1.4.0.pom) = 27a3f92d96adc3037077b958faf4935b867fe0a4cd607f2c704b17e5dbcc9117c7197a2843b0fdd1e07709b7b84c8bc8ded7cf310407157bad6063897db0b1ce
+SHA512 (junit-platform-engine-1.4.0.pom) = bc098266fb62107f3965b321a75461d73c088a351138244f13a989f85bea69b8129420a98ccffeef8dc946e44071e7d59608ffe67f326cafe72df2285f0b0836
+SHA512 (junit-platform-launcher-1.4.0.pom) = d68adc7077836be0d9027aa2de0641a8a8a9ea4d16adc39a758fa454b3e1bbbdad08442f475e4e17412a1bb821a41f270862ad03f4f66fc1714efbdad3f3e506
+SHA512 (junit-platform-reporting-1.4.0.pom) = 33a52174f019e45a2ef3a0d9f80d398b232e226e4b768754c00170b1f6414882290776f03eee099e270b2e88a926763b3c7e0dcf707c0e3c02b2820195a78022
+SHA512 (junit-platform-runner-1.4.0.pom) = 22bc2601cc246dedc19939cad0207abd0ef1cccff589852395548d112b98314926efbb49439afa31978e73ac281e09d0beb96e8ede2716992578e8d973bce97a
+SHA512 (junit-platform-suite-api-1.4.0.pom) = d8bdf812f4ece734a2bf662916a3a1071762584ac7ca0fe9a343572137b5340697c3926e011c7c2fd5a73ad11e8c16e3abd1e662c1ce12833c577a1afbc05222
+SHA512 (junit-vintage-engine-5.4.0.pom) = 6b320b5b27c977b5ed84448059142dbcff5fd0c6c5cc89a6cd2e0680536e19241766b8aca8afb98808d7524062472bb369db96644126f9ab97d3d95348a79cb3