import junit5-5.6.2-2.module+el8.2.1+7436+4afdca1f

2020-11-12 04:24:32 -05:00 · 2020-11-12 04:24:32 -05:00 · 55e0e69371
commit 55e0e69371
parent f9f465f40a
18 changed files with 62 additions and 87 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/junit5-5.6.0.tar.gz
+SOURCES/junit5-5.6.2.tar.gz
--- a/.junit5.metadata
+++ b/.junit5.metadata
@ -1 +1 @@
-8017967c8ccd9cd74e2de557b18cd02715186a0d SOURCES/junit5-5.6.0.tar.gz
+b07dc3ecefa9ac619044aba6b8e8810d69133774 SOURCES/junit5-5.6.2.tar.gz
--- a/SOURCES/0001-Allow-building-against-old-univocity-parsers.patch
+++ b/SOURCES/0001-Allow-building-against-old-univocity-parsers.patch
@ -1,25 +0,0 @@
-From 0b862ac5e0964a31727d92f7260223f076203a93 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Wed, 13 May 2020 13:28:45 +0100
-Subject: [PATCH] Allow building against old univocity-parsers
-
---
- .../org/junit/jupiter/params/provider/CsvParserFactory.java     | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
-index d1463d5..147db97 100644
--- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
-+++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/provider/CsvParserFactory.java
-@@ -59,7 +59,7 @@ class CsvParserFactory {
- 			String emptyValue) {
- 
- 		CsvParserSettings settings = new CsvParserSettings();
-		settings.getFormat().setDelimiter(delimiter);
-+		settings.getFormat().setDelimiter(delimiter.charAt(0));
- 		settings.getFormat().setLineSeparator(lineSeparator);
- 		settings.getFormat().setQuote(quote);
- 		settings.getFormat().setQuoteEscape(quote);
-- 
-2.26.2
-
--- a/SOURCES/junit-bom-5.6.2.pom
+++ b/SOURCES/junit-bom-5.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit</groupId>
  <artifactId>junit-bom</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <packaging>pom</packaging>
  <name>JUnit 5 (Bill of Materials)</name>
  <description>This Bill of Materials POM can be used to ease dependency management when referencing multiple JUnit artifacts using Gradle or Maven.</description>
@ -67,72 +67,72 @@
      <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-api</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-engine</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-migrationsupport</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.jupiter</groupId>
        <artifactId>junit-jupiter-params</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-commons</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-console</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-engine</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-launcher</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-reporting</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-runner</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-suite-api</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.platform</groupId>
        <artifactId>junit-platform-testkit</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.2</version>
      </dependency>
      <dependency>
        <groupId>org.junit.vintage</groupId>
        <artifactId>junit-vintage-engine</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
      </dependency>
    </dependencies>
  </dependencyManagement>
--- a/SOURCES/junit-jupiter-api-5.6.2.pom
+++ b/SOURCES/junit-jupiter-api-5.6.2.pom
@ -8,7 +8,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-api</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <name>JUnit Jupiter API</name>
  <description>Module "junit-jupiter-api" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -87,7 +87,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-commons</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-jupiter-engine-5.6.2.pom
+++ b/SOURCES/junit-jupiter-engine-5.6.2.pom
@ -8,7 +8,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-engine</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <name>JUnit Jupiter Engine</name>
  <description>Module "junit-jupiter-engine" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -81,13 +81,13 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-engine</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.0</version>
+      <version>5.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-jupiter-migrationsupport-5.6.2.pom
+++ b/SOURCES/junit-jupiter-migrationsupport-5.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-migrationsupport</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <name>JUnit Jupiter Migration Support</name>
  <description>Module "junit-jupiter-migrationsupport" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -71,7 +71,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -93,7 +93,7 @@
    <dependency>
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.0</version>
+      <version>5.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-jupiter-params-5.6.2.pom
+++ b/SOURCES/junit-jupiter-params-5.6.2.pom
@ -8,7 +8,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.jupiter</groupId>
  <artifactId>junit-jupiter-params</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <name>JUnit Jupiter Params</name>
  <description>Module "junit-jupiter-params" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -65,7 +65,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -81,7 +81,7 @@
    <dependency>
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.0</version>
+      <version>5.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-commons-1.6.2.pom
+++ b/SOURCES/junit-platform-commons-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-commons</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Commons</name>
  <description>Module "junit-platform-commons" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
--- a/SOURCES/junit-platform-console-1.6.2.pom
+++ b/SOURCES/junit-platform-console-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-console</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Console</name>
  <description>Module "junit-platform-console" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -82,7 +82,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-reporting</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-console-standalone-1.6.2.pom
+++ b/SOURCES/junit-platform-console-standalone-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-console-standalone</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Console Standalone</name>
  <description>Module "junit-platform-console-standalone" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
--- a/SOURCES/junit-platform-engine-1.6.2.pom
+++ b/SOURCES/junit-platform-engine-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-engine</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Engine API</name>
  <description>Module "junit-platform-engine" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -88,7 +88,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-commons</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-launcher-1.6.2.pom
+++ b/SOURCES/junit-platform-launcher-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-launcher</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Launcher</name>
  <description>Module "junit-platform-launcher" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -82,7 +82,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-engine</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-reporting-1.6.2.pom
+++ b/SOURCES/junit-platform-reporting-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-reporting</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Reporting</name>
  <description>Module "junit-platform-reporting" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -82,7 +82,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-runner-1.6.2.pom
+++ b/SOURCES/junit-platform-runner-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-runner</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Runner</name>
  <description>Module "junit-platform-runner" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -71,7 +71,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -93,13 +93,13 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-launcher</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-suite-api</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
  </dependencies>
--- a/SOURCES/junit-platform-suite-api-1.6.2.pom
+++ b/SOURCES/junit-platform-suite-api-1.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.platform</groupId>
  <artifactId>junit-platform-suite-api</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.2</version>
  <name>JUnit Platform Suite API</name>
  <description>Module "junit-platform-suite-api" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -66,7 +66,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
--- a/SOURCES/junit-vintage-engine-5.6.2.pom
+++ b/SOURCES/junit-vintage-engine-5.6.2.pom
@ -9,7 +9,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.junit.vintage</groupId>
  <artifactId>junit-vintage-engine</artifactId>
-  <version>5.6.0</version>
+  <version>5.6.2</version>
  <name>JUnit Vintage Engine</name>
  <description>Module "junit-vintage-engine" of JUnit 5.</description>
  <url>https://junit.org/junit5/</url>
@ -71,7 +71,7 @@
      <dependency>
        <groupId>org.junit</groupId>
        <artifactId>junit-bom</artifactId>
-        <version>5.6.0</version>
+        <version>5.6.2</version>
        <type>pom</type>
        <scope>import</scope>
      </dependency>
@ -87,7 +87,7 @@
    <dependency>
      <groupId>org.junit.platform</groupId>
      <artifactId>junit-platform-engine</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.2</version>
      <scope>compile</scope>
    </dependency>
    <dependency>
--- a/SPECS/junit5.spec
+++ b/SPECS/junit5.spec
@ -8,8 +8,8 @@
 %bcond_with console

 Name:           junit5
-Version:        5.6.0
-Release:        1%{?dist}
+Version:        5.6.2
+Release:        2%{?dist}
 Summary:        Java regression testing framework
 License:        EPL-2.0
 URL:            http://junit.org/junit5/
@ -38,9 +38,6 @@ Source400:      https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e
 # Bill of Materials POM
 Source500:      https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom

-# SCL-specific patches
-Patch100: 0001-Allow-building-against-old-univocity-parsers.patch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.univocity:univocity-parsers)
 BuildRequires:  mvn(junit:junit)
@ -78,9 +75,6 @@ JUnit 5 User Guide.

 %prep
 %setup -q -n %{name}-r%{version}
-
-# SCL-specific patches
-%patch100 -p1
 find -name \*.jar -delete

 cp -p %{SOURCE100} pom.xml
@ -152,6 +146,12 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*

 %changelog
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.6.2-2
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 5.6.2-1
+- Update to version 5.6.2.
+
 * Mon Feb 17 2020 Alexander Scheel <ascheel@redhat.com> - 5.6.0-1
 - Update to version 5.6.0