Sync from SUSE:SLFO:Main junit5 revision ac7fdc71a9311a4cdc27d8f3e72ce2f2

This commit is contained in:
Adrian Schröter 2024-05-31 14:46:23 +02:00
parent b6fbdf78a3
commit fdb9ee18f3
28 changed files with 622 additions and 127 deletions

View File

@ -0,0 +1,165 @@
From 288fa4bafe414f26c99687b467feb25f512cb87d 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/3] 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 b6856c78a1..25a1523e0f 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 3ace009eb0..25a86fabf4 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 7f3ea0550c..572e8ed019 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 f33ffd314f..c25315a6a2 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 46c2069448..f359539a76 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 9d79f3f416..872e5bee3c 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
@@ -23,7 +23,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 66c749470b..2a6acd7d7e 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 47edeb10e7..4313c642ee 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 9af8daea9d..cf50c08f80 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 b810efc7f0..ccb6756022 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 2a53f5ad64..729efae46b 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.44.0

View File

@ -0,0 +1,24 @@
From b0d01c205df1916202bbc874472bf6a973908b4d 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/3] 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 572e8ed019..90a3c3b101 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.44.0

View File

@ -0,0 +1,31 @@
From c3d9035f7e39e17f8ee12336b2f4de9ad65e521d Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Sat, 20 Apr 2024 15:54:00 +0200
Subject: [PATCH 3/3] Bump open-test-reporting to 0.1.0-M2
Resolves #3788.
---
.../open/xml/OpenTestReportGeneratingListener.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
index 05c452880a..35c995f3aa 100644
--- a/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
+++ b/junit-platform-reporting/src/main/java/org/junit/platform/reporting/open/xml/OpenTestReportGeneratingListener.java
@@ -236,10 +236,9 @@ public class OpenTestReportGeneratingListener implements TestExecutionListener {
public void reportingEntryPublished(TestIdentifier testIdentifier, ReportEntry entry) {
String id = inProgressIds.get(testIdentifier.getUniqueIdObject());
eventsFileWriter.append(reported(id, Instant.now()), //
- reported -> reported.append(attachments(), attachments -> attachments.append(data(), data -> {
- data.withTime(entry.getTimestamp());
- entry.getKeyValuePairs().forEach(data::addEntry);
- })));
+ reported -> reported.append(attachments(), //
+ attachments -> attachments.append(data(entry.getTimestamp()), //
+ data -> entry.getKeyValuePairs().forEach(data::addEntry))));
}
@Override
--
2.44.0

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>bootstrap</package>
</multibuild>

View File

@ -1,11 +1,21 @@
<project>
<?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'>
<modelVersion>4.0.0</modelVersion>
<groupId>org.fedoraproject.xmvn.junit5</groupId>
<artifactId>aggregator</artifactId>
<version>1.0.0</version>
<version>any</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>
@ -15,22 +25,59 @@
<module>junit-platform-runner</module>
<module>junit-platform-suite-api</module>
<module>junit-platform-suite-commons</module>
<module>junit-jupiter</module>
<module>junit-jupiter-api</module>
<module>junit-jupiter-engine</module>
<module>junit-jupiter-migrationsupport</module>
<module>junit-jupiter-params</module>
<module>junit-platform-testkit</module>
<module>junit-vintage-engine</module>
</modules>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
<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>java9</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
</compileSourceRoots>
</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>
<artifactId>maven-jar-plugin</artifactId>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.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>
@ -67,92 +67,92 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-jfr</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-reporting</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-testkit</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Jupiter (Aggregator)</name>
<description>Module "junit-jupiter" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.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.8.2</version>
<version>5.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>

View File

@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Jupiter API</name>
<description>Module "junit-jupiter-api" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -75,13 +75,13 @@
<dependency>
<groupId>org.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Jupiter Engine</name>
<description>Module "junit-jupiter-engine" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -75,13 +75,13 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-migrationsupport</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Jupiter Migration Support</name>
<description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -82,7 +82,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Jupiter Params</name>
<description>Module "junit-jupiter-params" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -75,7 +75,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Commons</name>
<description>Module "junit-platform-commons" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Console</name>
<description>Module "junit-platform-console" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-reporting</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-console-standalone</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Console Standalone</name>
<description>Module "junit-platform-console-standalone" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Engine API</name>
<description>Module "junit-platform-engine" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,13 +76,13 @@
<dependency>
<groupId>org.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Launcher</name>
<description>Module "junit-platform-launcher" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-reporting</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Reporting</name>
<description>Module "junit-platform-reporting" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-runner</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Runner</name>
<description>Module "junit-platform-runner" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -82,13 +82,13 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -100,7 +100,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Suite API</name>
<description>Module "junit-platform-suite-api" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-commons</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<name>JUnit Platform Suite Commons</name>
<description>Module "junit-platform-suite-commons" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -88,13 +88,13 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>runtime</scope>
</dependency>
</dependencies>

View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This module was also published with a richer model, Gradle metadata, -->
<!-- which should be used instead. Do not delete the following line which -->
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
<!-- that they should prefer consuming it instead. -->
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-testkit</artifactId>
<version>1.10.2</version>
<name>JUnit Platform Test Kit</name>
<description>Module "junit-platform-testkit" 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.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.opentest4j</groupId>
<artifactId>opentest4j</artifactId>
<version>1.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apiguardian</groupId>
<artifactId>apiguardian-api</artifactId>
<version>1.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

View File

@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<name>JUnit Vintage Engine</name>
<description>Module "junit-vintage-engine" of JUnit 5.</description>
<url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.8.2</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -76,7 +76,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-engine</artifactId>
<version>1.8.2</version>
<version>1.10.2</version>
<scope>compile</scope>
</dependency>
<dependency>

BIN
junit5-5.10.2.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
junit5-5.8.2.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
junit5-build.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,69 @@
-------------------------------------------------------------------
Fri May 24 05:33:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Let junit5 require junit5-minimal to avoid conflict of providers
-------------------------------------------------------------------
Tue Apr 30 16:25:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Update to upstream version 5.10.2
* Changes:
+ XML reports in new Open Test Reporting format
+ Configurable cleanup mode for @TempDir
+ Configurable thread mode for @Timeout
+ Conditional execution based on OS architectures
+ New TestInstancePreConstructCallback extension API
+ Reusable parameter resolution for custom extension methods
via ExecutableInvoker
+ Parameter injection for @MethodSource methods
+ New IterationSelector
+ Various improvements to ConsoleLauncher
+ Promotion of various experimental APIs to stable
+ New LauncherInterceptor SPI
+ New testfeed details mode for ConsoleLauncher
+ New ConsoleLauncher subcommand for test discovery without
execution
+ Dry-run mode for test execution
+ New NamespacedHierarchicalStore for use in third-party test
engines
+ Stacktrace pruning to hide internal JUnit calls
+ New @SelectMethod support in test @Suite classes.
+ New TempDirFactory SPI for customizing how temporary
directories are created
+ Failure threshold for @RepeatedTest
+ New convenience base classes for implementing
ArgumentsProvider and ArgumentConverter
+ Custom class loader support for class/method selectors,
@MethodSource, @EnabledIf, and @DisabledIf
+ Improved configurability of parallel execution
+ Numerous bug fixes and minor improvements
- Added patches:
* 0001-Drop-transitive-requirement-on-apiguardian.patch
* 0002-Add-missing-module-static-requires.patch
+ fix dependencies in module-info.java files
* 0003-Bump-open-test-reporting-to-0.1.0-M2.patch
+ fix build with the latest open-test-reporting milestone
- Removed patch:
* unreported-exception.patch
+ not needed any more with this version
-------------------------------------------------------------------
Mon Apr 29 12:16:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- The binaries are compatible with java 1.8
-------------------------------------------------------------------
Tue Apr 9 20:21:54 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Split into two _multibuild packages so that we can use the
junit-jupiter-api pretty early in the build without creating
build cycles.
-------------------------------------------------------------------
Wed Feb 21 10:48:09 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Thu Oct 26 12:21:48 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package junit5
#
# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,18 +16,26 @@
#
%global platform_version 1.8.2
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "bootstrap"
%bcond_without bootstrap
%else
%bcond_with bootstrap
%endif
%global platform_version 1.10.2
%global jupiter_version %{version}
%global vintage_version %{version}
%bcond_without console
Name: junit5
Version: 5.8.2
%global base_name junit5
# The automatic requires would be java-headless >= 9, but the
# binaries are java 8 compatible
%define __requires_exclude java-headless
Version: 5.10.2
Release: 0
Summary: Java regression testing framework
License: EPL-2.0
Group: Development/Libraries/Java
URL: https://junit.org/junit5/
Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
Source0: https://github.com/junit-team/%{base_name}/archive/r%{version}/%{base_name}-%{version}.tar.gz
Source1: %{base_name}-build.tar.xz
# Aggregator POM (used for packaging only)
Source100: aggregator.pom
# Platform POMs
@ -39,7 +47,8 @@ Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform
Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-runner/%{platform_version}/junit-platform-runner-%{platform_version}.pom
Source207: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/%{platform_version}/junit-platform-suite-api-%{platform_version}.pom
Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom
Source209: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-commons/%{platform_version}/junit-platform-suite-commons-%{platform_version}.pom
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
@ -50,19 +59,37 @@ Source304: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-p
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
Patch0: unreported-exception.patch
BuildRequires: asciidoc
Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch
Patch2: 0002-Add-missing-module-static-requires.patch
Patch3: 0003-Bump-open-test-reporting-to-0.1.0-M2.patch
BuildRequires: apiguardian >= 1.1.2
BuildRequires: fdupes
BuildRequires: java-devel >= 9
BuildRequires: opentest4j
Requires: java-headless >= 1.8
Requires: javapackages-tools
BuildArch: noarch
%if %{with bootstrap}
Name: %{base_name}-minimal
Summary: Java regression testing framework (minimal)
BuildRequires: ant
BuildRequires: javapackages-local >= 6
%else
Name: %{base_name}
Summary: Java regression testing framework
BuildRequires: %{base_name}-minimal
BuildRequires: asciidoc
BuildRequires: maven-local
BuildRequires: mvn(com.univocity:univocity-parsers)
BuildRequires: mvn(info.picocli:picocli)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.sf.jopt-simple:jopt-simple)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apiguardian:apiguardian-api)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.opentest4j.reporting:open-test-reporting-events)
BuildRequires: mvn(org.opentest4j:opentest4j)
BuildArch: noarch
%if %{with console}
BuildRequires: mvn(info.picocli:picocli)
Requires: javapackages-tools
Requires: %{base_name}-minimal >= %{version}
%endif
%description
@ -92,8 +119,10 @@ Requires: %{name}-javadoc = %{version}-%{release}
JUnit 5 User Guide.
%prep
%setup -q -n %{name}-r%{version}
%patch0 -p1
%setup -q -n %{base_name}-r%{version} -a1
%patch -P 1 -p1
%patch -P 2 -p1
%patch -P 3 -p1
find -name \*.jar -delete
cp -p %{SOURCE100} pom.xml
@ -105,7 +134,8 @@ cp -p %{SOURCE205} junit-platform-launcher/pom.xml
cp -p %{SOURCE206} junit-platform-runner/pom.xml
cp -p %{SOURCE207} junit-platform-suite-api/pom.xml
cp -p %{SOURCE208} junit-platform-reporting/pom.xml
cp -p %{SOURCE209} junit-platform-suite-commons/pom.xml
cp -p %{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
@ -115,32 +145,44 @@ cp -p %{SOURCE400} junit-vintage-engine/pom.xml
cp -p %{SOURCE500} junit-bom/pom.xml
for pom in $(find -mindepth 2 -name pom.xml | grep -v tests/); do
module=$(dirname $pom)
if [ -d ${module}/src/module ]; then
mkdir -p ${module}/src/main/java
mv ${module}/src/module/*/module-info.java ${module}/src/main/java/
fi
# 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
%pom_add_parent org.fedoraproject.xmvn.junit5:aggregator:any $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
sed -i s/runtime/compile/ $pom
%pom_xpath_set -f "pom:dependency[pom:scope='runtime']/pom:scope" compile $pom
done
%pom_remove_parent junit-bom
# Add deps which are shaded by upstream and therefore not present in POMs.
%pom_add_dep info.picocli:picocli:4.0.4 junit-platform-console
%pom_add_dep com.univocity:univocity-parsers:2.9.1 junit-jupiter-params
%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
%pom_add_dep org.opentest4j.reporting:open-test-reporting-events:0.1.0-M2 junit-platform-reporting
%pom_add_dep info.picocli:picocli:4.7.5 junit-platform-console
%if %{without console}
# Disable the console modules
%pom_disable_module junit-platform-console
# Disable the standalone console (just jar with shaded dependencies)
%pom_disable_module junit-platform-console-standalone
%endif
# Disable the modules built in -minimal package
%pom_disable_module junit-platform-commons
%pom_disable_module junit-jupiter-api
%{mvn_package} :aggregator __noinstall
%{mvn_package} :junit-bom bom
%{mvn_package} :aggregator __noinstall
%build
%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib opentest4j/opentest4j apiguardian/apiguardian-api
%{ant} package javadoc
%else
%{mvn_build} -f -- \
-Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
-Dencoding=utf-8 -Dsource=8
@ -149,22 +191,38 @@ done
# still produces readable docs.
asciidoc documentation/src/docs/asciidoc/index.adoc || :
ln -s ../../javadoc/junit5 documentation/src/docs/api
%endif
%install
%if %{with bootstrap}
install -dm 0755 %{buildroot}%{_javadir}/%{base_name}
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{base_name}
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
for i in junit-platform-commons junit-jupiter-api; do
install -pm 0644 ${i}/target/${i}*.jar %{buildroot}%{_javadir}/%{base_name}/${i}.jar
%{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{base_name}/${i}.pom
%add_maven_depmap %{base_name}/${i}.pom %{base_name}/${i}.jar
cp -r ${i}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/${i}
done
%else
%mvn_install
%fdupes -s %{buildroot}%{_javadocdir}
%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:hamcrest:opentest4j:open-test-reporting:picocli:jopt-simple:assertj-core %{name} true
%fdupes -s documentation/src/docs/
%if %{with console}
%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:picocli %{name} true
%endif
%fdupes -s %{buildroot}%{_javadocdir}
%files -f .mfiles
%if %{with console}
%{_bindir}/%{name}
%endif
%license LICENSE.md LICENSE-notice.md
%if %{without bootstrap}
%{_bindir}/%{name}
%files bom -f .mfiles-bom
%license LICENSE.md LICENSE-notice.md
@ -174,4 +232,12 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
%files guide
%doc documentation/src/docs/*
%else
%files javadoc
%{_javadocdir}/%{name}
%license LICENSE.md LICENSE-notice.md
%endif
%changelog

View File

@ -1,11 +0,0 @@
--- junit5-r5.8.2/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java 2023-10-26 14:17:20.653152124 +0200
+++ junit5-r5.8.2/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java 2023-10-26 14:18:08.740160341 +0200
@@ -316,7 +316,7 @@
}
@SuppressWarnings("unchecked")
- private SerializedForm(ObjectInputStream.GetField fields) throws IOException {
+ private SerializedForm(ObjectInputStream.GetField fields) throws ClassNotFoundException, IOException {
this.uniqueId = (String) fields.get("uniqueId", null);
this.parentId = (String) fields.get("parentId", null);
this.displayName = (String) fields.get("displayName", null);