diff --git a/aggregator.pom b/aggregator.pom
index d3a97a3..9100cae 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -5,6 +5,7 @@
   <version>1.0.0</version>
   <packaging>pom</packaging>
   <modules>
+    <module>junit-bom</module>
     <module>junit-platform-commons</module>
     <module>junit-platform-console</module>
     <module>junit-platform-console-standalone</module>
@@ -13,13 +14,13 @@
     <module>junit-platform-reporting</module>
     <module>junit-platform-runner</module>
     <module>junit-platform-suite-api</module>
+    <module>junit-platform-suite-commons</module>
+    <module>junit-jupiter</module>
     <module>junit-jupiter-api</module>
     <module>junit-jupiter-engine</module>
     <module>junit-jupiter-migrationsupport</module>
     <module>junit-jupiter-params</module>
-    <module>junit-jupiter</module>
     <module>junit-vintage-engine</module>
-    <module>junit-bom</module>
   </modules>
   <build>
     <pluginManagement>
@@ -55,9 +56,9 @@
             </goals>
             <configuration>
               <instructions>
-                 <Bundle-SymbolicName>${osgi.bsn}</Bundle-SymbolicName>
-                 <Automatic-Module-Name>${osgi.bsn}</Automatic-Module-Name>
-                 <_nouses>true</_nouses>
+                <Bundle-SymbolicName>${osgi.bsn}</Bundle-SymbolicName>
+                <Automatic-Module-Name>${osgi.bsn}</Automatic-Module-Name>
+                <_nouses>true</_nouses>
               </instructions>
             </configuration>
           </execution>
diff --git a/junit-bom-5.5.2.pom b/junit-bom-5.8.2.pom
similarity index 67%
rename from junit-bom-5.5.2.pom
rename to junit-bom-5.8.2.pom
index 94ae609..13cf5fb 100644
--- a/junit-bom-5.5.2.pom
+++ b/junit-bom-5.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit</groupId>
   <artifactId>junit-bom</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <packaging>pom</packaging>
   <name>JUnit 5 (Bill of Materials)</name>
   <description>This Bill of Materials POM can be used to ease dependency management when referencing multiple JUnit artifacts using Gradle or Maven.</description>
@@ -34,7 +39,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -46,6 +51,11 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
@@ -57,72 +67,92 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-migrationsupport</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-params</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-commons</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-console</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-jfr</artifactId>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-launcher</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-reporting</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-runner</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-suite</artifactId>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-suite-api</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-suite-commons</artifactId>
+        <version>1.8.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-suite-engine</artifactId>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-testkit</artifactId>
-        <version>1.5.2</version>
+        <version>1.8.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
-        <version>5.5.2</version>
+        <version>5.8.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/junit-jupiter-5.5.2.pom b/junit-jupiter-5.8.2.pom
similarity index 66%
rename from junit-jupiter-5.5.2.pom
rename to junit-jupiter-5.8.2.pom
index 3bdc382..45aa1b4 100644
--- a/junit-jupiter-5.5.2.pom
+++ b/junit-jupiter-5.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Jupiter (Aggregator)</name>
   <description>Module "junit-jupiter" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,29 +50,45 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-api-5.5.2.pom b/junit-jupiter-api-5.8.2.pom
similarity index 65%
rename from junit-jupiter-api-5.5.2.pom
rename to junit-jupiter-api-5.8.2.pom
index 3041d4d..ba3ad92 100644
--- a/junit-jupiter-api-5.5.2.pom
+++ b/junit-jupiter-api-5.8.2.pom
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-api</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Jupiter API</name>
   <description>Module "junit-jupiter-api" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -32,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -44,19 +49,29 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.opentest4j</groupId>
       <artifactId>opentest4j</artifactId>
@@ -66,7 +81,13 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-engine-5.5.2.pom b/junit-jupiter-engine-5.8.2.pom
similarity index 64%
rename from junit-jupiter-engine-5.5.2.pom
rename to junit-jupiter-engine-5.8.2.pom
index 3747b50..8b1fce7 100644
--- a/junit-jupiter-engine-5.5.2.pom
+++ b/junit-jupiter-engine-5.8.2.pom
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-engine</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Jupiter Engine</name>
   <description>Module "junit-jupiter-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -32,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -44,29 +49,45 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-engine</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-migrationsupport-5.5.2.pom b/junit-jupiter-migrationsupport-5.8.2.pom
similarity index 66%
rename from junit-jupiter-migrationsupport-5.5.2.pom
rename to junit-jupiter-migrationsupport-5.8.2.pom
index 7b9d76c..afc21fb 100644
--- a/junit-jupiter-migrationsupport-5.5.2.pom
+++ b/junit-jupiter-migrationsupport-5.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-migrationsupport</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Jupiter Migration Support</name>
   <description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,29 +50,45 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
+      <version>4.13.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-params-5.5.2.pom b/junit-jupiter-params-5.8.2.pom
similarity index 63%
rename from junit-jupiter-params-5.5.2.pom
rename to junit-jupiter-params-5.8.2.pom
index f051cf0..d982997 100644
--- a/junit-jupiter-params-5.5.2.pom
+++ b/junit-jupiter-params-5.8.2.pom
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-params</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Jupiter Params</name>
   <description>Module "junit-jupiter-params" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -32,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -44,23 +49,39 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.5.2</version>
+      <version>5.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-commons-1.5.2.pom b/junit-platform-commons-1.8.2.pom
similarity index 64%
rename from junit-platform-commons-1.5.2.pom
rename to junit-platform-commons-1.8.2.pom
index c9a5c82..c8ca419 100644
--- a/junit-platform-commons-1.5.2.pom
+++ b/junit-platform-commons-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-commons</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Commons</name>
   <description>Module "junit-platform-commons" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,17 +50,33 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-console-1.5.2.pom b/junit-platform-console-1.8.2.pom
similarity index 65%
rename from junit-platform-console-1.5.2.pom
rename to junit-platform-console-1.8.2.pom
index e2e39d4..cc01627 100644
--- a/junit-platform-console-1.5.2.pom
+++ b/junit-platform-console-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-console</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Console</name>
   <description>Module "junit-platform-console" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,23 +50,39 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-reporting</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-console-standalone-1.5.2.pom b/junit-platform-console-standalone-1.8.2.pom
similarity index 71%
rename from junit-platform-console-standalone-1.5.2.pom
rename to junit-platform-console-standalone-1.8.2.pom
index 28a41c6..b6ccf1b 100644
--- a/junit-platform-console-standalone-1.5.2.pom
+++ b/junit-platform-console-standalone-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-console-standalone</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Console Standalone</name>
   <description>Module "junit-platform-console-standalone" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,6 +50,11 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
diff --git a/junit-platform-engine-1.5.2.pom b/junit-platform-engine-1.8.2.pom
similarity index 67%
rename from junit-platform-engine-1.5.2.pom
rename to junit-platform-engine-1.8.2.pom
index b9cb51e..a94e0af 100644
--- a/junit-platform-engine-1.5.2.pom
+++ b/junit-platform-engine-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-engine</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Engine API</name>
   <description>Module "junit-platform-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,19 +50,29 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.opentest4j</groupId>
       <artifactId>opentest4j</artifactId>
@@ -67,7 +82,13 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-launcher-1.5.2.pom b/junit-platform-launcher-1.8.2.pom
similarity index 65%
rename from junit-platform-launcher-1.5.2.pom
rename to junit-platform-launcher-1.8.2.pom
index ea0fcd2..1a7317f 100644
--- a/junit-platform-launcher-1.5.2.pom
+++ b/junit-platform-launcher-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-launcher</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Launcher</name>
   <description>Module "junit-platform-launcher" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,23 +50,39 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-engine</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-reporting-1.5.2.pom b/junit-platform-reporting-1.8.2.pom
similarity index 65%
rename from junit-platform-reporting-1.5.2.pom
rename to junit-platform-reporting-1.8.2.pom
index a98fc34..a4bc36a 100644
--- a/junit-platform-reporting-1.5.2.pom
+++ b/junit-platform-reporting-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-reporting</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Reporting</name>
   <description>Module "junit-platform-reporting" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,23 +50,39 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-runner-1.5.2.pom b/junit-platform-runner-1.8.2.pom
similarity index 63%
rename from junit-platform-runner-1.5.2.pom
rename to junit-platform-runner-1.8.2.pom
index 8efec6b..961fae0 100644
--- a/junit-platform-runner-1.5.2.pom
+++ b/junit-platform-runner-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-runner</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Runner</name>
   <description>Module "junit-platform-runner" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,36 +50,58 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
+      <version>4.13.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-suite-api</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-suite-commons</artifactId>
+      <version>1.8.2</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/junit-platform-suite-api-1.5.2.pom b/junit-platform-suite-api-1.8.2.pom
similarity index 60%
rename from junit-platform-suite-api-1.5.2.pom
rename to junit-platform-suite-api-1.8.2.pom
index f00532f..d56225d 100644
--- a/junit-platform-suite-api-1.5.2.pom
+++ b/junit-platform-suite-api-1.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-suite-api</artifactId>
-  <version>1.5.2</version>
+  <version>1.8.2</version>
   <name>JUnit Platform Suite API</name>
   <description>Module "junit-platform-suite-api" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,17 +50,39 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-suite-commons-1.8.2.pom b/junit-platform-suite-commons-1.8.2.pom
new file mode 100644
index 0000000..967a627
--- /dev/null
+++ b/junit-platform-suite-commons-1.8.2.pom
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.junit.platform</groupId>
+  <artifactId>junit-platform-suite-commons</artifactId>
+  <version>1.8.2</version>
+  <name>JUnit Platform Suite Commons</name>
+  <description>Module "junit-platform-suite-commons" of JUnit 5.</description>
+  <url>https://junit.org/junit5/</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License v2.0</name>
+      <url>https://www.eclipse.org/legal/epl-v20.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>bechte</id>
+      <name>Stefan Bechtold</name>
+      <email>stefan.bechtold@me.com</email>
+    </developer>
+    <developer>
+      <id>jlink</id>
+      <name>Johannes Link</name>
+      <email>business@johanneslink.net</email>
+    </developer>
+    <developer>
+      <id>marcphilipp</id>
+      <name>Marc Philipp</name>
+      <email>mail@marcphilipp.de</email>
+    </developer>
+    <developer>
+      <id>mmerdes</id>
+      <name>Matthias Merdes</name>
+      <email>matthias.merdes@heidelpay.com</email>
+    </developer>
+    <developer>
+      <id>sbrannen</id>
+      <name>Sam Brannen</name>
+      <email>sam@sambrannen.com</email>
+    </developer>
+    <developer>
+      <id>sormuras</id>
+      <name>Christian Stein</name>
+      <email>sormuras@gmail.com</email>
+    </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
+    <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
+    <url>https://github.com/junit-team/junit5</url>
+  </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>1.8.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+      <version>1.8.2</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-suite-api</artifactId>
+      <version>1.8.2</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/junit-vintage-engine-5.5.2.pom b/junit-vintage-engine-5.8.2.pom
similarity index 66%
rename from junit-vintage-engine-5.5.2.pom
rename to junit-vintage-engine-5.8.2.pom
index 6f4d2f9..82e2737 100644
--- a/junit-vintage-engine-5.5.2.pom
+++ b/junit-vintage-engine-5.8.2.pom
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.vintage</groupId>
   <artifactId>junit-vintage-engine</artifactId>
-  <version>5.5.2</version>
+  <version>5.8.2</version>
   <name>JUnit Vintage Engine</name>
   <description>Module "junit-vintage-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -33,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>Matthias.Merdes@heidelberg-mobil.com</email>
+      <email>matthias.merdes@heidelpay.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -45,29 +50,45 @@
       <name>Christian Stein</name>
       <email>sormuras@gmail.com</email>
     </developer>
+    <developer>
+      <id>juliette-derancourt</id>
+      <name>Juliette de Rancourt</name>
+      <email>derancourt.juliette@gmail.com</email>
+    </developer>
   </developers>
   <scm>
     <connection>scm:git:git://github.com/junit-team/junit5.git</connection>
     <developerConnection>scm:git:git://github.com/junit-team/junit5.git</developerConnection>
     <url>https://github.com/junit-team/junit5</url>
   </scm>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.8.2</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-engine</artifactId>
-      <version>1.5.2</version>
+      <version>1.8.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit5-5.5.2.tar.gz b/junit5-5.5.2.tar.gz
deleted file mode 100644
index 0fe7833..0000000
--- a/junit5-5.5.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fbc1f99c297d1d44e10a074019574855d53c6565b1345f93d0fa3276f2102e42
-size 1170914
diff --git a/junit5-5.8.2.tar.gz b/junit5-5.8.2.tar.gz
new file mode 100644
index 0000000..6280c7e
--- /dev/null
+++ b/junit5-5.8.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc37632dc36c4eebb9ba8dff07a8a6ced35472be48bf0d9874ecdf7b4bea7fb4
+size 2808680
diff --git a/junit5.changes b/junit5.changes
index 569eb5c..90ce567 100644
--- a/junit5.changes
+++ b/junit5.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Mon May  9 12:28:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 5.8.2
+  * Fixes:
+    + Text blocks in @CsvSource are treated like CSV files
+    + CSV headers in display names for @CsvSource and
+      @CsvFileSource
+    + Custom quote character support in @CsvSource and
+      @CsvFileSource
+    + Support for text blocks in @CsvSource
+    + Java 18 support in the JRE enum
+    + Access to the ExecutionMode in the ExtensionContext
+    + Declarative test suites via @Suite classes
+    + LauncherSession and accompanying listener
+    + New UniqueIdTrackingListener
+    + More fine-grained Java Flight Recorder events
+    + Java Flight Recorder support on Java 8 Update 262 or
+      higher
+    + Test class ordering
+    + @TempDir can be used to create multiple temporary
+      directories
+    + Extension registration via @ExtendWith on fields and
+      parameters
+    + Auto-close support for arguments in @ParameterizedTest
+      methods
+- Fix the classpath of console application so that it actually
+  works
+
 -------------------------------------------------------------------
 Thu Mar  3 14:03:48 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/junit5.spec b/junit5.spec
index 03e39ec..e2190ca 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -16,12 +16,12 @@
 #
 
 
-%global platform_version 1.5.2
+%global platform_version 1.8.2
 %global jupiter_version %{version}
 %global vintage_version %{version}
 %bcond_without console
 Name:           junit5
-Version:        5.5.2
+Version:        5.8.2
 Release:        0
 Summary:        Java regression testing framework
 License:        EPL-2.0
@@ -39,15 +39,16 @@ Source205:      https://repo1.maven.org/maven2/org/junit/platform/junit-platform
 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-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom
+Source209:      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
+# BOM POM
 Source500:      https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
@@ -60,8 +61,6 @@ BuildRequires:  mvn(org.opentest4j:opentest4j)
 BuildArch:      noarch
 %if %{with console}
 BuildRequires:  mvn(info.picocli:picocli)
-# Explicit requires for javapackages-tools since junit5 script
-# uses /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
 %endif
 
@@ -104,14 +103,16 @@ 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-reporting/pom.xml
+cp -p %{SOURCE209} 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
@@ -119,14 +120,14 @@ 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
+
 # Add deps which are shaded by upstream and therefore not present in POMs.
 %pom_add_dep info.picocli:picocli:4.0.4 junit-platform-console
-%pom_add_dep com.univocity:univocity-parsers:2.5.4 junit-jupiter-params
-
-# 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
+%pom_add_dep com.univocity:univocity-parsers:2.9.1 junit-jupiter-params
 
 %if %{without console}
 # Disable the console modules
@@ -137,8 +138,6 @@ done
 %{mvn_package} :aggregator __noinstall
 %{mvn_package} :junit-bom bom
 
-cp -p %{SOURCE500} junit-bom/pom.xml
-
 %build
 %{mvn_build} -f -- -Dencoding=utf-8 -Dsource=8
 
@@ -153,7 +152,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %fdupes -s documentation/src/docs/
 
 %if %{with console}
-%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:jopt-simple %{name} true
+%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:picocli %{name} true
 %endif
 
 %files -f .mfiles