19 changed files with 335 additions and 933 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,186 @@
-SOURCES/junit5-5.4.0.tar.gz
+/results_*
+/*.src.rpm
+
+/r5.0.0.tar.gz
+/junit-platform-commons-1.0.0.pom
+/junit-platform-console-1.0.0.pom
+/junit-platform-console-standalone-1.0.0.pom
+/junit-platform-engine-1.0.0.pom
+/junit-platform-gradle-plugin-1.0.0.pom
+/junit-platform-launcher-1.0.0.pom
+/junit-platform-runner-1.0.0.pom
+/junit-platform-suite-api-1.0.0.pom
+/junit-platform-surefire-provider-1.0.0.pom
+/junit-jupiter-api-5.0.0.pom
+/junit-jupiter-engine-5.0.0.pom
+/junit-jupiter-migrationsupport-5.0.0.pom
+/junit-jupiter-params-5.0.0.pom
+/junit-vintage-engine-4.12.0.pom
+/r5.2.0.tar.gz
+/junit-jupiter-api-5.2.0.pom
+/junit-jupiter-engine-5.2.0.pom
+/junit-jupiter-migrationsupport-5.2.0.pom
+/junit-jupiter-params-5.2.0.pom
+/junit-platform-commons-1.2.0.pom
+/junit-platform-console-1.2.0.pom
+/junit-platform-console-standalone-1.2.0.pom
+/junit-platform-engine-1.2.0.pom
+/junit-platform-gradle-plugin-1.2.0.pom
+/junit-platform-launcher-1.2.0.pom
+/junit-platform-runner-1.2.0.pom
+/junit-platform-suite-api-1.2.0.pom
+/junit-platform-surefire-provider-1.2.0.pom
+/junit-vintage-engine-5.2.0.pom
+/r5.3.1.tar.gz
+/junit-jupiter-api-5.3.1.pom
+/junit-jupiter-engine-5.3.1.pom
+/junit-jupiter-migrationsupport-5.3.1.pom
+/junit-jupiter-params-5.3.1.pom
+/junit-platform-commons-1.3.1.pom
+/junit-platform-console-1.3.1.pom
+/junit-platform-console-standalone-1.3.1.pom
+/junit-platform-engine-1.3.1.pom
+/junit-platform-launcher-1.3.1.pom
+/junit-platform-runner-1.3.1.pom
+/junit-platform-suite-api-1.3.1.pom
+/junit-platform-surefire-provider-1.3.1.pom
+/junit-vintage-engine-5.3.1.pom
+/junit5-5.4.0.tar.gz
+/junit-jupiter-api-5.4.0.pom
+/junit-jupiter-engine-5.4.0.pom
+/junit-jupiter-migrationsupport-5.4.0.pom
+/junit-jupiter-params-5.4.0.pom
+/junit-platform-commons-1.4.0.pom
+/junit-platform-console-1.4.0.pom
+/junit-platform-console-standalone-1.4.0.pom
+/junit-platform-engine-1.4.0.pom
+/junit-platform-launcher-1.4.0.pom
+/junit-platform-runner-1.4.0.pom
+/junit-platform-suite-api-1.4.0.pom
+/junit-vintage-engine-5.4.0.pom
+/junit-platform-reporting-1.4.0.pom
+/junit5-5.4.2.tar.gz
+/junit-platform-commons-1.4.2.pom
+/junit-platform-console-1.4.2.pom
+/junit-platform-console-standalone-1.4.2.pom
+/junit-platform-engine-1.4.2.pom
+/junit-platform-launcher-1.4.2.pom
+/junit-platform-runner-1.4.2.pom
+/junit-platform-suite-api-1.4.2.pom
+/junit-platform-reporting-1.4.2.pom
+/junit-jupiter-api-5.4.2.pom
+/junit-jupiter-engine-5.4.2.pom
+/junit-jupiter-migrationsupport-5.4.2.pom
+/junit-jupiter-params-5.4.2.pom
+/junit-vintage-engine-5.4.2.pom
+/junit5-5.5.1.tar.gz
+/junit-jupiter-api-5.5.1.pom
+/junit-jupiter-engine-5.5.1.pom
+/junit-jupiter-migrationsupport-5.5.1.pom
+/junit-jupiter-params-5.5.1.pom
+/junit-platform-commons-1.5.1.pom
+/junit-platform-console-1.5.1.pom
+/junit-platform-console-standalone-1.5.1.pom
+/junit-platform-engine-1.5.1.pom
+/junit-platform-launcher-1.5.1.pom
+/junit-platform-reporting-1.5.1.pom
+/junit-platform-runner-1.5.1.pom
+/junit-platform-suite-api-1.5.1.pom
+/junit-vintage-engine-5.5.1.pom
+/junit5-5.5.2.tar.gz
+/junit-jupiter-api-5.5.2.pom
+/junit-jupiter-engine-5.5.2.pom
+/junit-jupiter-migrationsupport-5.5.2.pom
+/junit-jupiter-params-5.5.2.pom
+/junit-platform-commons-1.5.2.pom
+/junit-platform-console-1.5.2.pom
+/junit-platform-console-standalone-1.5.2.pom
+/junit-platform-engine-1.5.2.pom
+/junit-platform-launcher-1.5.2.pom
+/junit-platform-reporting-1.5.2.pom
+/junit-platform-runner-1.5.2.pom
+/junit-platform-suite-api-1.5.2.pom
+/junit-vintage-engine-5.5.2.pom
+/junit-jupiter-5.5.2.pom
+/junit5-5.6.0.tar.gz
+/junit-bom-5.6.0.pom
+/junit-jupiter-api-5.6.0.pom
+/junit-jupiter-engine-5.6.0.pom
+/junit-jupiter-migrationsupport-5.6.0.pom
+/junit-jupiter-params-5.6.0.pom
+/junit-platform-commons-1.6.0.pom
+/junit-platform-console-1.6.0.pom
+/junit-platform-console-standalone-1.6.0.pom
+/junit-platform-engine-1.6.0.pom
+/junit-platform-launcher-1.6.0.pom
+/junit-platform-reporting-1.6.0.pom
+/junit-platform-runner-1.6.0.pom
+/junit-platform-suite-api-1.6.0.pom
+/junit-vintage-engine-5.6.0.pom
+/junit-jupiter-5.6.0.pom
+/junit5-5.6.2.tar.gz
+/junit-bom-5.6.2.pom
+/junit-jupiter-5.6.2.pom
+/junit-jupiter-api-5.6.2.pom
+/junit-jupiter-engine-5.6.2.pom
+/junit-jupiter-migrationsupport-5.6.2.pom
+/junit-jupiter-params-5.6.2.pom
+/junit-platform-commons-1.6.2.pom
+/junit-platform-console-1.6.2.pom
+/junit-platform-console-standalone-1.6.2.pom
+/junit-platform-engine-1.6.2.pom
+/junit-platform-launcher-1.6.2.pom
+/junit-platform-reporting-1.6.2.pom
+/junit-platform-runner-1.6.2.pom
+/junit-platform-suite-api-1.6.2.pom
+/junit-vintage-engine-5.6.2.pom
+/junit5-5.7.0.tar.gz
+/junit-bom-5.7.0.pom
+/junit-jupiter-5.7.0.pom
+/junit-jupiter-api-5.7.0.pom
+/junit-jupiter-engine-5.7.0.pom
+/junit-jupiter-migrationsupport-5.7.0.pom
+/junit-jupiter-params-5.7.0.pom
+/junit-platform-commons-1.7.0.pom
+/junit-platform-console-1.7.0.pom
+/junit-platform-console-standalone-1.7.0.pom
+/junit-platform-engine-1.7.0.pom
+/junit-platform-launcher-1.7.0.pom
+/junit-platform-reporting-1.7.0.pom
+/junit-platform-runner-1.7.0.pom
+/junit-platform-suite-api-1.7.0.pom
+/junit-vintage-engine-5.7.0.pom
+/junit5-5.7.1.tar.gz
+/junit-bom-5.7.1.pom
+/junit-jupiter-5.7.1.pom
+/junit-jupiter-api-5.7.1.pom
+/junit-jupiter-engine-5.7.1.pom
+/junit-jupiter-migrationsupport-5.7.1.pom
+/junit-jupiter-params-5.7.1.pom
+/junit-platform-commons-1.7.1.pom
+/junit-platform-console-1.7.1.pom
+/junit-platform-console-standalone-1.7.1.pom
+/junit-platform-engine-1.7.1.pom
+/junit-platform-launcher-1.7.1.pom
+/junit-platform-reporting-1.7.1.pom
+/junit-platform-runner-1.7.1.pom
+/junit-platform-suite-api-1.7.1.pom
+/junit-vintage-engine-5.7.1.pom
+/junit5-5.8.2.tar.gz
+/junit-platform-commons-1.8.2.pom
+/junit-platform-console-1.8.2.pom
+/junit-platform-console-standalone-1.8.2.pom
+/junit-platform-engine-1.8.2.pom
+/junit-platform-launcher-1.8.2.pom
+/junit-platform-runner-1.8.2.pom
+/junit-platform-suite-api-1.8.2.pom
+/junit-platform-reporting-1.8.2.pom
+/junit-platform-testkit-1.8.2.pom
+/junit-jupiter-5.8.2.pom
+/junit-jupiter-api-5.8.2.pom
+/junit-jupiter-engine-5.8.2.pom
+/junit-jupiter-migrationsupport-5.8.2.pom
+/junit-jupiter-params-5.8.2.pom
+/junit-vintage-engine-5.8.2.pom
+/junit-bom-5.8.2.pom
+/junit-platform-suite-commons-1.8.2.pom
--- a/.junit5.metadata
+++ b/.junit5.metadata
@ -1 +1,18 @@
-18b78a3008ae862717aa01d6933f16495540f26b SOURCES/junit5-5.4.0.tar.gz
+571f7d7aee77b51c083987e088f974c7eab1e578 junit5-5.8.2.tar.gz
+458a6bbdf025b0ea16dccc37dd816c4aeeb1b9e2 junit-platform-commons-1.8.2.pom
+58f6632413ff1da35ddc9817cb85267c8c87f9e7 junit-platform-console-1.8.2.pom
+a4c6817c919ea831f3baf72dfd79dbe155796c0e junit-platform-console-standalone-1.8.2.pom
+cac5ad8920b9d29bef295827ac0c55bf19406edc junit-platform-engine-1.8.2.pom
+c386c7cd65eb112b456c258bcaa6f1b0d1c09910 junit-platform-launcher-1.8.2.pom
+c55641e34e5f70bd8c5d147bd0d17a3e81942b27 junit-platform-runner-1.8.2.pom
+2074c0b8d6e54f11b8dd17ba3a2e43a21d3cdd28 junit-platform-suite-api-1.8.2.pom
+d426eb338758064c01b58ac5f0e7a246be0614b4 junit-platform-reporting-1.8.2.pom
+8f1818666d6b6277ac09b6650752ecd1f9ef6e80 junit-platform-testkit-1.8.2.pom
+f8b4bb5a33b48101149b208f016b750858fd31ae junit-platform-suite-commons-1.8.2.pom
+76f741aec2d72f250c63869c50936972a327e396 junit-jupiter-5.8.2.pom
+e975f1a2ffdd9d0d899d15ac3948bb0db79f5074 junit-jupiter-api-5.8.2.pom
+f299c9c7b6d9b7c240f5c281f10ba60b1b9865fb junit-jupiter-engine-5.8.2.pom
+9662d95d4eaef3dabed1cfbcff5ac21394a5370b junit-jupiter-migrationsupport-5.8.2.pom
+d27511a5e408d3e1a72b352ca9e2dd8eaad39639 junit-jupiter-params-5.8.2.pom
+781d9a6597a39ab3f3e039a1e4c48fae72df8d03 junit-vintage-engine-5.8.2.pom
+90eab8a5a400f15b8e1cb6e65af0ceb616f23bba junit-bom-5.8.2.pom
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+# junit5
+
+The junit5 package
--- a/SOURCES/junit-jupiter-api-5.4.0.pom
+++ b/SOURCES/junit-jupiter-api-5.4.0.pom
@ -1,74 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.jupiter</groupId>
-  <artifactId>junit-jupiter-api</artifactId>
-  <version>5.4.0</version>
-  <name>JUnit Jupiter API</name>
-  <description>Module "junit-jupiter-api" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opentest4j</groupId>
-      <artifactId>opentest4j</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-commons</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-jupiter-engine-5.4.0.pom
+++ b/SOURCES/junit-jupiter-engine-5.4.0.pom
@ -1,74 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.jupiter</groupId>
-  <artifactId>junit-jupiter-engine</artifactId>
-  <version>5.4.0</version>
-  <name>JUnit Jupiter Engine</name>
-  <description>Module "junit-jupiter-engine" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-engine</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-jupiter-migrationsupport-5.4.0.pom
+++ b/SOURCES/junit-jupiter-migrationsupport-5.4.0.pom
@ -1,74 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.jupiter</groupId>
-  <artifactId>junit-jupiter-migrationsupport</artifactId>
-  <version>5.4.0</version>
-  <name>JUnit Jupiter Migration Support</name>
-  <description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <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.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-jupiter-params-5.4.0.pom
+++ b/SOURCES/junit-jupiter-params-5.4.0.pom
@ -1,68 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.jupiter</groupId>
-  <artifactId>junit-jupiter-params</artifactId>
-  <version>5.4.0</version>
-  <name>JUnit Jupiter Params</name>
-  <description>Module "junit-jupiter-params" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-commons-1.4.0.pom
+++ b/SOURCES/junit-platform-commons-1.4.0.pom
@ -1,62 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-commons</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Commons</name>
-  <description>Module "junit-platform-commons" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-console-1.4.0.pom
+++ b/SOURCES/junit-platform-console-1.4.0.pom
@ -1,68 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-console</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Console</name>
-  <description>Module "junit-platform-console" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-reporting</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-console-standalone-1.4.0.pom
+++ b/SOURCES/junit-platform-console-standalone-1.4.0.pom
@ -1,54 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-console-standalone</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Console Standalone</name>
-  <description>Module "junit-platform-console-standalone" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-</project>
--- a/SOURCES/junit-platform-engine-1.4.0.pom
+++ b/SOURCES/junit-platform-engine-1.4.0.pom
@ -1,74 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-engine</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Engine API</name>
-  <description>Module "junit-platform-engine" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opentest4j</groupId>
-      <artifactId>opentest4j</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-commons</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-launcher-1.4.0.pom
+++ b/SOURCES/junit-platform-launcher-1.4.0.pom
@ -1,68 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-launcher</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Launcher</name>
-  <description>Module "junit-platform-launcher" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-engine</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-reporting-1.4.0.pom
+++ b/SOURCES/junit-platform-reporting-1.4.0.pom
@ -1,68 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-reporting</artifactId>
-  <version>1.4.0</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>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-runner-1.4.0.pom
+++ b/SOURCES/junit-platform-runner-1.4.0.pom
@ -1,80 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-runner</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Runner</name>
-  <description>Module "junit-platform-runner" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <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.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-suite-api</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-platform-suite-api-1.4.0.pom
+++ b/SOURCES/junit-platform-suite-api-1.4.0.pom
@ -1,62 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.platform</groupId>
-  <artifactId>junit-platform-suite-api</artifactId>
-  <version>1.4.0</version>
-  <name>JUnit Platform Suite API</name>
-  <description>Module "junit-platform-suite-api" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/junit-vintage-engine-5.4.0.pom
+++ b/SOURCES/junit-vintage-engine-5.4.0.pom
@ -1,74 +0,0 @@
-<?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">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.junit.vintage</groupId>
-  <artifactId>junit-vintage-engine</artifactId>
-  <version>5.4.0</version>
-  <name>JUnit Vintage Engine</name>
-  <description>Module "junit-vintage-engine" of JUnit 5.</description>
-  <url>https://junit.org/junit5/</url>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v2.0</name>
-      <url>http://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>
-  </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>
-  <dependencies>
-    <dependency>
-      <groupId>org.apiguardian</groupId>
-      <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-engine</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>
--- a/SOURCES/aggregator.pom
+++ b/SOURCES/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,6 +14,9 @@
    <module>junit-platform-reporting</module>
    <module>junit-platform-runner</module>
    <module>junit-platform-suite-api</module>
+    <module>junit-platform-testkit</module>
+    <module>junit-platform-suite-commons</module>
+    <module>junit-jupiter</module>
    <module>junit-jupiter-api</module>
    <module>junit-jupiter-engine</module>
    <module>junit-jupiter-migrationsupport</module>
--- a/SPECS/junit5.spec
+++ b/SPECS/junit5.spec
@ -1,19 +1,18 @@
+%bcond_with bootstrap
+
 # Component versions, taken from gradle.properties
 %global platform_version 1.%(v=%{version}; echo ${v:2})
 %global jupiter_version %{version}
 %global vintage_version %{version}

-# Build with or without the console modules
-# Disabled by default due to missing dep: info.picocli:picocli
-%bcond_with console
-
 Name:           junit5
-Version:        5.4.0
-Release:        1%{?dist}
+Version:        5.8.2
+Release:        2%{?dist}
 Summary:        Java regression testing framework
 License:        EPL-2.0
-URL:            http://junit.org/junit5/
+URL:            https://junit.org/junit5/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 Source0:        https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz

@ -28,31 +27,30 @@ 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-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
 # Vintage POM
 Source400:      https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/%{vintage_version}/junit-vintage-engine-%{vintage_version}.pom
+# BOM POM
+Source500:      https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom

+BuildRequires:  asciidoc
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.univocity:univocity-parsers)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apiguardian:apiguardian-api)
+BuildRequires:  mvn(org.assertj:assertj-core)
 BuildRequires:  mvn(org.opentest4j:opentest4j)
-
-%if %{with console}
-BuildRequires:  mvn(info.picocli:picocli)
-%endif
-
-BuildRequires:  asciidoc
-
-%if %{with console}
-# Explicit requires for javapackages-tools since junit5 script
-# uses /usr/share/java-utils/java-functions
-Requires:       javapackages-tools
 %endif

 %description
@ -84,13 +82,17 @@ 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 %{SOURCE210} junit-platform-suite-commons/pom.xml
+cp -p %{SOURCE300} junit-jupiter/pom.xml
 cp -p %{SOURCE301} junit-jupiter-api/pom.xml
 cp -p %{SOURCE302} junit-jupiter-engine/pom.xml
 cp -p %{SOURCE303} junit-jupiter-migrationsupport/pom.xml
 cp -p %{SOURCE304} junit-jupiter-params/pom.xml
 cp -p %{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
@ -98,20 +100,18 @@ 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 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

@ -126,14 +126,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %install
 %mvn_install

-%if %{with console}
-%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:jopt-simple %{name} true
-%endif
-
 %files -f .mfiles
-%if %{with console}
-%{_bindir}/%{name}
-%endif
 %license LICENSE.md LICENSE-notice.md

 %files javadoc -f .mfiles-javadoc
@ -143,6 +136,88 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*

 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Apr 22 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.8.2-1
+- Update to upstream version 5.8.2
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 5.7.1-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.7.1-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Fri May 14 2021 Marian Koncek <mkoncek@redhat.com> - 5.7.1-1
+- Update to upstream version 5.7.1
+
+* Fri Feb 19 2021 Mat Booth <mat.booth@redhat.com> - 5.7.1-1
+- Update to latest upstream release
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 5.7.0-1
+- Update to version 5.7.0.
+
+* Mon Sep 21 2020 Marian Koncek <mkoncek@redhat.com> - 5.7.0-1
+- Update to upstream version 5.7.0
+
+* Tue Aug 11 2020 Jerry James <loganjerry@gmail.com> - 5.6.2-4
+- Add org.junit.jupiter:junit-jupiter, org.junit.platform:junit-platform-testkit
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Marian Koncek <mkoncek@redhat.com> - 5.6.2-1
+- Update to upstream version 5.6.2
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.6.2-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 5.6.2-1
+- Update to version 5.6.2.
+
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 5.6.0-1
+- Update to upstream version 5.6.0
+
+* Mon Feb 17 2020 Alexander Scheel <ascheel@redhat.com> - 5.6.0-1
+- Update to version 5.6.0
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.5.2-3
+- Mass rebuild for javapackages-tools 201902
+
+* Mon Oct 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.5.2-2
+- Build and install junit-jupiter aggregator
+
+* Sun Oct 13 2019 Fabio Valentini <decathorpe@gmail.com> - 5.5.2-1
+- Update to version 5.5.2.
+
+* Wed Sep 11 2019 Marian Koncek <mkoncek@redhat.com> - 5.5.2-1
+- Update to upstream version 5.5.2
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 22 2019 Marian Koncek <mkoncek@redhat.com> - 5.5.1-1
+- Update to upstream version 5.5.1
+
+* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 5.4.2-1
+- Update to version 5.4.2
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.4.0-2
+- Mass rebuild for javapackages-tools 201901
+
 * Wed Mar 06 2019 Mat Booth <mat.booth@redhat.com> - 5.4.0-1
 - Update to latest upstream release
 - License switched to EPL only now the surefire provider was moved to the
--- a/18
+++ b/18
@ -0,0 +1,18 @@
+SHA512 (junit5-5.8.2.tar.gz) = d4e7bf23aa736ab17badef59f690cb0040e438d31368c4727b1209c774a30e0cdfea7f206901eb5af3714c019893ac4768d16e8207219662d885c19a66955f7e
+SHA512 (junit-platform-commons-1.8.2.pom) = 5e96390f5c34e888873f0ec353530753cc9f89a4ef404af6c8c9ba1458e80657eaf521fba0dad1580e4d5c8afe622bab120138fa5a0db1f7f94ad4ce7031f3af
+SHA512 (junit-platform-console-1.8.2.pom) = 43687de4c695980f8fde2e971608bd725b1e7919dec83724b52f7c9de86a283d3087171e9c5bf6cb5f3cb532c3fe0f59fdbc67f36c2597b2f44cca50624f0a73
+SHA512 (junit-platform-console-standalone-1.8.2.pom) = 4c432a85f3c4726f4554954a8154ad9236c6350105459ebfe029146f0b4d689ba072d3c539ceaf4d5fa3f058853642cdf1417ea5b790160dee2b7e7d0f8ac7f6
+SHA512 (junit-platform-engine-1.8.2.pom) = bb6b653ca6095cb62e234f17a4dc35c35345b506bb916b39b2d5417e091f0925cb5ede130361e072c3b624af4b959f55ac7db8dad9273838a7a83c55a8bf5248
+SHA512 (junit-platform-launcher-1.8.2.pom) = 3e570a2fca53ae661ae635304e3124c78332034c7693fdd46b3f6d50d9b2ad4b53536c52353156d6c92c21ebb4ed26fc8b6b1624c490f2b5531e07072cf1c2a9
+SHA512 (junit-platform-runner-1.8.2.pom) = 02a6028d46f8be109c37c5514a3403e3822a2c2ca44d7c9d5c4571c9ff1f804ca2f6781d1f968e992dcdeff8741363e10973352f100aab6ba26d339849b28a3e
+SHA512 (junit-platform-suite-api-1.8.2.pom) = 8c527d1320887d789e683332b815385fb9a294bb94532b3c89067e269f1dfa439f7927c18986eafcbe6b1666ad7d44190d7b9f74b16085345eb7abf6f7a7d59a
+SHA512 (junit-platform-reporting-1.8.2.pom) = 7f8001ed01398c6a69453a864d4fd8492dd5b017414380f420808fd70ed6c5d638c43951620c5d46512b760037b6f9e00516c0cdcfc4bcfba746c3c0c3a0d44d
+SHA512 (junit-platform-testkit-1.8.2.pom) = def48348c038be2e9a556c1e1c2aecc50b35ddaa679eba8a37d734a57389f3abbe94eff3ec9bc4738df9fea36b0c3d2400067de702f14b10b24002139975ec60
+SHA512 (junit-platform-suite-commons-1.8.2.pom) = ba1b4d72ea83c978d4d319aeb013e1e90510a4cf20a020c2df6b028760c5ca857c49f53d971e201ddb843f9b30e954de8b736a3ae64507af045ef7a81860a770
+SHA512 (junit-jupiter-5.8.2.pom) = 3903f9b9ebd5b8c97206bd93479831ee7f5b7ec0b06798a11e3d44b24c2f21e75f83221e8002af63d527c3ffeaedaa2d399331be2c92e108880ec49613ca2fe5
+SHA512 (junit-jupiter-api-5.8.2.pom) = 73cdbd4b6e0997f365a596a0ba1cea6a9b35e3a3b1a40beeadf666c879ac2bcda9f58b728ccb090e830737838de5cd8fd730d3176fb741fe54e9046ad6876ae3
+SHA512 (junit-jupiter-engine-5.8.2.pom) = ed8c1b54d8f62b55d53683e8b708dea79e52bed8d93e9960aebea6d7a5674218e49e67d2523e6b56e96aae675a31cd79ac831f603ce5bcdc3918af7e92139dc3
+SHA512 (junit-jupiter-migrationsupport-5.8.2.pom) = c66650bbf739d9f2bd0ce48ba1e453a98ee53b9d8d27a933f360343c05f7459a9ae0f5d0a572a3452202b48a9d587d2ba7b365a3d766e70d196495d6e6f7ee60
+SHA512 (junit-jupiter-params-5.8.2.pom) = cfa019ab389aaf2b4957b8002e15205a81e5b5108961865df723f7a2ee0bd4b994e68165100f196e878f637b599bdaabf5ab13dfbe9a49b8cbe99007f9363bac
+SHA512 (junit-vintage-engine-5.8.2.pom) = 9e6047047dee745e0b274091aa5ab12a9d25cf952c358419ba97706303196bb8b40d3d9d99cf2f40b85832952f2b0909e8cb929e63d86851667de0ad821f44a9
+SHA512 (junit-bom-5.8.2.pom) = cb9283ed1a16be7f3102c891e91ff1cc9df94175c45ca99186f3d80f67439aea598565aac1c3cba6812a71dde9aa89a68fd7a29808096a1d254b9cda847e19a2