Merge modular branch

.gitignore

@@ -1,6 +1,6 @@
 /results_*
 /*.src.rpm
-/junit5-r*/
+
 /r5.0.0.tar.gz
 /junit-platform-commons-1.0.0.pom
 /junit-platform-console-1.0.0.pom
@@ -73,6 +73,20 @@
 /junit-jupiter-migrationsupport-5.4.2.pom
 /junit-jupiter-params-5.4.2.pom
 /junit-vintage-engine-5.4.2.pom
+/junit5-5.5.1.tar.gz
+/junit-jupiter-api-5.5.1.pom
+/junit-jupiter-engine-5.5.1.pom
+/junit-jupiter-migrationsupport-5.5.1.pom
+/junit-jupiter-params-5.5.1.pom
+/junit-platform-commons-1.5.1.pom
+/junit-platform-console-1.5.1.pom
+/junit-platform-console-standalone-1.5.1.pom
+/junit-platform-engine-1.5.1.pom
+/junit-platform-launcher-1.5.1.pom
+/junit-platform-reporting-1.5.1.pom
+/junit-platform-runner-1.5.1.pom
+/junit-platform-suite-api-1.5.1.pom
+/junit-vintage-engine-5.5.1.pom
 /junit5-5.5.2.tar.gz
 /junit-jupiter-api-5.5.2.pom
 /junit-jupiter-engine-5.5.2.pom
@@ -87,6 +101,8 @@
 /junit-platform-runner-1.5.2.pom
 /junit-platform-suite-api-1.5.2.pom
 /junit-vintage-engine-5.5.2.pom
+/junit-jupiter-5.5.2.pom
+/junit5-5.6.0.tar.gz
 /junit-bom-5.6.0.pom
 /junit-jupiter-api-5.6.0.pom
 /junit-jupiter-engine-5.6.0.pom
@@ -101,7 +117,8 @@
 /junit-platform-runner-1.6.0.pom
 /junit-platform-suite-api-1.6.0.pom
 /junit-vintage-engine-5.6.0.pom
-/junit5-5.6.0.tar.gz
+/junit-jupiter-5.6.0.pom
+/junit5-5.6.2.tar.gz
 /junit-bom-5.6.2.pom
 /junit-jupiter-5.6.2.pom
 /junit-jupiter-api-5.6.2.pom
@@ -116,16 +133,14 @@
 /junit-platform-reporting-1.6.2.pom
 /junit-platform-runner-1.6.2.pom
 /junit-platform-suite-api-1.6.2.pom
-/junit-platform-testkit-1.6.2.pom
 /junit-vintage-engine-5.6.2.pom
-/junit5-5.6.2.tar.gz
+/junit5-5.7.0.tar.gz
 /junit-bom-5.7.0.pom
 /junit-jupiter-5.7.0.pom
 /junit-jupiter-api-5.7.0.pom
 /junit-jupiter-engine-5.7.0.pom
 /junit-jupiter-migrationsupport-5.7.0.pom
 /junit-jupiter-params-5.7.0.pom
-/junit-vintage-engine-5.7.0.pom
 /junit-platform-commons-1.7.0.pom
 /junit-platform-console-1.7.0.pom
 /junit-platform-console-standalone-1.7.0.pom
@@ -134,8 +149,8 @@
 /junit-platform-reporting-1.7.0.pom
 /junit-platform-runner-1.7.0.pom
 /junit-platform-suite-api-1.7.0.pom
-/junit-platform-testkit-1.7.0.pom
+/junit-vintage-engine-5.7.0.pom
-/junit5-5.7.0.tar.gz
+/junit5-5.7.1.tar.gz
 /junit-bom-5.7.1.pom
 /junit-jupiter-5.7.1.pom
 /junit-jupiter-api-5.7.1.pom
@@ -150,6 +165,4 @@
 /junit-platform-reporting-1.7.1.pom
 /junit-platform-runner-1.7.1.pom
 /junit-platform-suite-api-1.7.1.pom
-/junit-platform-testkit-1.7.1.pom
 /junit-vintage-engine-5.7.1.pom
-/junit5-5.7.1.tar.gz

junit5.spec

@@ -1,18 +1,16 @@
+%bcond_with bootstrap
+
 # Component versions, taken from gradle.properties
 %global platform_version 1.%(v=%{version}; echo ${v:2})
 %global jupiter_version %{version}
 %global vintage_version %{version}
 
-# Build with or without the console modules
-# Disabled by default due to missing dep: info.picocli:picocli
-%bcond_with console
-
 Name:           junit5
 Version:        5.7.1
 Release:        1%{?dist}
 Summary:        Java regression testing framework
 License:        EPL-2.0
-URL:            http://junit.org/junit5/
+URL:            https://junit.org/junit5/
 BuildArch:      noarch
 
 Source0:        https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
@@ -30,6 +28,7 @@ Source207:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform
 Source208:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom
 Source209:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform-testkit/%{platform_version}/junit-platform-testkit-%{platform_version}.pom
 # Jupiter POMs
+Source300:      https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/%{jupiter_version}/junit-jupiter-%{jupiter_version}.pom
 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
 Source303:      https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-migrationsupport/%{jupiter_version}/junit-jupiter-migrationsupport-%{jupiter_version}.pom
@@ -37,27 +36,20 @@ Source304:      https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-p
 Source305:      https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/%{jupiter_version}/junit-jupiter-%{jupiter_version}.pom
 # Vintage POM
 Source400:      https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/%{vintage_version}/junit-vintage-engine-%{vintage_version}.pom
-# Bill of Materials POM
+# BOM POM
 Source500:      https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom
 
+BuildRequires:  asciidoc
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.univocity:univocity-parsers)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apiguardian:apiguardian-api)
 BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.opentest4j:opentest4j)
-
-%if %{with console}
-BuildRequires:  mvn(info.picocli:picocli)
-%endif
-
-BuildRequires:  asciidoc
-
-%if %{with console}
-# Explicit requires for javapackages-tools since junit5 script
-# uses /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
 %endif
 
 %description
@@ -90,6 +82,7 @@ cp -p %{SOURCE206} junit-platform-runner/pom.xml
 cp -p %{SOURCE207} junit-platform-suite-api/pom.xml
 cp -p %{SOURCE208} junit-platform-reporting/pom.xml
 cp -p %{SOURCE209} junit-platform-testkit/pom.xml
+cp -p %{SOURCE300} junit-jupiter/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
@@ -108,15 +101,15 @@ for pom in $(find -mindepth 2 -name pom.xml); do
     %pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom
 done
 
+%pom_remove_parent junit-bom
+
 # Add deps which are shaded by upstream and therefore not present in POMs.
 %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
 
-%if %{without console}
 # Disable the console modules
 %pom_disable_module junit-platform-console
 %pom_disable_module junit-platform-console-standalone
-%endif
 
 %mvn_package :aggregator __noinstall
 
@@ -131,14 +124,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %install
 %mvn_install
 
-%if %{with console}
-%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:jopt-simple %{name} true
-%endif
-
 %files -f .mfiles
-%if %{with console}
-%{_bindir}/%{name}
-%endif
 %license LICENSE.md LICENSE-notice.md
 
 %files javadoc -f .mfiles-javadoc
@@ -148,6 +134,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*
 
 %changelog
+* Fri May 14 2021 Marian Koncek <mkoncek@redhat.com> - 5.7.1-1
+- Update to upstream version 5.7.1
+
 * Fri Feb 19 2021 Mat Booth <mat.booth@redhat.com> - 5.7.1-1
 - Update to latest upstream release
 
@@ -157,32 +146,56 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 * Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 5.7.0-1
 - Update to version 5.7.0.
 
+* Mon Sep 21 2020 Marian Koncek <mkoncek@redhat.com> - 5.7.0-1
+- Update to upstream version 5.7.0
+
 * Tue Aug 11 2020 Jerry James <loganjerry@gmail.com> - 5.6.2-4
 - Add org.junit.jupiter:junit-jupiter, org.junit.platform:junit-platform-testkit
 
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
+* Tue Jul 28 2020 Marian Koncek <mkoncek@redhat.com> - 5.6.2-1
+- Update to upstream version 5.6.2
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.6.2-2
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
 * Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 5.6.2-1
 - Update to version 5.6.2.
 
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 5.6.0-1
+- Update to upstream version 5.6.0
+
 * Mon Feb 17 2020 Alexander Scheel <ascheel@redhat.com> - 5.6.0-1
 - Update to version 5.6.0
 
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.5.2-3
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.5.2-2
+- Build and install junit-jupiter aggregator
+
 * Sun Oct 13 2019 Fabio Valentini <decathorpe@gmail.com> - 5.5.2-1
 - Update to version 5.5.2.
 
+* Wed Sep 11 2019 Marian Koncek <mkoncek@redhat.com> - 5.5.2-1
+- Update to upstream version 5.5.2
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Mon Jul 22 2019 Marian Koncek <mkoncek@redhat.com> - 5.5.1-1
+- Update to upstream version 5.5.1
+
 * Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 5.4.2-1
-- Update to version 5.2.4.
+- Update to version 5.4.2
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.4.0-2
+- Mass rebuild for javapackages-tools 201901
 
 * Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 5.4.0-1
 - Update to latest upstream release

sources

@@ -1,3 +1,4 @@
+SHA512 (junit5-5.7.1.tar.gz) = a92e24050f8ff33e75c83027a13f7c2cf71f3dd7b960590f164932f14dfb2b238d1a650d6153543f437b8f69d54148503505681eda636be54c1e2eca2e98f5e8
 SHA512 (junit-bom-5.7.1.pom) = 912d7575efd03ce31a84053f6f6253fc145f79a6035fabf11314bb3f6f284213f740b35ebb427618cdee430dc99e7e0534e1669e38f7ca608f729b4e2873b5fc
 SHA512 (junit-jupiter-5.7.1.pom) = c313c41fd82339a1f2ad195ba5a013fbf1ae6e71b1888209c49bd463c63ce7adb85c86c5470080027dd6f9578ffc7ee0a6a520e67b5b0df3028340304843f869
 SHA512 (junit-jupiter-api-5.7.1.pom) = 33d4c586326a34e2893609b3457b069d3e97f2f45b7af904eebb1e07cd955d00c913b9c0860d9210f72ef5edf5013ced29a4a28323eabcd34f14cf2682410b9c
@@ -14,4 +15,3 @@ SHA512 (junit-platform-runner-1.7.1.pom) = bae0b11bc780b91c5c6d8033dc28978d3576a
 SHA512 (junit-platform-suite-api-1.7.1.pom) = 0f9c3c69b96adc8132c07216badac1dc2425cc39f3a666b13eae97012dc9818b2dff89f0f529cbd9e7c07469f54550cc7a8cf8ff250b884f93ab6e8017776604
 SHA512 (junit-platform-testkit-1.7.1.pom) = 1dad3b10d62cd99276fe97cdc9b1293640818f5da872421edc3d06880956f79b2145dfff18722655f7bfdc7899fe65f3c0a7986ded7335d00c54ce75b42ec83b
 SHA512 (junit-vintage-engine-5.7.1.pom) = 738d3877fc4654b8a5833c1176bb447f7cad8061774967801c2424f2c46727ea5ea1d02102ea154a298427eb62f17e49b374e5d0a5d8a7d054b42bf763a77fc0
-SHA512 (junit5-5.7.1.tar.gz) = a92e24050f8ff33e75c83027a13f7c2cf71f3dd7b960590f164932f14dfb2b238d1a650d6153543f437b8f69d54148503505681eda636be54c1e2eca2e98f5e8