diff --git a/.gitignore b/.gitignore index caf5369..1678b37 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/junit5-5.6.0.tar.gz +SOURCES/junit5-5.6.2.tar.gz diff --git a/.junit5.metadata b/.junit5.metadata index bb14ab0..3f8624f 100644 --- a/.junit5.metadata +++ b/.junit5.metadata @@ -1 +1 @@ -8017967c8ccd9cd74e2de557b18cd02715186a0d SOURCES/junit5-5.6.0.tar.gz +b07dc3ecefa9ac619044aba6b8e8810d69133774 SOURCES/junit5-5.6.2.tar.gz diff --git a/SOURCES/0001-Allow-building-against-old-univocity-parsers.patch b/SOURCES/0001-Allow-building-against-old-univocity-parsers.patch deleted file mode 100644 index 4c694a3..0000000 --- a/SOURCES/0001-Allow-building-against-old-univocity-parsers.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0b862ac5e0964a31727d92f7260223f076203a93 Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/SOURCES/junit-bom-5.6.0.pom b/SOURCES/junit-bom-5.6.2.pom similarity index 90% rename from SOURCES/junit-bom-5.6.0.pom rename to SOURCES/junit-bom-5.6.2.pom index c2c4659..3909068 100644 --- a/SOURCES/junit-bom-5.6.0.pom +++ b/SOURCES/junit-bom-5.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit junit-bom - 5.6.0 + 5.6.2 pom JUnit 5 (Bill of Materials) This Bill of Materials POM can be used to ease dependency management when referencing multiple JUnit artifacts using Gradle or Maven. @@ -67,72 +67,72 @@ org.junit.jupiter junit-jupiter - 5.6.0 + 5.6.2 org.junit.jupiter junit-jupiter-api - 5.6.0 + 5.6.2 org.junit.jupiter junit-jupiter-engine - 5.6.0 + 5.6.2 org.junit.jupiter junit-jupiter-migrationsupport - 5.6.0 + 5.6.2 org.junit.jupiter junit-jupiter-params - 5.6.0 + 5.6.2 org.junit.platform junit-platform-commons - 1.6.0 + 1.6.2 org.junit.platform junit-platform-console - 1.6.0 + 1.6.2 org.junit.platform junit-platform-engine - 1.6.0 + 1.6.2 org.junit.platform junit-platform-launcher - 1.6.0 + 1.6.2 org.junit.platform junit-platform-reporting - 1.6.0 + 1.6.2 org.junit.platform junit-platform-runner - 1.6.0 + 1.6.2 org.junit.platform junit-platform-suite-api - 1.6.0 + 1.6.2 org.junit.platform junit-platform-testkit - 1.6.0 + 1.6.2 org.junit.vintage junit-vintage-engine - 5.6.0 + 5.6.2 diff --git a/SOURCES/junit-jupiter-api-5.6.0.pom b/SOURCES/junit-jupiter-api-5.6.2.pom similarity index 97% rename from SOURCES/junit-jupiter-api-5.6.0.pom rename to SOURCES/junit-jupiter-api-5.6.2.pom index e42dcb2..39243d2 100644 --- a/SOURCES/junit-jupiter-api-5.6.0.pom +++ b/SOURCES/junit-jupiter-api-5.6.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-api - 5.6.0 + 5.6.2 JUnit Jupiter API Module "junit-jupiter-api" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -87,7 +87,7 @@ org.junit.platform junit-platform-commons - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-jupiter-engine-5.6.0.pom b/SOURCES/junit-jupiter-engine-5.6.2.pom similarity index 96% rename from SOURCES/junit-jupiter-engine-5.6.0.pom rename to SOURCES/junit-jupiter-engine-5.6.2.pom index 23b6a27..99326bc 100644 --- a/SOURCES/junit-jupiter-engine-5.6.0.pom +++ b/SOURCES/junit-jupiter-engine-5.6.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-engine - 5.6.0 + 5.6.2 JUnit Jupiter Engine Module "junit-jupiter-engine" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -81,13 +81,13 @@ org.junit.platform junit-platform-engine - 1.6.0 + 1.6.2 compile org.junit.jupiter junit-jupiter-api - 5.6.0 + 5.6.2 compile diff --git a/SOURCES/junit-jupiter-migrationsupport-5.6.0.pom b/SOURCES/junit-jupiter-migrationsupport-5.6.2.pom similarity index 97% rename from SOURCES/junit-jupiter-migrationsupport-5.6.0.pom rename to SOURCES/junit-jupiter-migrationsupport-5.6.2.pom index 435d209..a6870b4 100644 --- a/SOURCES/junit-jupiter-migrationsupport-5.6.0.pom +++ b/SOURCES/junit-jupiter-migrationsupport-5.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-migrationsupport - 5.6.0 + 5.6.2 JUnit Jupiter Migration Support Module "junit-jupiter-migrationsupport" of JUnit 5. https://junit.org/junit5/ @@ -71,7 +71,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -93,7 +93,7 @@ org.junit.jupiter junit-jupiter-api - 5.6.0 + 5.6.2 compile diff --git a/SOURCES/junit-jupiter-params-5.6.0.pom b/SOURCES/junit-jupiter-params-5.6.2.pom similarity index 96% rename from SOURCES/junit-jupiter-params-5.6.0.pom rename to SOURCES/junit-jupiter-params-5.6.2.pom index 2b14ceb..bfafe69 100644 --- a/SOURCES/junit-jupiter-params-5.6.0.pom +++ b/SOURCES/junit-jupiter-params-5.6.2.pom @@ -8,7 +8,7 @@ 4.0.0 org.junit.jupiter junit-jupiter-params - 5.6.0 + 5.6.2 JUnit Jupiter Params Module "junit-jupiter-params" of JUnit 5. https://junit.org/junit5/ @@ -65,7 +65,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -81,7 +81,7 @@ org.junit.jupiter junit-jupiter-api - 5.6.0 + 5.6.2 compile diff --git a/SOURCES/junit-platform-commons-1.6.0.pom b/SOURCES/junit-platform-commons-1.6.2.pom similarity index 97% rename from SOURCES/junit-platform-commons-1.6.0.pom rename to SOURCES/junit-platform-commons-1.6.2.pom index 8571b54..b7247e9 100644 --- a/SOURCES/junit-platform-commons-1.6.0.pom +++ b/SOURCES/junit-platform-commons-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-commons - 1.6.0 + 1.6.2 JUnit Platform Commons Module "junit-platform-commons" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import diff --git a/SOURCES/junit-platform-console-1.6.0.pom b/SOURCES/junit-platform-console-1.6.2.pom similarity index 96% rename from SOURCES/junit-platform-console-1.6.0.pom rename to SOURCES/junit-platform-console-1.6.2.pom index 98a7c2b..ab6706c 100644 --- a/SOURCES/junit-platform-console-1.6.0.pom +++ b/SOURCES/junit-platform-console-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-console - 1.6.0 + 1.6.2 JUnit Platform Console Module "junit-platform-console" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -82,7 +82,7 @@ org.junit.platform junit-platform-reporting - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-platform-console-standalone-1.6.0.pom b/SOURCES/junit-platform-console-standalone-1.6.2.pom similarity index 98% rename from SOURCES/junit-platform-console-standalone-1.6.0.pom rename to SOURCES/junit-platform-console-standalone-1.6.2.pom index 16e238f..12809a7 100644 --- a/SOURCES/junit-platform-console-standalone-1.6.0.pom +++ b/SOURCES/junit-platform-console-standalone-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-console-standalone - 1.6.0 + 1.6.2 JUnit Platform Console Standalone Module "junit-platform-console-standalone" of JUnit 5. https://junit.org/junit5/ diff --git a/SOURCES/junit-platform-engine-1.6.0.pom b/SOURCES/junit-platform-engine-1.6.2.pom similarity index 97% rename from SOURCES/junit-platform-engine-1.6.0.pom rename to SOURCES/junit-platform-engine-1.6.2.pom index de2ceb5..1e7edaf 100644 --- a/SOURCES/junit-platform-engine-1.6.0.pom +++ b/SOURCES/junit-platform-engine-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-engine - 1.6.0 + 1.6.2 JUnit Platform Engine API Module "junit-platform-engine" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -88,7 +88,7 @@ org.junit.platform junit-platform-commons - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-platform-launcher-1.6.0.pom b/SOURCES/junit-platform-launcher-1.6.2.pom similarity index 96% rename from SOURCES/junit-platform-launcher-1.6.0.pom rename to SOURCES/junit-platform-launcher-1.6.2.pom index 3744cc7..e23a114 100644 --- a/SOURCES/junit-platform-launcher-1.6.0.pom +++ b/SOURCES/junit-platform-launcher-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-launcher - 1.6.0 + 1.6.2 JUnit Platform Launcher Module "junit-platform-launcher" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -82,7 +82,7 @@ org.junit.platform junit-platform-engine - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-platform-reporting-1.6.0.pom b/SOURCES/junit-platform-reporting-1.6.2.pom similarity index 97% rename from SOURCES/junit-platform-reporting-1.6.0.pom rename to SOURCES/junit-platform-reporting-1.6.2.pom index 9cde326..24129b7 100644 --- a/SOURCES/junit-platform-reporting-1.6.0.pom +++ b/SOURCES/junit-platform-reporting-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-reporting - 1.6.0 + 1.6.2 JUnit Platform Reporting Module "junit-platform-reporting" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -82,7 +82,7 @@ org.junit.platform junit-platform-launcher - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-platform-runner-1.6.0.pom b/SOURCES/junit-platform-runner-1.6.2.pom similarity index 96% rename from SOURCES/junit-platform-runner-1.6.0.pom rename to SOURCES/junit-platform-runner-1.6.2.pom index 6ede803..1419742 100644 --- a/SOURCES/junit-platform-runner-1.6.0.pom +++ b/SOURCES/junit-platform-runner-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-runner - 1.6.0 + 1.6.2 JUnit Platform Runner Module "junit-platform-runner" of JUnit 5. https://junit.org/junit5/ @@ -71,7 +71,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -93,13 +93,13 @@ org.junit.platform junit-platform-launcher - 1.6.0 + 1.6.2 compile org.junit.platform junit-platform-suite-api - 1.6.0 + 1.6.2 compile diff --git a/SOURCES/junit-platform-suite-api-1.6.0.pom b/SOURCES/junit-platform-suite-api-1.6.2.pom similarity index 97% rename from SOURCES/junit-platform-suite-api-1.6.0.pom rename to SOURCES/junit-platform-suite-api-1.6.2.pom index 7ad4632..1b22999 100644 --- a/SOURCES/junit-platform-suite-api-1.6.0.pom +++ b/SOURCES/junit-platform-suite-api-1.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.platform junit-platform-suite-api - 1.6.0 + 1.6.2 JUnit Platform Suite API Module "junit-platform-suite-api" of JUnit 5. https://junit.org/junit5/ @@ -66,7 +66,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import diff --git a/SOURCES/junit-vintage-engine-5.6.0.pom b/SOURCES/junit-vintage-engine-5.6.2.pom similarity index 97% rename from SOURCES/junit-vintage-engine-5.6.0.pom rename to SOURCES/junit-vintage-engine-5.6.2.pom index 1c4e11f..8c36e0a 100644 --- a/SOURCES/junit-vintage-engine-5.6.0.pom +++ b/SOURCES/junit-vintage-engine-5.6.2.pom @@ -9,7 +9,7 @@ 4.0.0 org.junit.vintage junit-vintage-engine - 5.6.0 + 5.6.2 JUnit Vintage Engine Module "junit-vintage-engine" of JUnit 5. https://junit.org/junit5/ @@ -71,7 +71,7 @@ org.junit junit-bom - 5.6.0 + 5.6.2 pom import @@ -87,7 +87,7 @@ org.junit.platform junit-platform-engine - 1.6.0 + 1.6.2 compile diff --git a/SPECS/junit5.spec b/SPECS/junit5.spec index b94e2e5..0d4d211 100644 --- 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 - 5.6.2-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat May 09 2020 Fabio Valentini - 5.6.2-1 +- Update to version 5.6.2. + * Mon Feb 17 2020 Alexander Scheel - 5.6.0-1 - Update to version 5.6.0