From d14420720a2c08a134e39763af2958efa82bb1605fbbb5e1d90c34eeeae5a501 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Nov 2019 08:57:06 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=6 --- aggregator.pom | 1 + junit-jupiter-5.5.2.pom | 74 +++++++++++++++++++ ...i-5.4.0.pom => junit-jupiter-api-5.5.2.pom | 13 ++-- ....4.0.pom => junit-jupiter-engine-5.5.2.pom | 13 ++-- ...> junit-jupiter-migrationsupport-5.5.2.pom | 8 +- ....4.0.pom => junit-jupiter-params-5.5.2.pom | 11 ++- ....0.pom => junit-platform-commons-1.5.2.pom | 6 +- ....0.pom => junit-platform-console-1.5.2.pom | 8 +- ...unit-platform-console-standalone-1.5.2.pom | 4 +- ...4.0.pom => junit-platform-engine-1.5.2.pom | 10 +-- ...0.pom => junit-platform-launcher-1.5.2.pom | 8 +- ....pom => junit-platform-reporting-1.5.2.pom | 8 +- ...4.0.pom => junit-platform-runner-1.5.2.pom | 10 +-- ....pom => junit-platform-suite-api-1.5.2.pom | 6 +- ....4.0.pom => junit-vintage-engine-5.5.2.pom | 10 +-- junit5-5.4.0.tar.gz | 3 - junit5-5.5.2.tar.gz | 3 + junit5.changes | 6 ++ junit5.spec | 10 ++- 19 files changed, 146 insertions(+), 66 deletions(-) create mode 100644 junit-jupiter-5.5.2.pom rename junit-jupiter-api-5.4.0.pom => junit-jupiter-api-5.5.2.pom (83%) rename junit-jupiter-engine-5.4.0.pom => junit-jupiter-engine-5.5.2.pom (83%) rename junit-jupiter-migrationsupport-5.4.0.pom => junit-jupiter-migrationsupport-5.5.2.pom (93%) rename junit-jupiter-params-5.4.0.pom => junit-jupiter-params-5.5.2.pom (83%) rename junit-platform-commons-1.4.0.pom => junit-platform-commons-1.5.2.pom (94%) rename junit-platform-console-1.4.0.pom => junit-platform-console-1.5.2.pom (93%) rename junit-platform-console-standalone-1.4.0.pom => junit-platform-console-standalone-1.5.2.pom (95%) rename junit-platform-engine-1.4.0.pom => junit-platform-engine-1.5.2.pom (92%) rename junit-platform-launcher-1.4.0.pom => junit-platform-launcher-1.5.2.pom (93%) rename junit-platform-reporting-1.4.0.pom => junit-platform-reporting-1.5.2.pom (93%) rename junit-platform-runner-1.4.0.pom => junit-platform-runner-1.5.2.pom (93%) rename junit-platform-suite-api-1.4.0.pom => junit-platform-suite-api-1.5.2.pom (94%) rename junit-vintage-engine-5.4.0.pom => junit-vintage-engine-5.5.2.pom (92%) delete mode 100644 junit5-5.4.0.tar.gz create mode 100644 junit5-5.5.2.tar.gz diff --git a/aggregator.pom b/aggregator.pom index 0ca9fc3..7f2f257 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -17,6 +17,7 @@ junit-jupiter-engine junit-jupiter-migrationsupport junit-jupiter-params + junit-jupiter junit-vintage-engine diff --git a/junit-jupiter-5.5.2.pom b/junit-jupiter-5.5.2.pom new file mode 100644 index 0000000..3bdc382 --- /dev/null +++ b/junit-jupiter-5.5.2.pom @@ -0,0 +1,74 @@ + + + 4.0.0 + org.junit.jupiter + junit-jupiter + 5.5.2 + JUnit Jupiter (Aggregator) + Module "junit-jupiter" of JUnit 5. + https://junit.org/junit5/ + + + Eclipse Public License v2.0 + https://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.junit.jupiter + junit-jupiter-api + 5.5.2 + compile + + + org.junit.jupiter + junit-jupiter-params + 5.5.2 + compile + + + org.junit.jupiter + junit-jupiter-engine + 5.5.2 + runtime + + + diff --git a/junit-jupiter-api-5.4.0.pom b/junit-jupiter-api-5.5.2.pom similarity index 83% rename from junit-jupiter-api-5.4.0.pom rename to junit-jupiter-api-5.5.2.pom index 39ed89c..3041d4d 100644 --- a/junit-jupiter-api-5.4.0.pom +++ b/junit-jupiter-api-5.5.2.pom @@ -1,17 +1,16 @@ - + 4.0.0 org.junit.jupiter junit-jupiter-api - 5.4.0 + 5.5.2 JUnit Jupiter API Module "junit-jupiter-api" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,19 +54,19 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.opentest4j opentest4j - 1.1.1 + 1.2.0 compile org.junit.platform junit-platform-commons - 1.4.0 + 1.5.2 compile diff --git a/junit-jupiter-engine-5.4.0.pom b/junit-jupiter-engine-5.5.2.pom similarity index 83% rename from junit-jupiter-engine-5.4.0.pom rename to junit-jupiter-engine-5.5.2.pom index 5b8ba27..3747b50 100644 --- a/junit-jupiter-engine-5.4.0.pom +++ b/junit-jupiter-engine-5.5.2.pom @@ -1,17 +1,16 @@ - + 4.0.0 org.junit.jupiter junit-jupiter-engine - 5.4.0 + 5.5.2 JUnit Jupiter Engine Module "junit-jupiter-engine" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,19 +54,19 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-engine - 1.4.0 + 1.5.2 compile org.junit.jupiter junit-jupiter-api - 5.4.0 + 5.5.2 compile diff --git a/junit-jupiter-migrationsupport-5.4.0.pom b/junit-jupiter-migrationsupport-5.5.2.pom similarity index 93% rename from junit-jupiter-migrationsupport-5.4.0.pom rename to junit-jupiter-migrationsupport-5.5.2.pom index e2e6ef1..7b9d76c 100644 --- a/junit-jupiter-migrationsupport-5.4.0.pom +++ b/junit-jupiter-migrationsupport-5.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.jupiter junit-jupiter-migrationsupport - 5.4.0 + 5.5.2 JUnit Jupiter Migration Support Module "junit-jupiter-migrationsupport" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -61,13 +61,13 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.jupiter junit-jupiter-api - 5.4.0 + 5.5.2 compile diff --git a/junit-jupiter-params-5.4.0.pom b/junit-jupiter-params-5.5.2.pom similarity index 83% rename from junit-jupiter-params-5.4.0.pom rename to junit-jupiter-params-5.5.2.pom index 902e42a..f051cf0 100644 --- a/junit-jupiter-params-5.4.0.pom +++ b/junit-jupiter-params-5.5.2.pom @@ -1,17 +1,16 @@ - + 4.0.0 org.junit.jupiter junit-jupiter-params - 5.4.0 + 5.5.2 JUnit Jupiter Params Module "junit-jupiter-params" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,13 +54,13 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.jupiter junit-jupiter-api - 5.4.0 + 5.5.2 compile diff --git a/junit-platform-commons-1.4.0.pom b/junit-platform-commons-1.5.2.pom similarity index 94% rename from junit-platform-commons-1.4.0.pom rename to junit-platform-commons-1.5.2.pom index 6accb5b..c9a5c82 100644 --- a/junit-platform-commons-1.4.0.pom +++ b/junit-platform-commons-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-commons - 1.4.0 + 1.5.2 JUnit Platform Commons Module "junit-platform-commons" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,7 +55,7 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile diff --git a/junit-platform-console-1.4.0.pom b/junit-platform-console-1.5.2.pom similarity index 93% rename from junit-platform-console-1.4.0.pom rename to junit-platform-console-1.5.2.pom index 66b6555..e2e39d4 100644 --- a/junit-platform-console-1.4.0.pom +++ b/junit-platform-console-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-console - 1.4.0 + 1.5.2 JUnit Platform Console Module "junit-platform-console" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,13 +55,13 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-reporting - 1.4.0 + 1.5.2 compile diff --git a/junit-platform-console-standalone-1.4.0.pom b/junit-platform-console-standalone-1.5.2.pom similarity index 95% rename from junit-platform-console-standalone-1.4.0.pom rename to junit-platform-console-standalone-1.5.2.pom index 7be266d..28a41c6 100644 --- a/junit-platform-console-standalone-1.4.0.pom +++ b/junit-platform-console-standalone-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-console-standalone - 1.4.0 + 1.5.2 JUnit Platform Console Standalone Module "junit-platform-console-standalone" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html diff --git a/junit-platform-engine-1.4.0.pom b/junit-platform-engine-1.5.2.pom similarity index 92% rename from junit-platform-engine-1.4.0.pom rename to junit-platform-engine-1.5.2.pom index e48f7fb..b9cb51e 100644 --- a/junit-platform-engine-1.4.0.pom +++ b/junit-platform-engine-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-engine - 1.4.0 + 1.5.2 JUnit Platform Engine API Module "junit-platform-engine" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,19 +55,19 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.opentest4j opentest4j - 1.1.1 + 1.2.0 compile org.junit.platform junit-platform-commons - 1.4.0 + 1.5.2 compile diff --git a/junit-platform-launcher-1.4.0.pom b/junit-platform-launcher-1.5.2.pom similarity index 93% rename from junit-platform-launcher-1.4.0.pom rename to junit-platform-launcher-1.5.2.pom index c6d20db..ea0fcd2 100644 --- a/junit-platform-launcher-1.4.0.pom +++ b/junit-platform-launcher-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-launcher - 1.4.0 + 1.5.2 JUnit Platform Launcher Module "junit-platform-launcher" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,13 +55,13 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-engine - 1.4.0 + 1.5.2 compile diff --git a/junit-platform-reporting-1.4.0.pom b/junit-platform-reporting-1.5.2.pom similarity index 93% rename from junit-platform-reporting-1.4.0.pom rename to junit-platform-reporting-1.5.2.pom index 9a1def6..a98fc34 100644 --- a/junit-platform-reporting-1.4.0.pom +++ b/junit-platform-reporting-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-reporting - 1.4.0 + 1.5.2 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 + https://www.eclipse.org/legal/epl-v20.html @@ -55,13 +55,13 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-launcher - 1.4.0 + 1.5.2 compile diff --git a/junit-platform-runner-1.4.0.pom b/junit-platform-runner-1.5.2.pom similarity index 93% rename from junit-platform-runner-1.4.0.pom rename to junit-platform-runner-1.5.2.pom index 7d65e0d..8efec6b 100644 --- a/junit-platform-runner-1.4.0.pom +++ b/junit-platform-runner-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-runner - 1.4.0 + 1.5.2 JUnit Platform Runner Module "junit-platform-runner" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -61,19 +61,19 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-launcher - 1.4.0 + 1.5.2 compile org.junit.platform junit-platform-suite-api - 1.4.0 + 1.5.2 compile diff --git a/junit-platform-suite-api-1.4.0.pom b/junit-platform-suite-api-1.5.2.pom similarity index 94% rename from junit-platform-suite-api-1.4.0.pom rename to junit-platform-suite-api-1.5.2.pom index f8a3bf8..f00532f 100644 --- a/junit-platform-suite-api-1.4.0.pom +++ b/junit-platform-suite-api-1.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.platform junit-platform-suite-api - 1.4.0 + 1.5.2 JUnit Platform Suite API Module "junit-platform-suite-api" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,7 +55,7 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile diff --git a/junit-vintage-engine-5.4.0.pom b/junit-vintage-engine-5.5.2.pom similarity index 92% rename from junit-vintage-engine-5.4.0.pom rename to junit-vintage-engine-5.5.2.pom index d254363..6f4d2f9 100644 --- a/junit-vintage-engine-5.4.0.pom +++ b/junit-vintage-engine-5.5.2.pom @@ -4,14 +4,14 @@ 4.0.0 org.junit.vintage junit-vintage-engine - 5.4.0 + 5.5.2 JUnit Vintage Engine Module "junit-vintage-engine" of JUnit 5. https://junit.org/junit5/ Eclipse Public License v2.0 - http://www.eclipse.org/legal/epl-v20.html + https://www.eclipse.org/legal/epl-v20.html @@ -55,20 +55,20 @@ org.apiguardian apiguardian-api - 1.0.0 + 1.1.0 compile org.junit.platform junit-platform-engine - 1.4.0 + 1.5.2 compile junit junit 4.12 - runtime + compile diff --git a/junit5-5.4.0.tar.gz b/junit5-5.4.0.tar.gz deleted file mode 100644 index c097609..0000000 --- a/junit5-5.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e32da502a1be07b24aadb8acd504eefea141ff2cec9192ad69be65cb1ea5313c -size 1050694 diff --git a/junit5-5.5.2.tar.gz b/junit5-5.5.2.tar.gz new file mode 100644 index 0000000..0fe7833 --- /dev/null +++ b/junit5-5.5.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbc1f99c297d1d44e10a074019574855d53c6565b1345f93d0fa3276f2102e42 +size 1170914 diff --git a/junit5.changes b/junit5.changes index 283c48c..2f5077b 100644 --- a/junit5.changes +++ b/junit5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 8 08:55:55 UTC 2019 - Fridrich Strba + +- Upgrade to junit5 5.5.2 +- Distribute also the manifest-only junit-jupiter artifact + ------------------------------------------------------------------- Thu Apr 11 15:14:17 UTC 2019 - Fridrich Strba diff --git a/junit5.spec b/junit5.spec index 4632443..e2c21b6 100644 --- a/junit5.spec +++ b/junit5.spec @@ -16,19 +16,19 @@ # -%global platform_version 1.4.0 +%global platform_version 1.5.2 %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.4.0 +Version: 5.5.2 Release: 0 Summary: Java regression testing framework License: EPL-2.0 Group: Development/Libraries/Java -URL: http://junit.org/junit5/ +URL: https://junit.org/junit5/ Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz # Aggregator POM (used for packaging only) Source100: aggregator.pom @@ -46,6 +46,7 @@ Source301: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-a Source302: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/%{jupiter_version}/junit-jupiter-engine-%{jupiter_version}.pom Source303: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-migrationsupport/%{jupiter_version}/junit-jupiter-migrationsupport-%{jupiter_version}.pom Source304: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/%{jupiter_version}/junit-jupiter-params-%{jupiter_version}.pom +Source305: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/%{jupiter_version}/junit-jupiter-%{jupiter_version}.pom # Vintage POM Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/%{vintage_version}/junit-vintage-engine-%{vintage_version}.pom BuildRequires: asciidoc @@ -101,6 +102,7 @@ cp -p %{SOURCE301} junit-jupiter-api/pom.xml cp -p %{SOURCE302} junit-jupiter-engine/pom.xml cp -p %{SOURCE303} junit-jupiter-migrationsupport/pom.xml cp -p %{SOURCE304} junit-jupiter-params/pom.xml +cp -p %{SOURCE305} junit-jupiter/pom.xml cp -p %{SOURCE400} junit-vintage-engine/pom.xml for pom in $(find -mindepth 2 -name pom.xml); do @@ -133,7 +135,7 @@ done # Build docs. Ignore exit asciidoc -- it fails for some reason, but # still produces readable docs. -asciidoc documentation/src/docs/asciidoc/user-guide/index.adoc || : +asciidoc documentation/src/docs/asciidoc/index.adoc || : ln -s ../../javadoc/junit5 documentation/src/docs/api %install From b89ce4adaa9a5b5e3d7b6eed61553d64ffbeb9e9216502194084e45264dfa03a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Nov 2019 10:01:19 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit5?expand=0&rev=7 --- junit5.changes | 3 ++- junit5.spec | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/junit5.changes b/junit5.changes index 2f5077b..c67d714 100644 --- a/junit5.changes +++ b/junit5.changes @@ -2,7 +2,8 @@ Fri Nov 8 08:55:55 UTC 2019 - Fridrich Strba - Upgrade to junit5 5.5.2 -- Distribute also the manifest-only junit-jupiter artifact +- Distribute also the manifest-only junit-jupiter artifact +- Build the console by default, since picocli package exists now ------------------------------------------------------------------- Thu Apr 11 15:14:17 UTC 2019 - Fridrich Strba diff --git a/junit5.spec b/junit5.spec index e2c21b6..f801133 100644 --- a/junit5.spec +++ b/junit5.spec @@ -19,9 +19,7 @@ %global platform_version 1.5.2 %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 +%bcond_without console Name: junit5 Version: 5.5.2 Release: 0 @@ -60,8 +58,6 @@ BuildRequires: mvn(org.opentest4j:opentest4j) BuildArch: noarch %if %{with console} BuildRequires: mvn(info.picocli:picocli) -%endif -%if %{with console} # Explicit requires for javapackages-tools since junit5 script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -116,7 +112,7 @@ for pom in $(find -mindepth 2 -name pom.xml); do done # Add deps which are shaded by upstream and therefore not present in POMs. -%pom_add_dep net.sf.jopt-simple:jopt-simple:5.0.4 junit-platform-console +%pom_add_dep info.picocli:picocli:4.0.4 junit-platform-console %pom_add_dep com.univocity:univocity-parsers:2.5.4 junit-jupiter-params # Incorrect scope - Junit4 is needed for compilation too, not only runtime.