From 7f2b9777fccd3dc659a5858d98820c957891f890 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Apr 22 2022 00:52:17 +0000
Subject: Update to upstream version 5.8.2


---

diff --git a/.gitignore b/.gitignore
index e2fb525..f2b08c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,21 @@
 /junit-platform-runner-1.7.1.pom
 /junit-platform-suite-api-1.7.1.pom
 /junit-vintage-engine-5.7.1.pom
+/junit5-5.8.2.tar.gz
+/junit-platform-commons-1.8.2.pom
+/junit-platform-console-1.8.2.pom
+/junit-platform-console-standalone-1.8.2.pom
+/junit-platform-engine-1.8.2.pom
+/junit-platform-launcher-1.8.2.pom
+/junit-platform-runner-1.8.2.pom
+/junit-platform-suite-api-1.8.2.pom
+/junit-platform-reporting-1.8.2.pom
+/junit-platform-testkit-1.8.2.pom
+/junit-jupiter-5.8.2.pom
+/junit-jupiter-api-5.8.2.pom
+/junit-jupiter-engine-5.8.2.pom
+/junit-jupiter-migrationsupport-5.8.2.pom
+/junit-jupiter-params-5.8.2.pom
+/junit-vintage-engine-5.8.2.pom
+/junit-bom-5.8.2.pom
+/junit-platform-suite-commons-1.8.2.pom
diff --git a/aggregator.pom b/aggregator.pom
index e1445e1..3d1e71a 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -15,6 +15,7 @@
     <module>junit-platform-runner</module>
     <module>junit-platform-suite-api</module>
     <module>junit-platform-testkit</module>
+    <module>junit-platform-suite-commons</module>
     <module>junit-jupiter</module>
     <module>junit-jupiter-api</module>
     <module>junit-jupiter-engine</module>
diff --git a/junit5.spec b/junit5.spec
index 57a5284..25859a4 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -6,8 +6,8 @@
 %global vintage_version %{version}
 
 Name:           junit5
-Version:        5.7.1
-Release:        5%{?dist}
+Version:        5.8.2
+Release:        1%{?dist}
 Summary:        Java regression testing framework
 License:        EPL-2.0
 URL:            https://junit.org/junit5/
@@ -27,13 +27,13 @@ Source206:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform
 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-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
+Source210:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-commons/%{platform_version}/junit-platform-suite-commons-%{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
 Source304:      https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/%{jupiter_version}/junit-jupiter-params-%{jupiter_version}.pom
-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
 # BOM POM
@@ -82,16 +82,16 @@ 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 %{SOURCE210} junit-platform-suite-commons/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
 cp -p %{SOURCE304} junit-jupiter-params/pom.xml
-cp -p %{SOURCE305} junit-jupiter/pom.xml
 cp -p %{SOURCE400} junit-vintage-engine/pom.xml
 cp -p %{SOURCE500} junit-bom/pom.xml
 
-for pom in $(find -mindepth 2 -name pom.xml); do
+for pom in $(find -mindepth 2 -name pom.xml | grep -v tests/); do
     # Set parent to aggregator
     %pom_xpath_inject pom:project "<parent><groupId>org.fedoraproject.xmvn.junit5</groupId><artifactId>aggregator</artifactId><version>1.0.0</version></parent>" $pom
     # OSGi BSN
@@ -99,6 +99,7 @@ for pom in $(find -mindepth 2 -name pom.xml); do
     %pom_xpath_inject pom:project "<properties><osgi.bsn>${bsn}</osgi.bsn></properties>" $pom
     # Incorrect scope - API guardian is just annotation, needed only during compilation
     %pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom
+    sed -i s/runtime/compile/ $pom
 done
 
 %pom_remove_parent junit-bom
@@ -134,6 +135,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*
 
 %changelog
+* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.8.2-1
+- Update to upstream version 5.8.2
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 5.7.1-5
 - Rebuilt for java-17-openjdk as system jdk
 
diff --git a/sources b/sources
index 1e3f7aa..b008d16 100644
--- a/sources
+++ b/sources
@@ -1,17 +1,18 @@
-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
-SHA512 (junit-jupiter-engine-5.7.1.pom) = b250c598922b1c76bfae81e1539eff6ecd186169a761d69abcf62dfff71657956949510bb1aa7cfa0fb6d34c64c536866a347e8b4c0536bc05fc1715eaf80488
-SHA512 (junit-jupiter-migrationsupport-5.7.1.pom) = d8ea3e0a202d252ed2276c1a185f204ac4727d873632c2a4bb1357491805c8ad237be328d9877a6ad39d6b4a64bee8337773f777577a7e2af31c947e88985158
-SHA512 (junit-jupiter-params-5.7.1.pom) = 8d691315b9ce3f135e773bb63b6dc1772a9e9fcbd3bbc2b56e5e3bb33bb6935b147f220c044c861e7d06eabfd1060d297c23d8119b832c40451906d3b04090bb
-SHA512 (junit-platform-commons-1.7.1.pom) = b6e4f8c966838140a2d5f88b47ed0dbcc902b8aa46b80ae862c293c582ff2a220eb4be032bd9d5f47da2acadbf017015d2def81d16422b9fd3d7e673ab654be9
-SHA512 (junit-platform-console-1.7.1.pom) = 24c239c1914eed87ac6244d5e0314bde9f206ecf894b430c8402907fc1dd2f2272b77b2ba9f2efa4e125098cf1f2d2fb6645018e91495dcf13027b900bbffc51
-SHA512 (junit-platform-console-standalone-1.7.1.pom) = 96ddafb17c67eff9725b06a5b9b98a1eefbf05eea434f91bc5267b8a166d59596db56562bd564e8a2d18a0417300d18c9f8be5bc513433898f7de8c169040768
-SHA512 (junit-platform-engine-1.7.1.pom) = bc1aa4fcfd4c77484ae8f946282644e8573227114331d8d59e84f0d8b0784b897979e9ba5c12ef9f3e7e2de490a4961b46c3c36fa0e9a2ecc7504edfd90b0476
-SHA512 (junit-platform-launcher-1.7.1.pom) = dc417328a7cbd86261e832fe0b5b271f9e6b65a59f6b99fa695c8fef6cf7f88a7c60ca0fc3496f4e1ed809f64e1014b92156463c36eb6df6a7dce94115dad410
-SHA512 (junit-platform-reporting-1.7.1.pom) = 9a82d0dbe55c2fc34e4db4023434270cc34894621e792aed36cd1530ddde9c3cee7e4608a425c7e7fdb08e120f17be63aa7904ed4d37f4d48b9a5368628ef95f
-SHA512 (junit-platform-runner-1.7.1.pom) = bae0b11bc780b91c5c6d8033dc28978d3576ad309d2ac1712d5ab390fdfcc64ed5f0e79b2dce46df18487fd46163397ee90395011a16e129c24617be5d4831fc
-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.8.2.tar.gz) = d4e7bf23aa736ab17badef59f690cb0040e438d31368c4727b1209c774a30e0cdfea7f206901eb5af3714c019893ac4768d16e8207219662d885c19a66955f7e
+SHA512 (junit-platform-commons-1.8.2.pom) = 5e96390f5c34e888873f0ec353530753cc9f89a4ef404af6c8c9ba1458e80657eaf521fba0dad1580e4d5c8afe622bab120138fa5a0db1f7f94ad4ce7031f3af
+SHA512 (junit-platform-console-1.8.2.pom) = 43687de4c695980f8fde2e971608bd725b1e7919dec83724b52f7c9de86a283d3087171e9c5bf6cb5f3cb532c3fe0f59fdbc67f36c2597b2f44cca50624f0a73
+SHA512 (junit-platform-console-standalone-1.8.2.pom) = 4c432a85f3c4726f4554954a8154ad9236c6350105459ebfe029146f0b4d689ba072d3c539ceaf4d5fa3f058853642cdf1417ea5b790160dee2b7e7d0f8ac7f6
+SHA512 (junit-platform-engine-1.8.2.pom) = bb6b653ca6095cb62e234f17a4dc35c35345b506bb916b39b2d5417e091f0925cb5ede130361e072c3b624af4b959f55ac7db8dad9273838a7a83c55a8bf5248
+SHA512 (junit-platform-launcher-1.8.2.pom) = 3e570a2fca53ae661ae635304e3124c78332034c7693fdd46b3f6d50d9b2ad4b53536c52353156d6c92c21ebb4ed26fc8b6b1624c490f2b5531e07072cf1c2a9
+SHA512 (junit-platform-runner-1.8.2.pom) = 02a6028d46f8be109c37c5514a3403e3822a2c2ca44d7c9d5c4571c9ff1f804ca2f6781d1f968e992dcdeff8741363e10973352f100aab6ba26d339849b28a3e
+SHA512 (junit-platform-suite-api-1.8.2.pom) = 8c527d1320887d789e683332b815385fb9a294bb94532b3c89067e269f1dfa439f7927c18986eafcbe6b1666ad7d44190d7b9f74b16085345eb7abf6f7a7d59a
+SHA512 (junit-platform-reporting-1.8.2.pom) = 7f8001ed01398c6a69453a864d4fd8492dd5b017414380f420808fd70ed6c5d638c43951620c5d46512b760037b6f9e00516c0cdcfc4bcfba746c3c0c3a0d44d
+SHA512 (junit-platform-testkit-1.8.2.pom) = def48348c038be2e9a556c1e1c2aecc50b35ddaa679eba8a37d734a57389f3abbe94eff3ec9bc4738df9fea36b0c3d2400067de702f14b10b24002139975ec60
+SHA512 (junit-platform-suite-commons-1.8.2.pom) = ba1b4d72ea83c978d4d319aeb013e1e90510a4cf20a020c2df6b028760c5ca857c49f53d971e201ddb843f9b30e954de8b736a3ae64507af045ef7a81860a770
+SHA512 (junit-jupiter-5.8.2.pom) = 3903f9b9ebd5b8c97206bd93479831ee7f5b7ec0b06798a11e3d44b24c2f21e75f83221e8002af63d527c3ffeaedaa2d399331be2c92e108880ec49613ca2fe5
+SHA512 (junit-jupiter-api-5.8.2.pom) = 73cdbd4b6e0997f365a596a0ba1cea6a9b35e3a3b1a40beeadf666c879ac2bcda9f58b728ccb090e830737838de5cd8fd730d3176fb741fe54e9046ad6876ae3
+SHA512 (junit-jupiter-engine-5.8.2.pom) = ed8c1b54d8f62b55d53683e8b708dea79e52bed8d93e9960aebea6d7a5674218e49e67d2523e6b56e96aae675a31cd79ac831f603ce5bcdc3918af7e92139dc3
+SHA512 (junit-jupiter-migrationsupport-5.8.2.pom) = c66650bbf739d9f2bd0ce48ba1e453a98ee53b9d8d27a933f360343c05f7459a9ae0f5d0a572a3452202b48a9d587d2ba7b365a3d766e70d196495d6e6f7ee60
+SHA512 (junit-jupiter-params-5.8.2.pom) = cfa019ab389aaf2b4957b8002e15205a81e5b5108961865df723f7a2ee0bd4b994e68165100f196e878f637b599bdaabf5ab13dfbe9a49b8cbe99007f9363bac
+SHA512 (junit-vintage-engine-5.8.2.pom) = 9e6047047dee745e0b274091aa5ab12a9d25cf952c358419ba97706303196bb8b40d3d9d99cf2f40b85832952f2b0909e8cb929e63d86851667de0ad821f44a9
+SHA512 (junit-bom-5.8.2.pom) = cb9283ed1a16be7f3102c891e91ff1cc9df94175c45ca99186f3d80f67439aea598565aac1c3cba6812a71dde9aa89a68fd7a29808096a1d254b9cda847e19a2