Compare commits
No commits in common. 'cs10' and 'c9' have entirely different histories.
@ -1 +1 @@
|
||||
SOURCES/junit5-5.10.2.tar.gz
|
||||
SOURCES/junit5-5.7.1.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
6243f53510959ec6c6bb98de0fd79174ac829637 SOURCES/junit5-5.10.2.tar.gz
|
||||
d315c35d1dc942fd67aab184415b2ebe29abb9a0 SOURCES/junit5-5.7.1.tar.gz
|
||||
|
||||
@ -1,165 +0,0 @@
|
||||
From 58cb1677c9e0f1bb77b66f5e304ba695678d510e Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
Date: Mon, 27 Feb 2023 14:39:29 +0100
|
||||
Subject: [PATCH 1/2] Drop transitive requirement on apiguardian
|
||||
|
||||
---
|
||||
.../src/module/org.junit.jupiter.api/module-info.java | 2 +-
|
||||
.../module/org.junit.jupiter.migrationsupport/module-info.java | 2 +-
|
||||
.../src/module/org.junit.jupiter.params/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.commons/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.engine/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.launcher/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.reporting/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.runner/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.suite.api/module-info.java | 2 +-
|
||||
.../module/org.junit.platform.suite.commons/module-info.java | 2 +-
|
||||
.../src/module/org.junit.platform.testkit/module-info.java | 2 +-
|
||||
11 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
|
||||
index b6856c7..25a1523 100644
|
||||
--- a/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
|
||||
+++ b/junit-jupiter-api/src/module/org.junit.jupiter.api/module-info.java
|
||||
@@ -12,7 +12,7 @@
|
||||
* Defines JUnit Jupiter API for writing tests.
|
||||
*/
|
||||
module org.junit.jupiter.api {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
requires transitive org.opentest4j;
|
||||
|
||||
diff --git a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
|
||||
index 3ace009..25a86fa 100644
|
||||
--- a/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
|
||||
+++ b/junit-jupiter-migrationsupport/src/module/org.junit.jupiter.migrationsupport/module-info.java
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
module org.junit.jupiter.migrationsupport {
|
||||
requires transitive junit; // 4
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.jupiter.api;
|
||||
requires org.junit.platform.commons;
|
||||
|
||||
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
index 7f3ea05..572e8ed 100644
|
||||
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
@@ -14,7 +14,7 @@
|
||||
* @since 5.0
|
||||
*/
|
||||
module org.junit.jupiter.params {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.jupiter.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
|
||||
diff --git a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
|
||||
index f33ffd3..c25315a 100644
|
||||
--- a/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
|
||||
+++ b/junit-platform-commons/src/module/org.junit.platform.commons/module-info.java
|
||||
@@ -16,7 +16,7 @@
|
||||
module org.junit.platform.commons {
|
||||
requires java.logging;
|
||||
requires java.management; // needed by RuntimeUtils to determine input arguments
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
|
||||
exports org.junit.platform.commons;
|
||||
exports org.junit.platform.commons.annotation;
|
||||
diff --git a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
|
||||
index 0b6336c..6931626 100644
|
||||
--- a/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
|
||||
+++ b/junit-platform-engine/src/module/org.junit.platform.engine/module-info.java
|
||||
@@ -17,7 +17,7 @@
|
||||
* @since 1.0
|
||||
*/
|
||||
module org.junit.platform.engine {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
requires transitive org.opentest4j;
|
||||
|
||||
diff --git a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
|
||||
index 9501caf..c2fef28 100644
|
||||
--- a/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
|
||||
+++ b/junit-platform-launcher/src/module/org.junit.platform.launcher/module-info.java
|
||||
@@ -21,7 +21,7 @@
|
||||
*/
|
||||
module org.junit.platform.launcher {
|
||||
requires transitive java.logging;
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
requires transitive org.junit.platform.engine;
|
||||
|
||||
diff --git a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
|
||||
index 66c7494..2a6acd7 100644
|
||||
--- a/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
|
||||
+++ b/junit-platform-reporting/src/module/org.junit.platform.reporting/module-info.java
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
module org.junit.platform.reporting {
|
||||
requires java.xml;
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires org.junit.platform.commons;
|
||||
requires transitive org.junit.platform.engine;
|
||||
requires transitive org.junit.platform.launcher;
|
||||
diff --git a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
|
||||
index 47edeb1..4313c64 100644
|
||||
--- a/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
|
||||
+++ b/junit-platform-runner/src/module/org.junit.platform.runner/module-info.java
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
module org.junit.platform.runner {
|
||||
requires transitive junit; // 4
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.platform.launcher;
|
||||
requires transitive org.junit.platform.suite.api;
|
||||
requires org.junit.platform.suite.commons;
|
||||
diff --git a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
|
||||
index 9af8dae..cf50c08 100644
|
||||
--- a/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
|
||||
+++ b/junit-platform-suite-api/src/module/org.junit.platform.suite.api/module-info.java
|
||||
@@ -14,7 +14,7 @@
|
||||
* @since 1.0
|
||||
*/
|
||||
module org.junit.platform.suite.api {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
|
||||
exports org.junit.platform.suite.api;
|
||||
diff --git a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
|
||||
index b810efc..ccb6756 100644
|
||||
--- a/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
|
||||
+++ b/junit-platform-suite-commons/src/module/org.junit.platform.suite.commons/module-info.java
|
||||
@@ -14,7 +14,7 @@
|
||||
* @since 1.8
|
||||
*/
|
||||
module org.junit.platform.suite.commons {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires org.junit.platform.suite.api;
|
||||
requires org.junit.platform.commons;
|
||||
requires org.junit.platform.engine;
|
||||
diff --git a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
|
||||
index c0ae318..0d4cf42 100644
|
||||
--- a/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
|
||||
+++ b/junit-platform-testkit/src/module/org.junit.platform.testkit/module-info.java
|
||||
@@ -15,7 +15,7 @@
|
||||
* @uses org.junit.platform.engine.TestEngine
|
||||
*/
|
||||
module org.junit.platform.testkit {
|
||||
- requires static transitive org.apiguardian.api;
|
||||
+ requires static org.apiguardian.api;
|
||||
requires transitive org.assertj.core;
|
||||
requires org.junit.platform.commons;
|
||||
requires transitive org.junit.platform.engine;
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From 2f5ad4483784985a299e9ed28429bb52da21564d Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Mon, 27 Mar 2023 16:55:13 +0200
|
||||
Subject: [PATCH 2/2] Add missing module static requires
|
||||
|
||||
---
|
||||
.../src/module/org.junit.jupiter.params/module-info.java | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
index 572e8ed..90a3c3b 100644
|
||||
--- a/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
+++ b/junit-jupiter-params/src/module/org.junit.jupiter.params/module-info.java
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
module org.junit.jupiter.params {
|
||||
requires static org.apiguardian.api;
|
||||
+ requires static univocity.parsers;
|
||||
requires transitive org.junit.jupiter.api;
|
||||
requires transitive org.junit.platform.commons;
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@ -0,0 +1,89 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<!-- This module was also published with a richer model, Gradle metadata, -->
|
||||
<!-- which should be used instead. Do not delete the following line which -->
|
||||
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
|
||||
<!-- that they should prefer consuming it instead. -->
|
||||
<!-- do_not_remove: published-with-gradle-metadata -->
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-reporting</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<name>JUnit Platform Reporting</name>
|
||||
<description>Module "junit-platform-reporting" of JUnit 5.</description>
|
||||
<url>https://junit.org/junit5/</url>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Eclipse Public License v2.0</name>
|
||||
<url>https://www.eclipse.org/legal/epl-v20.html</url>
|
||||
</license>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer>
|
||||
<id>bechte</id>
|
||||
<name>Stefan Bechtold</name>
|
||||
<email>stefan.bechtold@me.com</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>jlink</id>
|
||||
<name>Johannes Link</name>
|
||||
<email>business@johanneslink.net</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>marcphilipp</id>
|
||||
<name>Marc Philipp</name>
|
||||
<email>mail@marcphilipp.de</email>
|
||||
</developer>
|
||||
<developer>
|
||||
<id>mmerdes</id>
|
||||
<name>Matthias Merdes</name>
|
||||
<email>matthias.merdes@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.7.1</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apiguardian</groupId>
|
||||
<artifactId>apiguardian-api</artifactId>
|
||||
<version>1.1.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-launcher</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@ -1,101 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<!-- This module was also published with a richer model, Gradle metadata, -->
|
||||
<!-- which should be used instead. Do not delete the following line which -->
|
||||
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
|
||||
<!-- that they should prefer consuming it instead. -->
|
||||
<!-- do_not_remove: published-with-gradle-metadata -->
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-suite-commons</artifactId>
|
||||
<version>1.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>
|
||||
<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.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>
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-engine</artifactId>
|
||||
<version>1.10.2</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.platform</groupId>
|
||||
<artifactId>junit-platform-suite-api</artifactId>
|
||||
<version>1.10.2</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
Loading…
Reference in new issue