pool/junit5
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1170140 from Java:packages:test

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1170140
OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=22
This commit is contained in:
Fridrich Strba 2024-04-25 11:24:28 +00:00 committed by Git OBS Bridge
parent b7002d380f
commit db4b8aa404
25 changed files with 442 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
0001-Drop-transitive-requirement-on-apiguardian.patch Normal file
View File

@ -0,0 +1,165 @@
From 58cb1677c9e0f1bb77b66f5e304ba695678d510e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 27 Feb 2023 14:39:29 +0100
Subject: [PATCH 1/2] Drop transitive requirement on apiguardian
---
.../src/module/org.junit.jupiter.api/module-info.java | 2 +-
.../module/org.junit.jupiter.migrationsupport/module-info.java | 2 +-
.../src/module/org.junit.jupiter.params/module-info.java | 2 +-
.../src/module/org.junit.platform.commons/module-info.java | 2 +-
.../src/module/org.junit.platform.engine/module-info.java | 2 +-
.../src/module/org.junit.platform.launcher/module-info.java | 2 +-
.../src/module/org.junit.platform.reporting/module-info.java | 2 +-
.../src/module/org.junit.platform.runner/module-info.java | 2 +-
.../src/module/org.junit.platform.suite.api/module-info.java | 2 +-
.../module/org.junit.platform.suite.commons/module-info.java | 2 +-
.../src/module/org.junit.platform.testkit/module-info.java | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
index b6856c7..25a1523 100644
--- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
@@ -12,7 +12,7 @@
* Defines JUnit Jupiter API for writing tests.
*/
module org.junit.jupiter.api {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.platform.commons;
requires transitive org.opentest4j;
diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
index 3ace009..25a86fa 100644
--- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
+++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
@@ -15,7 +15,7 @@
*/
module org.junit.jupiter.migrationsupport {
requires transitive junit; // 4
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.jupiter.api;
requires org.junit.platform.commons;
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
index 7f3ea05..572e8ed 100644
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
@@ -14,7 +14,7 @@
* @since 5.0
*/
module org.junit.jupiter.params {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.jupiter.api;
requires transitive org.junit.platform.commons;
diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
index f33ffd3..c25315a 100644
--- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
@@ -16,7 +16,7 @@
module org.junit.platform.commons {
requires java.logging;
requires java.management; // needed by RuntimeUtils to determine input arguments
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
exports org.junit.platform.commons;
exports org.junit.platform.commons.annotation;
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
index 0b6336c..6931626 100644
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
@@ -17,7 +17,7 @@
* @since 1.0
*/
module org.junit.platform.engine {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.platform.commons;
requires transitive org.opentest4j;
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
index 9501caf..c2fef28 100644
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
@@ -21,7 +21,7 @@
*/
module org.junit.platform.launcher {
requires transitive java.logging;
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.platform.commons;
requires transitive org.junit.platform.engine;
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
index 66c7494..2a6acd7 100644
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
@@ -15,7 +15,7 @@
*/
module org.junit.platform.reporting {
requires java.xml;
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires org.junit.platform.commons;
requires transitive org.junit.platform.engine;
requires transitive org.junit.platform.launcher;
diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
index 47edeb1..4313c64 100644
--- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
@@ -16,7 +16,7 @@
*/
module org.junit.platform.runner {
requires transitive junit; // 4
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.platform.launcher;
requires transitive org.junit.platform.suite.api;
requires org.junit.platform.suite.commons;
diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
index 9af8dae..cf50c08 100644
--- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
@@ -14,7 +14,7 @@
* @since 1.0
*/
module org.junit.platform.suite.api {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.junit.platform.commons;
exports org.junit.platform.suite.api;
diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
index b810efc..ccb6756 100644
--- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
@@ -14,7 +14,7 @@
* @since 1.8
*/
module org.junit.platform.suite.commons {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires org.junit.platform.suite.api;
requires org.junit.platform.commons;
requires org.junit.platform.engine;
diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
index c0ae318..0d4cf42 100644
--- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
@@ -15,7 +15,7 @@
* @uses org.junit.platform.engine.TestEngine
*/
module org.junit.platform.testkit {
- requires static transitive org.apiguardian.api;
+ requires static org.apiguardian.api;
requires transitive org.assertj.core;
requires org.junit.platform.commons;
requires transitive org.junit.platform.engine;
--
2.39.2

24
0002-Add-missing-module-static-requires.patch Normal file
View File

@ -0,0 +1,24 @@
From 2f5ad4483784985a299e9ed28429bb52da21564d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 27 Mar 2023 16:55:13 +0200
Subject: [PATCH 2/2] Add missing module static requires
---
.../src/module/org.junit.jupiter.params/module-info.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
index 572e8ed..90a3c3b 100644
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
@@ -15,6 +15,7 @@
*/
module org.junit.jupiter.params {
requires static org.apiguardian.api;
+ requires static univocity.parsers;
requires transitive org.junit.jupiter.api;
requires transitive org.junit.platform.commons;
--
2.39.2

53
aggregator.pom
View File

@ -1,11 +1,22 @@
<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>
<module>junit-platform-engine</module>
@ -14,21 +25,47 @@
<module>junit-platform-runner</module>
<module>junit-platform-suite-api</module>
<module>junit-platform-suite-commons</module>
<module>junit-jupiter</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>
<executions>
<execution>
<id>default-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>8</release>
<!--
(default-compile) for junit-jupiter module would fail because
there are no sources to compile and therefore the plugin would
include module-info in the first (Java 8) compile phase
-->
<useIncrementalCompilation>false</useIncrementalCompilation>
<excludes>
<exclude>**/module-info.java</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>module-info</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>9</release>
<includes>
<include>**/module-info.java</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>

38
junit-bom-5.8.2.pom → junit-bom-5.10.2.pom
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>

10
junit-jupiter-5.8.2.pom → junit-jupiter-5.10.2.pom
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>

8
junit-jupiter-api-5.8.2.pom → junit-jupiter-api-5.10.2.pom
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>

8
junit-jupiter-engine-5.8.2.pom → junit-jupiter-engine-5.10.2.pom
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>

6
junit-jupiter-migrationsupport-5.8.2.pom → junit-jupiter-migrationsupport-5.10.2.pom
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>

6
junit-jupiter-params-5.8.2.pom → junit-jupiter-params-5.10.2.pom
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>

4
junit-platform-commons-1.8.2.pom → junit-platform-commons-1.10.2.pom
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>

6
junit-platform-console-1.8.2.pom → junit-platform-console-1.10.2.pom
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>

2
junit-platform-console-standalone-1.8.2.pom → junit-platform-console-standalone-1.10.2.pom
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>

8
junit-platform-engine-1.8.2.pom → junit-platform-engine-1.10.2.pom
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>

6
junit-platform-launcher-1.8.2.pom → junit-platform-launcher-1.10.2.pom
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>

6
junit-platform-reporting-1.8.2.pom → junit-platform-reporting-1.10.2.pom
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>

10
junit-platform-runner-1.8.2.pom → junit-platform-runner-1.10.2.pom
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>

6
junit-platform-suite-api-1.8.2.pom → junit-platform-suite-api-1.10.2.pom
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>

10
junit-platform-suite-commons-1.8.2.pom → junit-platform-suite-commons-1.10.2.pom
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>

101
junit-platform-testkit-1.10.2.pom Normal file
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>

6
junit-vintage-engine-5.8.2.pom → junit-vintage-engine-5.10.2.pom
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
View File

Binary file not shown.

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

Binary file not shown.

4
junit5-build.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:134531cc022eda9ccf4a73f7aad47ea7468e78cd1a09e8fd3e9b80072001c3ac
size 2056
oid sha256:0f3a6590b022f67bb1a5047ba8afbf6f731b43023fc63a54f3912a34dd3421ad
size 2128

44
junit5.spec
View File

@ -22,11 +22,11 @@
%else
%bcond_with bootstrap
%endif
%global platform_version 1.8.2
%global platform_version 1.10.2
%global jupiter_version %{version}
%global vintage_version %{version}
%global base_name junit5
Version: 5.8.2
Version: 5.10.2
Release: 0
License: EPL-2.0
Group: Development/Libraries/Java
@ -44,7 +44,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
@ -55,7 +56,8 @@ 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
Patch1: 0001-Drop-transitive-requirement-on-apiguardian.patch
Patch2: 0002-Add-missing-module-static-requires.patch
BuildRequires: apiguardian
BuildRequires: fdupes
BuildRequires: opentest4j
@ -73,9 +75,11 @@ 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(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apiguardian:apiguardian-api)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.opentest4j:opentest4j)
%endif
%description
@ -106,7 +110,8 @@ JUnit 5 User Guide.
%prep
%setup -q -n %{base_name}-r%{version} -a1
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
find -name \*.jar -delete
cp -p %{SOURCE100} pom.xml
@ -118,7 +123,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
@ -128,21 +134,34 @@ 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
# Disable the console modules
%pom_disable_module junit-platform-console
%pom_disable_module junit-platform-console-standalone
%pom_disable_module junit-platform-reporting
# Disable the modules built in -minimal package
%pom_disable_module junit-platform-commons
%pom_disable_module junit-jupiter-api
%{mvn_package} :junit-bom bom
%{mvn_package} :aggregator __noinstall
@ -179,7 +198,6 @@ done
%else
%mvn_install
%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:picocli %{name} true
%fdupes -s documentation/src/docs/
%endif
@ -191,8 +209,6 @@ done
%if %{without bootstrap}
%{_bindir}/%{name}
%files bom -f .mfiles-bom
%license LICENSE.md LICENSE-notice.md

11
unreported-exception.patch
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);