diff --git a/0001-Drop-transitive-requirement-on-apiguardian.patch b/0001-Drop-transitive-requirement-on-apiguardian.patch
deleted file mode 100644
index a69268d44c2b30538f174ace2ffb87ba99e627b7..0000000000000000000000000000000000000000
--- a/0001-Drop-transitive-requirement-on-apiguardian.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 58cb1677c9e0f1bb77b66f5e304ba695678d510e Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-Date: Mon, 27 Feb 2023 14:39:29 +0100
-Subject: [PATCH 1/2] Drop transitive requirement on apiguardian
-
----
- .../src/module/org.junit.jupiter.api/module-info.java           | 2 +-
- .../module/org.junit.jupiter.migrationsupport/module-info.java  | 2 +-
- .../src/module/org.junit.jupiter.params/module-info.java        | 2 +-
- .../src/module/org.junit.platform.commons/module-info.java      | 2 +-
- .../src/module/org.junit.platform.engine/module-info.java       | 2 +-
- .../src/module/org.junit.platform.launcher/module-info.java     | 2 +-
- .../src/module/org.junit.platform.reporting/module-info.java    | 2 +-
- .../src/module/org.junit.platform.runner/module-info.java       | 2 +-
- .../src/module/org.junit.platform.suite.api/module-info.java    | 2 +-
- .../module/org.junit.platform.suite.commons/module-info.java    | 2 +-
- .../src/module/org.junit.platform.testkit/module-info.java      | 2 +-
- 11 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
-index b6856c7..25a1523 100644
---- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
-+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
-@@ -12,7 +12,7 @@
-  * Defines JUnit Jupiter API for writing tests.
-  */
- module org.junit.jupiter.api {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.platform.commons;
- 	requires transitive org.opentest4j;
- 
-diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
-index 3ace009..25a86fa 100644
---- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
-+++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
-@@ -15,7 +15,7 @@
-  */
- module org.junit.jupiter.migrationsupport {
- 	requires transitive junit; // 4
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.jupiter.api;
- 	requires org.junit.platform.commons;
- 
-diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-index 7f3ea05..572e8ed 100644
---- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-@@ -14,7 +14,7 @@
-  * @since 5.0
-  */
- module org.junit.jupiter.params {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.jupiter.api;
- 	requires transitive org.junit.platform.commons;
- 
-diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
-index f33ffd3..c25315a 100644
---- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
-+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
-@@ -16,7 +16,7 @@
- module org.junit.platform.commons {
- 	requires java.logging;
- 	requires java.management; // needed by RuntimeUtils to determine input arguments
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 
- 	exports org.junit.platform.commons;
- 	exports org.junit.platform.commons.annotation;
-diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
-index 0b6336c..6931626 100644
---- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
-+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
-@@ -17,7 +17,7 @@
-  * @since 1.0
-  */
- module org.junit.platform.engine {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.platform.commons;
- 	requires transitive org.opentest4j;
- 
-diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
-index 9501caf..c2fef28 100644
---- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
-+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
-@@ -21,7 +21,7 @@
-  */
- module org.junit.platform.launcher {
- 	requires transitive java.logging;
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.platform.commons;
- 	requires transitive org.junit.platform.engine;
- 
-diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
-index 66c7494..2a6acd7 100644
---- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
-+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
-@@ -15,7 +15,7 @@
-  */
- module org.junit.platform.reporting {
- 	requires java.xml;
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires org.junit.platform.commons;
- 	requires transitive org.junit.platform.engine;
- 	requires transitive org.junit.platform.launcher;
-diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
-index 47edeb1..4313c64 100644
---- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
-+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
-@@ -16,7 +16,7 @@
-  */
- module org.junit.platform.runner {
- 	requires transitive junit; // 4
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.platform.launcher;
- 	requires transitive org.junit.platform.suite.api;
- 	requires org.junit.platform.suite.commons;
-diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
-index 9af8dae..cf50c08 100644
---- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
-+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
-@@ -14,7 +14,7 @@
-  * @since 1.0
-  */
- module org.junit.platform.suite.api {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.junit.platform.commons;
- 
- 	exports org.junit.platform.suite.api;
-diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
-index b810efc..ccb6756 100644
---- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
-+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
-@@ -14,7 +14,7 @@
-  * @since 1.8
-  */
- module org.junit.platform.suite.commons {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires org.junit.platform.suite.api;
- 	requires org.junit.platform.commons;
- 	requires org.junit.platform.engine;
-diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
-index c0ae318..0d4cf42 100644
---- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
-+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
-@@ -15,7 +15,7 @@
-  * @uses org.junit.platform.engine.TestEngine
-  */
- module org.junit.platform.testkit {
--	requires static transitive org.apiguardian.api;
-+	requires static org.apiguardian.api;
- 	requires transitive org.assertj.core;
- 	requires org.junit.platform.commons;
- 	requires transitive org.junit.platform.engine;
--- 
-2.39.2
-
diff --git a/0002-Add-missing-module-static-requires.patch b/0002-Add-missing-module-static-requires.patch
deleted file mode 100644
index 0eef828cc3eda9afab2b95195201d209c559b503..0000000000000000000000000000000000000000
--- a/0002-Add-missing-module-static-requires.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2f5ad4483784985a299e9ed28429bb52da21564d Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk@redhat.com>
-Date: Mon, 27 Mar 2023 16:55:13 +0200
-Subject: [PATCH 2/2] Add missing module static requires
-
----
- .../src/module/org.junit.jupiter.params/module-info.java         | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-index 572e8ed..90a3c3b 100644
---- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
-@@ -15,6 +15,7 @@
-  */
- module org.junit.jupiter.params {
- 	requires static org.apiguardian.api;
-+	requires static univocity.parsers;
- 	requires transitive org.junit.jupiter.api;
- 	requires transitive org.junit.platform.commons;
- 
--- 
-2.39.2
-
diff --git a/aggregator.pom b/aggregator.pom
index 78c1be2ffbe18301ff1287baa7a469d72db9c462..e1445e171cb7cc120d2da08f4e1130e868c02b6c 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -1,79 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-  xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+<project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.fedoraproject.xmvn.junit5</groupId>
   <artifactId>aggregator</artifactId>
-  <version>any</version>
+  <version>1.0.0</version>
   <packaging>pom</packaging>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
   <modules>
     <module>junit-bom</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-platform-commons</module>
     <module>junit-platform-console</module>
     <module>junit-platform-console-standalone</module>
     <module>junit-platform-engine</module>
     <module>junit-platform-launcher</module>
+    <module>junit-platform-reporting</module>
     <module>junit-platform-runner</module>
     <module>junit-platform-suite-api</module>
-    <module>junit-platform-suite-commons</module>
     <module>junit-platform-testkit</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-vintage-engine</module>
   </modules>
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>default-compile</id>
-              <goals>
-                <goal>compile</goal>
-              </goals>
-              <configuration>
-                <release>8</release>
-                <!--
-                  (default-compile) for junit-jupiter module would fail because
-                  there are no sources to compile and therefore the plugin would
-                  include module-info in the first (Java 8) compile phase
-                -->
-                <useIncrementalCompilation>false</useIncrementalCompilation>
-                <excludes>
-                  <exclude>**/module-info.java</exclude>
-                </excludes>
-              </configuration>
-            </execution>
-            <execution>
-              <id>module-info</id>
-              <goals>
-                <goal>compile</goal>
-              </goals>
-              <configuration>
-                <release>9</release>
-                <includes>
-                  <include>**/module-info.java</include>
-                </includes>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
+	<plugin>
+	  <artifactId>maven-compiler-plugin</artifactId>
+	  <configuration>
+	    <source>1.8</source>
+	    <target>1.8</target>
+	  </configuration>
+	</plugin>
+	<plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <configuration>
             <archive>
               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             </archive>
           </configuration>
-        </plugin>
+	</plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -90,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.9.0.pom b/junit-bom-5.6.2.pom
similarity index 76%
rename from junit-bom-5.9.0.pom
rename to junit-bom-5.6.2.pom
index de9e3fc418d34ad0949db8ce85d5acb5fde787ba..3909068b84e81f8999a5c2d4e266e5e4c55943e0 100644
--- a/junit-bom-5.9.0.pom
+++ b/junit-bom-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit</groupId>
   <artifactId>junit-bom</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.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>
@@ -39,7 +39,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -67,92 +67,72 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-api</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-migrationsupport</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-params</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-commons</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-console</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-engine</artifactId>
-        <version>1.9.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-jfr</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-launcher</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-reporting</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-runner</artifactId>
-        <version>1.9.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-suite</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-suite-api</artifactId>
-        <version>1.9.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-suite-commons</artifactId>
-        <version>1.9.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-suite-engine</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.platform</groupId>
         <artifactId>junit-platform-testkit</artifactId>
-        <version>1.9.0</version>
+        <version>1.6.2</version>
       </dependency>
       <dependency>
         <groupId>org.junit.vintage</groupId>
         <artifactId>junit-vintage-engine</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/junit-jupiter-5.9.0.pom b/junit-jupiter-5.6.2.pom
similarity index 90%
rename from junit-jupiter-5.9.0.pom
rename to junit-jupiter-5.6.2.pom
index 0291a5402fa08bcd8bff3da4a10f654ddfc00cd3..bbc130cf4c8414abf006ba7c53cbe6ba65043e3b 100644
--- a/junit-jupiter-5.9.0.pom
+++ b/junit-jupiter-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Jupiter (Aggregator)</name>
   <description>Module "junit-jupiter" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -76,19 +76,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
+      <version>5.6.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.0</version>
+      <version>5.6.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.0</version>
+      <version>5.6.2</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-api-5.9.0.pom b/junit-jupiter-api-5.6.2.pom
similarity index 89%
rename from junit-jupiter-api-5.9.0.pom
rename to junit-jupiter-api-5.6.2.pom
index 77248834247b724f12da7da04f86ece548cf6409..39243d21ad81fbcc42e5b13cbc1c23f18660d8c8 100644
--- a/junit-jupiter-api-5.9.0.pom
+++ b/junit-jupiter-api-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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 https://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 http://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  -->
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-api</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Jupiter API</name>
   <description>Module "junit-jupiter-api" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -37,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -65,13 +65,19 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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>
@@ -81,13 +87,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
-      <version>1.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-engine-5.9.0.pom b/junit-jupiter-engine-5.6.2.pom
similarity index 89%
rename from junit-jupiter-engine-5.9.0.pom
rename to junit-jupiter-engine-5.6.2.pom
index c58e30c843521386b1817fae162fe51fdd37419a..99326bcc54cb476332cf0bed3fa92d31b30df526 100644
--- a/junit-jupiter-engine-5.9.0.pom
+++ b/junit-jupiter-engine-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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 https://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 http://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  -->
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-engine</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Jupiter Engine</name>
   <description>Module "junit-jupiter-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -37,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -65,29 +65,29 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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.9.0</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>5.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-migrationsupport-5.9.0.pom b/junit-jupiter-migrationsupport-5.6.2.pom
similarity index 86%
rename from junit-jupiter-migrationsupport-5.9.0.pom
rename to junit-jupiter-migrationsupport-5.6.2.pom
index afff5d06650bea073c6113b6ef7e2e1b882720e5..a6870b46eb8d33ff6ddafdf252b9be39b1f5efbc 100644
--- a/junit-jupiter-migrationsupport-5.9.0.pom
+++ b/junit-jupiter-migrationsupport-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-migrationsupport</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Jupiter Migration Support</name>
   <description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -63,10 +63,15 @@
   </scm>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13</version>
+      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -76,19 +81,19 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <version>4.13</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-jupiter-params-5.9.0.pom b/junit-jupiter-params-5.6.2.pom
similarity index 89%
rename from junit-jupiter-params-5.9.0.pom
rename to junit-jupiter-params-5.6.2.pom
index fc3c15c4869ae21cb310111eb1c7b4ec0666c546..bfafe69f26dbdbb337643c17832502423d00c06d 100644
--- a/junit-jupiter-params-5.9.0.pom
+++ b/junit-jupiter-params-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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 https://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 http://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  -->
@@ -8,7 +8,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.jupiter</groupId>
   <artifactId>junit-jupiter-params</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Jupiter Params</name>
   <description>Module "junit-jupiter-params" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -37,7 +37,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -73,15 +73,15 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-commons-1.9.0.pom b/junit-platform-commons-1.6.2.pom
similarity index 91%
rename from junit-platform-commons-1.9.0.pom
rename to junit-platform-commons-1.6.2.pom
index b8e40bfd9a1ba571a91a54374495da1100108c5d..b7247e91abbe91039697feefa8d41c8ca31e5730 100644
--- a/junit-platform-commons-1.9.0.pom
+++ b/junit-platform-commons-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-commons</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Commons</name>
   <description>Module "junit-platform-commons" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-console-1.9.0.pom b/junit-platform-console-1.6.2.pom
similarity index 91%
rename from junit-platform-console-1.9.0.pom
rename to junit-platform-console-1.6.2.pom
index b9969de3b9d912deef97e8843eb7601067fe2e4f..ab6706c833ad21f747ef2d493535e6d093568cd7 100644
--- a/junit-platform-console-1.9.0.pom
+++ b/junit-platform-console-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-console</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Console</name>
   <description>Module "junit-platform-console" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -74,15 +74,15 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-reporting</artifactId>
-      <version>1.9.0</version>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-reporting</artifactId>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-console-standalone-1.9.0.pom b/junit-platform-console-standalone-1.6.2.pom
similarity index 92%
rename from junit-platform-console-standalone-1.9.0.pom
rename to junit-platform-console-standalone-1.6.2.pom
index e9d12ce9526ad13e71f9df1dd8b2d8b5ca061907..12809a71c638333aa89bda51e48d95187e68769d 100644
--- a/junit-platform-console-standalone-1.9.0.pom
+++ b/junit-platform-console-standalone-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-console-standalone</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Console Standalone</name>
   <description>Module "junit-platform-console-standalone" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
diff --git a/junit-platform-engine-1.9.0.pom b/junit-platform-engine-1.6.2.pom
similarity index 91%
rename from junit-platform-engine-1.9.0.pom
rename to junit-platform-engine-1.6.2.pom
index 82919d7e7a87eda2dc5ae12819eb03dda1d7aba5..1e7edafcab612afeb2adedf7e114e649c2f206f7 100644
--- a/junit-platform-engine-1.9.0.pom
+++ b/junit-platform-engine-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-engine</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Engine API</name>
   <description>Module "junit-platform-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,13 +66,19 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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>
@@ -82,13 +88,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-commons</artifactId>
-      <version>1.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-launcher-1.9.0.pom b/junit-platform-launcher-1.6.2.pom
similarity index 91%
rename from junit-platform-launcher-1.9.0.pom
rename to junit-platform-launcher-1.6.2.pom
index 8389a5e95171abf4fdb43b5945ff07060cd639c6..e23a114b1282583bf443a36be32a4d1105ef62b5 100644
--- a/junit-platform-launcher-1.9.0.pom
+++ b/junit-platform-launcher-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-launcher</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Launcher</name>
   <description>Module "junit-platform-launcher" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -74,15 +74,15 @@
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-engine</artifactId>
-      <version>1.9.0</version>
+      <groupId>org.apiguardian</groupId>
+      <artifactId>apiguardian-api</artifactId>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-reporting-1.6.2.pom b/junit-platform-reporting-1.6.2.pom
new file mode 100644
index 0000000000000000000000000000000000000000..24129b70fe1a913b0e61e6d1f558d58f68da0834
--- /dev/null
+++ b/junit-platform-reporting-1.6.2.pom
@@ -0,0 +1,89 @@
+<?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"
+    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.6.2</version>
+  <name>JUnit Platform Reporting</name>
+  <description>Module "junit-platform-reporting" 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@heidelberg-mobil.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.6.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.6.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/junit-platform-runner-1.9.0.pom b/junit-platform-runner-1.6.2.pom
similarity index 85%
rename from junit-platform-runner-1.9.0.pom
rename to junit-platform-runner-1.6.2.pom
index 6bf7ffb345347e4960b1669743af6a9ac1c02f65..1419742331940cb697eb72291b7fddbab94212b1 100644
--- a/junit-platform-runner-1.9.0.pom
+++ b/junit-platform-runner-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-runner</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Runner</name>
   <description>Module "junit-platform-runner" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -63,10 +63,15 @@
   </scm>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13</version>
+      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -76,32 +81,26 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <version>4.13</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.0</version>
+      <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-suite-api</artifactId>
-      <version>1.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-suite-commons</artifactId>
-      <version>1.9.0</version>
-      <scope>runtime</scope>
+      <artifactId>junit-platform-suite-api</artifactId>
+      <version>1.6.2</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/junit-platform-suite-api-1.9.0.pom b/junit-platform-suite-api-1.6.2.pom
similarity index 86%
rename from junit-platform-suite-api-1.9.0.pom
rename to junit-platform-suite-api-1.6.2.pom
index f995336d1d43ac19ebf1271b9886def64c87e83c..1b229991a96bcd0d2a77c268cb7401eb9e97b6f6 100644
--- a/junit-platform-suite-api-1.9.0.pom
+++ b/junit-platform-suite-api-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-suite-api</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Suite API</name>
   <description>Module "junit-platform-suite-api" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,23 +66,17 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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.9.0</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-platform-suite-commons-1.9.0.pom b/junit-platform-suite-commons-1.9.0.pom
deleted file mode 100644
index f15fa96066a9e71a8c971abaccc960fda85e4d2d..0000000000000000000000000000000000000000
--- a/junit-platform-suite-commons-1.9.0.pom
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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.9.0</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.9.0</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.0</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.9.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-suite-api</artifactId>
-      <version>1.9.0</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/junit-platform-testkit-1.9.0.pom b/junit-platform-testkit-1.6.2.pom
similarity index 91%
rename from junit-platform-testkit-1.9.0.pom
rename to junit-platform-testkit-1.6.2.pom
index 6eebf57f0e016050c8ddb563a51b9ad2092d01c0..ee66ab4fe4b5e108683d44763e567e5497b50a9c 100644
--- a/junit-platform-testkit-1.9.0.pom
+++ b/junit-platform-testkit-1.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.platform</groupId>
   <artifactId>junit-platform-testkit</artifactId>
-  <version>1.9.0</version>
+  <version>1.6.2</version>
   <name>JUnit Platform Test Kit</name>
   <description>Module "junit-platform-testkit" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -66,17 +66,23 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.23.1</version>
+      <version>3.14.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -88,13 +94,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit-vintage-engine-5.9.0.pom b/junit-vintage-engine-5.6.2.pom
similarity index 86%
rename from junit-vintage-engine-5.9.0.pom
rename to junit-vintage-engine-5.6.2.pom
index b0ac2b8d1d328191aa63119444ba6e3f3f717003..8c36e0ae78f9ddb7f2e6a93e285b3fa3dae75c4b 100644
--- a/junit-vintage-engine-5.9.0.pom
+++ b/junit-vintage-engine-5.6.2.pom
@@ -1,5 +1,5 @@
 <?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"
+<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"
     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  -->
@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.junit.vintage</groupId>
   <artifactId>junit-vintage-engine</artifactId>
-  <version>5.9.0</version>
+  <version>5.6.2</version>
   <name>JUnit Vintage Engine</name>
   <description>Module "junit-vintage-engine" of JUnit 5.</description>
   <url>https://junit.org/junit5/</url>
@@ -38,7 +38,7 @@
     <developer>
       <id>mmerdes</id>
       <name>Matthias Merdes</name>
-      <email>matthias.merdes@heidelpay.com</email>
+      <email>Matthias.Merdes@heidelberg-mobil.com</email>
     </developer>
     <developer>
       <id>sbrannen</id>
@@ -63,32 +63,37 @@
   </scm>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.13</version>
+      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.6.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.9.0</version>
+      <version>1.6.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>4.13</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/junit5-5.6.2.tar.gz b/junit5-5.6.2.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..9904ad5edd7b94bf83d74357668214fa5b255a30
Binary files /dev/null and b/junit5-5.6.2.tar.gz differ
diff --git a/junit5-5.9.0.tar.gz b/junit5-5.9.0.tar.gz
deleted file mode 100644
index da95b3dbcf3744b3a2c3a4e044bd5483024d7efb..0000000000000000000000000000000000000000
Binary files a/junit5-5.9.0.tar.gz and /dev/null differ
diff --git a/junit5.spec b/junit5.spec
index 918f3bbd2075025a9dcdd9c5d3ca23523c0d9414..978245407c5f3e3fa9b0c4b7b45d3068e2aedadd 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -1,4 +1,4 @@
-%define anolis_release 1
+%define anolis_release 2
 
 %bcond_without bootstrap
 
@@ -7,14 +7,17 @@
 %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.9.0
+Version:        5.6.2
 Release:        %{anolis_release}%{?dist}
 Summary:        Java regression testing framework
 License:        EPL-2.0
-URL:            https://junit.org/junit5/
+URL:            http://junit.org/junit5/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
 
@@ -28,23 +31,19 @@ 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-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
+# Bill of Materials POM
 Source500:      https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom
 
-Patch1:         0001-Drop-transitive-requirement-on-apiguardian.patch
-Patch2:         0002-Add-missing-module-static-requires.patch
-
-BuildRequires:  asciidoc
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
@@ -57,6 +56,18 @@ BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.opentest4j:opentest4j)
 %endif
 
+%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
 JUnit is a popular regression testing framework for Java platform.
 
@@ -75,47 +86,55 @@ JUnit 5 User Guide.
 
 %prep
 %setup -q -n %{name}-r%{version}
-find -name '*.jar' -delete
-
-%patch1 -p1
-%patch2 -p1
+find -name \*.jar -delete
 
 cp -p %{SOURCE100} pom.xml
-
-for source in $(echo %{sources} | cut -d ' ' -f3-); do
-  module=${source}
-  module=${module##*/}
-  module=${module%%-*}
-  if [ -d ${module}/src/module ]; then
-    mkdir -p ${module}/src/main/java
-    mv -t ${module}/src/main/java ${module}/src/module/*/module-info.java
-  fi
-  cp -p ${source} ${module}/pom.xml
-  %pom_add_parent org.fedoraproject.xmvn.junit5:aggregator:any ${module}
-  # OSGi BSN
-  bsn=org.${module//-/.}
-  %pom_xpath_inject pom:project "<properties><osgi.bsn>${bsn}</osgi.bsn></properties>" ${module}
-  # Incorrect scope - API guardian is just annotation, needed only during compilation
-  %pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided ${module}
-  %pom_xpath_set -f "pom:dependency[pom:scope='runtime']/pom:scope" compile ${module}
+cp -p %{SOURCE200} junit-platform-commons/pom.xml
+cp -p %{SOURCE201} junit-platform-console/pom.xml
+cp -p %{SOURCE202} junit-platform-console-standalone/pom.xml
+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-reporting/pom.xml
+cp -p %{SOURCE209} junit-platform-testkit/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
+    # 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
+    bsn=$(sed 's|/pom.xml$||;s|.*/|org.|;s|-|.|g' <<<"$pom")
+    %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
 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
 
+# 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
+
+%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
 
 %build
 %mvn_build -f
 
-# Build docs. Ignore exit asciidoc -- it fails for some reason, but
+# Build docs.  Ignore exit asciidoc -- it fails for some reason, but
 # still produces readable docs.
 asciidoc documentation/src/docs/asciidoc/index.adoc || :
 ln -s ../../javadoc/junit5 documentation/src/docs/api
@@ -123,7 +142,14 @@ 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
@@ -133,5 +159,8 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*
 
 %changelog
+* Fri May 19 2023 mgb01105731 <mgb01105731@alibaba-inc.com> - 5.6.2-1
+- download version to 5.6.2
+
 * Fri May 12 2023 mgb01105731 <mgb01105731@alibaba-inc.com> - 5.9.0-1
 - Init upstream from version 5.9.0