From 76803f7f95cc42e43ada57b6708b82f0592c6d6d1ae1a74ff7094ad184033989 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 Apr 2019 15:14:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=2 --- aggregator.pom | 2 +- ...i-5.3.1.pom => junit-jupiter-api-5.4.0.pom | 6 +- ....3.1.pom => junit-jupiter-engine-5.4.0.pom | 8 +- ...> junit-jupiter-migrationsupport-5.4.0.pom | 18 ++--- ....3.1.pom => junit-jupiter-params-5.4.0.pom | 6 +- ....1.pom => junit-platform-commons-1.4.0.pom | 4 +- ....1.pom => junit-platform-console-1.4.0.pom | 8 +- ...unit-platform-console-standalone-1.4.0.pom | 12 +-- ...3.1.pom => junit-platform-engine-1.4.0.pom | 16 ++-- ...1.pom => junit-platform-launcher-1.4.0.pom | 6 +- junit-platform-reporting-1.4.0.pom | 68 ++++++++++++++++ ...3.1.pom => junit-platform-runner-1.4.0.pom | 20 ++--- ....pom => junit-platform-suite-api-1.4.0.pom | 10 +-- junit-platform-surefire-provider-1.3.1.pom | 80 ------------------- ....3.1.pom => junit-vintage-engine-5.4.0.pom | 6 +- junit5-5.4.0.tar.gz | 3 + junit5.changes | 4 + junit5.spec | 27 +++---- r5.3.1.tar.gz | 3 - 19 files changed, 138 insertions(+), 169 deletions(-) rename junit-jupiter-api-5.3.1.pom => junit-jupiter-api-5.4.0.pom (95%) rename junit-jupiter-engine-5.3.1.pom => junit-jupiter-engine-5.4.0.pom (94%) rename junit-jupiter-migrationsupport-5.3.1.pom => junit-jupiter-migrationsupport-5.4.0.pom (95%) rename junit-jupiter-params-5.3.1.pom => junit-jupiter-params-5.4.0.pom (95%) rename junit-platform-commons-1.3.1.pom => junit-platform-commons-1.4.0.pom (96%) rename junit-platform-console-1.3.1.pom => junit-platform-console-1.4.0.pom (93%) rename junit-platform-console-standalone-1.3.1.pom => junit-platform-console-standalone-1.4.0.pom (86%) rename junit-platform-engine-1.3.1.pom => junit-platform-engine-1.4.0.pom (95%) rename junit-platform-launcher-1.3.1.pom => junit-platform-launcher-1.4.0.pom (95%) create mode 100644 junit-platform-reporting-1.4.0.pom rename junit-platform-runner-1.3.1.pom => junit-platform-runner-1.4.0.pom (95%) rename junit-platform-suite-api-1.3.1.pom => junit-platform-suite-api-1.4.0.pom (88%) delete mode 100644 junit-platform-surefire-provider-1.3.1.pom rename junit-vintage-engine-5.3.1.pom => junit-vintage-engine-5.4.0.pom (95%) create mode 100644 junit5-5.4.0.tar.gz create mode 100644 junit5.changes delete mode 100644 r5.3.1.tar.gz diff --git a/aggregator.pom b/aggregator.pom index a014acf..0ca9fc3 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -10,9 +10,9 @@ junit-platform-console-standalone junit-platform-engine junit-platform-launcher + junit-platform-reporting junit-platform-runner junit-platform-suite-api - junit-platform-surefire-provider junit-jupiter-api junit-jupiter-engine junit-jupiter-migrationsupport diff --git a/junit-jupiter-api-5.3.1.pom b/junit-jupiter-api-5.4.0.pom similarity index 95% rename from junit-jupiter-api-5.3.1.pom rename to junit-jupiter-api-5.4.0.pom index fb89d9f..39ed89c 100644 --- a/junit-jupiter-api-5.3.1.pom +++ b/junit-jupiter-api-5.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.jupiter junit-jupiter-api - 5.3.1 + 5.4.0 JUnit Jupiter API Module "junit-jupiter-api" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -67,7 +67,7 @@ org.junit.platform junit-platform-commons - 1.3.1 + 1.4.0 compile diff --git a/junit-jupiter-engine-5.3.1.pom b/junit-jupiter-engine-5.4.0.pom similarity index 94% rename from junit-jupiter-engine-5.3.1.pom rename to junit-jupiter-engine-5.4.0.pom index fc0b197..5b8ba27 100644 --- a/junit-jupiter-engine-5.3.1.pom +++ b/junit-jupiter-engine-5.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.jupiter junit-jupiter-engine - 5.3.1 + 5.4.0 JUnit Jupiter Engine Module "junit-jupiter-engine" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -61,13 +61,13 @@ org.junit.platform junit-platform-engine - 1.3.1 + 1.4.0 compile org.junit.jupiter junit-jupiter-api - 5.3.1 + 5.4.0 compile diff --git a/junit-jupiter-migrationsupport-5.3.1.pom b/junit-jupiter-migrationsupport-5.4.0.pom similarity index 95% rename from junit-jupiter-migrationsupport-5.3.1.pom rename to junit-jupiter-migrationsupport-5.4.0.pom index 57bfe89..e2e6ef1 100644 --- a/junit-jupiter-migrationsupport-5.3.1.pom +++ b/junit-jupiter-migrationsupport-5.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.jupiter junit-jupiter-migrationsupport - 5.3.1 + 5.4.0 JUnit Jupiter Migration Support Module "junit-jupiter-migrationsupport" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -52,22 +52,22 @@ https://github.com/junit-team/junit5 - - org.apiguardian - apiguardian-api - 1.0.0 - compile - junit junit 4.12 compile + + org.apiguardian + apiguardian-api + 1.0.0 + compile + org.junit.jupiter junit-jupiter-api - 5.3.1 + 5.4.0 compile diff --git a/junit-jupiter-params-5.3.1.pom b/junit-jupiter-params-5.4.0.pom similarity index 95% rename from junit-jupiter-params-5.3.1.pom rename to junit-jupiter-params-5.4.0.pom index 6bdf2a3..902e42a 100644 --- a/junit-jupiter-params-5.3.1.pom +++ b/junit-jupiter-params-5.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.jupiter junit-jupiter-params - 5.3.1 + 5.4.0 JUnit Jupiter Params Module "junit-jupiter-params" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -61,7 +61,7 @@ org.junit.jupiter junit-jupiter-api - 5.3.1 + 5.4.0 compile diff --git a/junit-platform-commons-1.3.1.pom b/junit-platform-commons-1.4.0.pom similarity index 96% rename from junit-platform-commons-1.3.1.pom rename to junit-platform-commons-1.4.0.pom index 75363c1..6accb5b 100644 --- a/junit-platform-commons-1.3.1.pom +++ b/junit-platform-commons-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-commons - 1.3.1 + 1.4.0 JUnit Platform Commons Module "junit-platform-commons" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 diff --git a/junit-platform-console-1.3.1.pom b/junit-platform-console-1.4.0.pom similarity index 93% rename from junit-platform-console-1.3.1.pom rename to junit-platform-console-1.4.0.pom index af760a9..66b6555 100644 --- a/junit-platform-console-1.3.1.pom +++ b/junit-platform-console-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-console - 1.3.1 + 1.4.0 JUnit Platform Console Module "junit-platform-console" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -60,8 +60,8 @@ org.junit.platform - junit-platform-launcher - 1.3.1 + junit-platform-reporting + 1.4.0 compile diff --git a/junit-platform-console-standalone-1.3.1.pom b/junit-platform-console-standalone-1.4.0.pom similarity index 86% rename from junit-platform-console-standalone-1.3.1.pom rename to junit-platform-console-standalone-1.4.0.pom index 8eda94c..7be266d 100644 --- a/junit-platform-console-standalone-1.3.1.pom +++ b/junit-platform-console-standalone-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-console-standalone - 1.3.1 + 1.4.0 JUnit Platform Console Standalone Module "junit-platform-console-standalone" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -51,12 +51,4 @@ scm:git:git://github.com/junit-team/junit5.git https://github.com/junit-team/junit5 - - - org.apiguardian - apiguardian-api - 1.0.0 - compile - - diff --git a/junit-platform-engine-1.3.1.pom b/junit-platform-engine-1.4.0.pom similarity index 95% rename from junit-platform-engine-1.3.1.pom rename to junit-platform-engine-1.4.0.pom index cabfe96..e48f7fb 100644 --- a/junit-platform-engine-1.3.1.pom +++ b/junit-platform-engine-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-engine - 1.3.1 + 1.4.0 JUnit Platform Engine API Module "junit-platform-engine" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -58,17 +58,17 @@ 1.0.0 compile - - org.junit.platform - junit-platform-commons - 1.3.1 - compile - org.opentest4j opentest4j 1.1.1 compile + + org.junit.platform + junit-platform-commons + 1.4.0 + compile + diff --git a/junit-platform-launcher-1.3.1.pom b/junit-platform-launcher-1.4.0.pom similarity index 95% rename from junit-platform-launcher-1.3.1.pom rename to junit-platform-launcher-1.4.0.pom index 1fd5d89..c6d20db 100644 --- a/junit-platform-launcher-1.3.1.pom +++ b/junit-platform-launcher-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-launcher - 1.3.1 + 1.4.0 JUnit Platform Launcher Module "junit-platform-launcher" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -61,7 +61,7 @@ org.junit.platform junit-platform-engine - 1.3.1 + 1.4.0 compile diff --git a/junit-platform-reporting-1.4.0.pom b/junit-platform-reporting-1.4.0.pom new file mode 100644 index 0000000..9a1def6 --- /dev/null +++ b/junit-platform-reporting-1.4.0.pom @@ -0,0 +1,68 @@ + + + 4.0.0 + org.junit.platform + junit-platform-reporting + 1.4.0 + JUnit Platform Reporting + Module "junit-platform-reporting" of JUnit 5. + https://junit.org/junit5/ + + + Eclipse Public License v2.0 + http://www.eclipse.org/legal/epl-v20.html + + + + + bechte + Stefan Bechtold + stefan.bechtold@me.com + + + jlink + Johannes Link + business@johanneslink.net + + + marcphilipp + Marc Philipp + mail@marcphilipp.de + + + mmerdes + Matthias Merdes + Matthias.Merdes@heidelberg-mobil.com + + + sbrannen + Sam Brannen + sam@sambrannen.com + + + sormuras + Christian Stein + sormuras@gmail.com + + + + scm:git:git://github.com/junit-team/junit5.git + scm:git:git://github.com/junit-team/junit5.git + https://github.com/junit-team/junit5 + + + + org.apiguardian + apiguardian-api + 1.0.0 + compile + + + org.junit.platform + junit-platform-launcher + 1.4.0 + compile + + + diff --git a/junit-platform-runner-1.3.1.pom b/junit-platform-runner-1.4.0.pom similarity index 95% rename from junit-platform-runner-1.3.1.pom rename to junit-platform-runner-1.4.0.pom index ecde474..7d65e0d 100644 --- a/junit-platform-runner-1.3.1.pom +++ b/junit-platform-runner-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-runner - 1.3.1 + 1.4.0 JUnit Platform Runner Module "junit-platform-runner" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -52,6 +52,12 @@ https://github.com/junit-team/junit5 + + junit + junit + 4.12 + compile + org.apiguardian apiguardian-api @@ -61,19 +67,13 @@ org.junit.platform junit-platform-launcher - 1.3.1 + 1.4.0 compile org.junit.platform junit-platform-suite-api - 1.3.1 - compile - - - junit - junit - 4.12 + 1.4.0 compile diff --git a/junit-platform-suite-api-1.3.1.pom b/junit-platform-suite-api-1.4.0.pom similarity index 88% rename from junit-platform-suite-api-1.3.1.pom rename to junit-platform-suite-api-1.4.0.pom index 1f3b5d7..f8a3bf8 100644 --- a/junit-platform-suite-api-1.3.1.pom +++ b/junit-platform-suite-api-1.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.platform junit-platform-suite-api - 1.3.1 + 1.4.0 JUnit Platform Suite API Module "junit-platform-suite-api" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -58,11 +58,5 @@ 1.0.0 compile - - org.junit.platform - junit-platform-commons - 1.3.1 - compile - diff --git a/junit-platform-surefire-provider-1.3.1.pom b/junit-platform-surefire-provider-1.3.1.pom deleted file mode 100644 index ff730ce..0000000 --- a/junit-platform-surefire-provider-1.3.1.pom +++ /dev/null @@ -1,80 +0,0 @@ - - - 4.0.0 - org.junit.platform - junit-platform-surefire-provider - 1.3.1 - JUnit Platform Surefire Provider - Module "junit-platform-surefire-provider" of JUnit 5. - http://junit.org/junit5/ - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - bechte - Stefan Bechtold - stefan.bechtold@me.com - - - jlink - Johannes Link - business@johanneslink.net - - - marcphilipp - Marc Philipp - mail@marcphilipp.de - - - mmerdes - Matthias Merdes - Matthias.Merdes@heidelberg-mobil.com - - - sbrannen - Sam Brannen - sam@sambrannen.com - - - sormuras - Christian Stein - sormuras@gmail.com - - - - scm:git:git://github.com/junit-team/junit5.git - scm:git:git://github.com/junit-team/junit5.git - https://github.com/junit-team/junit5 - - - - org.apiguardian - apiguardian-api - 1.0.0 - compile - - - org.junit.platform - junit-platform-launcher - 1.3.1 - compile - - - org.apache.maven.surefire - surefire-api - 2.22.0 - runtime - - - org.apache.maven.surefire - common-java5 - 2.22.0 - runtime - - - diff --git a/junit-vintage-engine-5.3.1.pom b/junit-vintage-engine-5.4.0.pom similarity index 95% rename from junit-vintage-engine-5.3.1.pom rename to junit-vintage-engine-5.4.0.pom index 0a8126e..d254363 100644 --- a/junit-vintage-engine-5.3.1.pom +++ b/junit-vintage-engine-5.4.0.pom @@ -4,10 +4,10 @@ 4.0.0 org.junit.vintage junit-vintage-engine - 5.3.1 + 5.4.0 JUnit Vintage Engine Module "junit-vintage-engine" of JUnit 5. - http://junit.org/junit5/ + https://junit.org/junit5/ Eclipse Public License v2.0 @@ -61,7 +61,7 @@ org.junit.platform junit-platform-engine - 1.3.1 + 1.4.0 compile diff --git a/junit5-5.4.0.tar.gz b/junit5-5.4.0.tar.gz new file mode 100644 index 0000000..c097609 --- /dev/null +++ b/junit5-5.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e32da502a1be07b24aadb8acd504eefea141ff2cec9192ad69be65cb1ea5313c +size 1050694 diff --git a/junit5.changes b/junit5.changes new file mode 100644 index 0000000..283c48c --- /dev/null +++ b/junit5.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Thu Apr 11 15:14:17 UTC 2019 - Fridrich Strba + +- Initial packaging of junit5 5.4.0 diff --git a/junit5.spec b/junit5.spec index 2a78b5e..7b097c6 100644 --- a/junit5.spec +++ b/junit5.spec @@ -16,21 +16,20 @@ # -%global platform_version 1.3.1 +%global platform_version 1.4.0 %global jupiter_version %{version} %global vintage_version %{version} # Build with or without the console modules # Disabled by default due to missing dep: info.picocli:picocli %bcond_with console Name: junit5 -Version: 5.3.1 +Version: 5.4.0 Release: 0 Summary: Java regression testing framework -# junit-platform-surefire-provider is under ASL 2.0, all other modules use EPL-2.0 (see LICENSE.md) -License: EPL-2.0 AND Apache-2.0 +License: EPL-2.0 Group: Development/Libraries/Java URL: http://junit.org/junit5/ -Source0: https://github.com/junit-team/junit5/archive/r%{version}.tar.gz +Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz # Aggregator POM (used for packaging only) Source100: aggregator.pom # Platform POMs @@ -41,7 +40,7 @@ Source203: https://repo1.maven.org/maven2/org/junit/platform/junit-platform Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/%{platform_version}/junit-platform-launcher-%{platform_version}.pom 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-surefire-provider/%{platform_version}/junit-platform-surefire-provider-%{platform_version}.pom +Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom # Jupiter POMs Source301: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/%{jupiter_version}/junit-jupiter-api-%{jupiter_version}.pom Source302: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/%{jupiter_version}/junit-jupiter-engine-%{jupiter_version}.pom @@ -55,8 +54,6 @@ BuildRequires: maven-local BuildRequires: mvn(com.univocity:univocity-parsers) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.surefire:common-java5) -BuildRequires: mvn(org.apache.maven.surefire:surefire-api) BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.opentest4j:opentest4j) BuildArch: noarch @@ -91,9 +88,6 @@ JUnit 5 User Guide. %setup -q -n %{name}-r%{version} find -name \*.jar -delete -cp -p junit-jupiter-api/LICENSE.md LICENSE-Eclipse.md -cp -p junit-platform-surefire-provider/LICENSE.md LICENSE-Apache.md - cp -p %{SOURCE100} pom.xml cp -p %{SOURCE200} junit-platform-commons/pom.xml cp -p %{SOURCE201} junit-platform-console/pom.xml @@ -102,7 +96,7 @@ cp -p %{SOURCE203} junit-platform-engine/pom.xml 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-surefire-provider/pom.xml +cp -p %{SOURCE208} junit-platform-reporting/pom.xml cp -p %{SOURCE301} junit-jupiter-api/pom.xml cp -p %{SOURCE302} junit-jupiter-engine/pom.xml cp -p %{SOURCE303} junit-jupiter-migrationsupport/pom.xml @@ -123,9 +117,6 @@ done %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 -# Incorrect scope - whoever needs Surefire provider will have to depend on Surefire. -%pom_xpath_set "pom:dependency[pom:groupId='org.apache.maven.surefire']/pom:scope" provided junit-platform-surefire-provider - # Incorrect scope - Junit4 is needed for compilation too, not only runtime. %pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine @@ -142,7 +133,7 @@ done # Build docs. Ignore exit asciidoc -- it fails for some reason, but # still produces readable docs. -asciidoc documentation/src/docs/asciidoc/index.adoc || : +asciidoc documentation/src/docs/asciidoc/user-guide/index.adoc || : ln -s ../../javadoc/junit5 documentation/src/docs/api %install @@ -158,10 +149,10 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %if %{with console} %{_bindir}/%{name} %endif -%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md +%license LICENSE.md LICENSE-notice.md %files javadoc -f .mfiles-javadoc -%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md +%license LICENSE.md LICENSE-notice.md %files guide %doc documentation/src/docs/* diff --git a/r5.3.1.tar.gz b/r5.3.1.tar.gz deleted file mode 100644 index d5156ab..0000000 --- a/r5.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c4d18ec27320e6652de7ab191d3b5004e40170862dde8cad6fa17804bcbcf6 -size 877431