From 2c363a1ba159401be72419dd995e41e31f3801bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Apr 2019 15:55:50 +0200 Subject: [PATCH 01/16] Expand conditionals --- junit5.spec | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/junit5.spec b/junit5.spec index 3f85184..3650fe0 100644 --- a/junit5.spec +++ b/junit5.spec @@ -3,10 +3,6 @@ %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 Release: 1%{?dist} @@ -43,18 +39,8 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.opentest4j:opentest4j) -%if %{with console} -BuildRequires: mvn(info.picocli:picocli) -%endif - BuildRequires: asciidoc -%if %{with console} -# Explicit requires for javapackages-tools since junit5 script -# uses /usr/share/java-utils/java-functions -Requires: javapackages-tools -%endif - %description JUnit is a popular regression testing framework for Java platform. @@ -107,11 +93,9 @@ done # 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 -%if %{without console} # Disable the console modules %pom_disable_module junit-platform-console %pom_disable_module junit-platform-console-standalone -%endif %mvn_package :aggregator __noinstall @@ -126,14 +110,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %install %mvn_install -%if %{with console} -%jpackage_script org/junit/platform/console/ConsoleLauncher "" "" junit5:junit:opentest4j:jopt-simple %{name} true -%endif - %files -f .mfiles -%if %{with console} -%{_bindir}/%{name} -%endif %license LICENSE.md LICENSE-notice.md %files javadoc -f .mfiles-javadoc From 5e4f24ca431c270f785f34435e3d3773831efde1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:55 +0200 Subject: [PATCH 02/16] Mass rebuild for javapackages-tools 201901 --- junit5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit5.spec b/junit5.spec index 3650fe0..49832ed 100644 --- a/junit5.spec +++ b/junit5.spec @@ -5,7 +5,7 @@ Name: junit5 Version: 5.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression testing framework License: EPL-2.0 URL: http://junit.org/junit5/ @@ -120,6 +120,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Fri May 24 2019 Mikolaj Izdebski - 5.4.0-2 +- Mass rebuild for javapackages-tools 201901 + * Wed Mar 06 2019 Mat Booth - 5.4.0-1 - Update to latest upstream release - License switched to EPL only now the surefire provider was moved to the From 69f581eef65cb9b44095d51e5b3e2c2acfc99c0d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jul 2019 10:38:43 +0200 Subject: [PATCH 03/16] Update to upstream version 5.5.1 --- .gitignore | 14 ++++++++++++++ junit5.spec | 5 ++++- sources | 28 ++++++++++++++-------------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index bab2ffd..47ff861 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,17 @@ /junit-jupiter-migrationsupport-5.4.2.pom /junit-jupiter-params-5.4.2.pom /junit-vintage-engine-5.4.2.pom +/junit5-5.5.1.tar.gz +/junit-jupiter-api-5.5.1.pom +/junit-jupiter-engine-5.5.1.pom +/junit-jupiter-migrationsupport-5.5.1.pom +/junit-jupiter-params-5.5.1.pom +/junit-platform-commons-1.5.1.pom +/junit-platform-console-1.5.1.pom +/junit-platform-console-standalone-1.5.1.pom +/junit-platform-engine-1.5.1.pom +/junit-platform-launcher-1.5.1.pom +/junit-platform-reporting-1.5.1.pom +/junit-platform-runner-1.5.1.pom +/junit-platform-suite-api-1.5.1.pom +/junit-vintage-engine-5.5.1.pom diff --git a/junit5.spec b/junit5.spec index 7a4168e..3d0b002 100644 --- a/junit5.spec +++ b/junit5.spec @@ -4,7 +4,7 @@ %global vintage_version %{version} Name: junit5 -Version: 5.4.2 +Version: 5.5.1 Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 @@ -120,6 +120,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Mon Jul 22 2019 Marian Koncek - 5.5.1-1 +- Update to upstream version 5.5.1 + * Sat Jun 08 2019 Fabio Valentini - 5.4.2-1 - Update to version 5.2.4. diff --git a/sources b/sources index 3fb333a..56d67d8 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (junit5-5.4.2.tar.gz) = 4886b183622c561596d3c152e41335cb9af35cdfd2b3286cb71e43d5314efc757a1b96cff9d6e23dd674a3c118b007872baa488c4b8e5b82ab1a27e47e2cc119 -SHA512 (junit-platform-commons-1.4.2.pom) = 8d6aa89f6c82f180978cf0f6118c9689ae6a7a56e184499477f0813b35e40be0a1aac16b594dd079556a478e69f77b745591e34585dec94449c4c54fdb204109 -SHA512 (junit-platform-console-1.4.2.pom) = 1170c12de790bee31a3f1f3cf64c77afcde01d11bd9624e9fe5311670a3a2fa77c94f3d39557c5871d5ef02244039e1847d688c920682e59bea2c150596fba29 -SHA512 (junit-platform-console-standalone-1.4.2.pom) = 5542dd2c56ebc3d2e8c37b253fb9261bbcce6b4433bbf989070a4b6e83c09f929bc173e57d7a8eeac5369d12b24536c917b14280bb5b7326953fbc9a223a8006 -SHA512 (junit-platform-engine-1.4.2.pom) = c8c3e8937d111aa0e75dad223b5759c8fd22cda3a7269f749bfa4a346f3418162da9d1e511f16e2e95246f537dd5376cf8dba1458c33081928986786bfb961d8 -SHA512 (junit-platform-launcher-1.4.2.pom) = dcbcb1935d5a5300b996736bfafdf6bd4555c42942b29a28fb40edd3e8a778c699845cba301cfd59d687a8dad973b7e11fc7e7808d1cf446468d8f652ba573e7 -SHA512 (junit-platform-runner-1.4.2.pom) = 8dad62067b80922c625dc94b4d986f4688c1db55afe0d9a900b96a49db881acf390703482827fe2167509195ca15690229ae69d330e446f3d3645b5955ebe7c8 -SHA512 (junit-platform-suite-api-1.4.2.pom) = dfc8de1ddf2cb186c4cc060d3415b7866945b0649afc73cd4f194c03385c355cb21768c803abd60777bde8a6e48f905b662edf2d4372925ee6ea4c2e3f81e6fb -SHA512 (junit-platform-reporting-1.4.2.pom) = ceeb41321ebf8b5c653a511cad3cffe7a806d01b8e2a9a71e96a3a0ea760380d122123b8ce00f2126696b33035ff34b97618deaf43b7a549f8c0ee44bad75044 -SHA512 (junit-jupiter-api-5.4.2.pom) = 9c49d3d06f405ce96c84ee5a22802c85554e74df7f3400a4e55015cb006366717596defcf55be8eb76f6c7f9295a0a28dc2ba3b23393becf1016086887f25946 -SHA512 (junit-jupiter-engine-5.4.2.pom) = 8ebd0e3c04b53d8bfeba66333ba90a8ce5f47988fe6785c072af8bbebb3c3aa943b0b1a1df35432989b14b31b36394de30ec6d1c90f684f2925eafdf5e53c1c7 -SHA512 (junit-jupiter-migrationsupport-5.4.2.pom) = dd8b540f1e4a6b827a8691198009377e94ae1cd633b83ae0f2eb538a25f3822f654382e1a7eefedee6c1d6a29c03b7e4a089b9a153b4aac015ceffcdec6352cc -SHA512 (junit-jupiter-params-5.4.2.pom) = 6cadf4c9160c6cb3c9e35494178fc0f1695b3f4251092de5920c5102746ea59ac255b531483bbb46e16d16a0bde6f4ac62691696831cfe3a8981706e58948163 -SHA512 (junit-vintage-engine-5.4.2.pom) = 55bca2046d4e7b24b931d36b985581a6b3f71818b00603fdf3f041df4cf64d0ec38d23b4b383fc4e6ea45df65745ff7b924da2e433f040175a6d7cb858dbc9a0 +SHA512 (junit5-5.5.1.tar.gz) = ff5d92e113fb4e16b7137cc936a33a5eaedf2563ae88d8f676a43a76ca2f66f6eeea4fced539e03106902f1324c1105688d6385f084dc563b5d2e33cc1432d01 +SHA512 (junit-jupiter-api-5.5.1.pom) = ed673ddb808a46ca0d151be05c06e70ae46eacc0349f985edc719f1a21c32eb856ee9dbba409ab50d68d0499898dddd4449e7a19657791b82f926542729793f1 +SHA512 (junit-jupiter-engine-5.5.1.pom) = 37b0239a2c23549b27d207dabdd91644117c5034f35f98724d10d1be841eec56cd31b6aab31c840a4477f94a8a4628d815f18f325443d69568f1f2dc8e49f65b +SHA512 (junit-jupiter-migrationsupport-5.5.1.pom) = 244bbc52d13c7ac993ca89560d88000aa5d9e30eb84201e3dc0e7dcadaaacc649809518020982bafa1d444abf58e3e438c14efe75d8b88e4acb10311bde2ada2 +SHA512 (junit-jupiter-params-5.5.1.pom) = 1ac97a26d8514834a9a8dbd3d7ff350c786bb34a8e602f9d538fc9cfbd0d0570c69d9c9869fc647d1b183cef1132a0644f897bb8f5184f2a7bd10f9142410055 +SHA512 (junit-platform-commons-1.5.1.pom) = 9eece79d783c5995f35c365a662696dfeb845564218e2a3ebbc6647b9a8feac578c7ec7f134de662c45a0fd2465fa4c304d04eec58f5d7911ea4c989f09b03ee +SHA512 (junit-platform-console-1.5.1.pom) = 3dcdb1942718e98cd71f26391e6aecab347aea7fb5ef0360908b16546e085efe04ca385ff174cbf07b0f410344ac5581affd5d1558ff5f57fe7a6832371db5d0 +SHA512 (junit-platform-console-standalone-1.5.1.pom) = e6417c5a38351143c4998cb0ad6ea7de679cf011bd69ce9487660c90b8b7dc0fb3a795410f682ff4a4e3d730c8a258ab4b9c630fb26db770bda9992ce89877b0 +SHA512 (junit-platform-engine-1.5.1.pom) = 3e7c9ab0a82ef77bb3b65bcddcd8187dee4a6beaa463eb602e8eeb1cdbc5592fc7bf48e701b9689be19735a46b448b300c8e2a3d4fe6cbc46fd76f89e005abc3 +SHA512 (junit-platform-launcher-1.5.1.pom) = 0b7cefe883cd493cda1673c8bc671a580e5f6bace1be831918200f3999970bbe3f8a618a5c5370e4b2cfef9096830a8fb5d3068ed09df59f9d7c9766925671f4 +SHA512 (junit-platform-reporting-1.5.1.pom) = fda3e34e2b994b63792aee79d17fbc932f1528ba845b9cbc50a3b815caf9c6faf8c396de27ad636a71b1af44abe9c6d612dd9b788bc429c8163f1cd1c19ceaff +SHA512 (junit-platform-runner-1.5.1.pom) = 43ac7c8176020381d69795724e7866e896920743ba3f56268b65d728507e35180c224b686852c3f2a9b3bbf605a13d33c41d74742dcbad00171198102deba2fc +SHA512 (junit-platform-suite-api-1.5.1.pom) = c68a8be6f66db8c38f38cb96295d779ac059f074ec777937e171dbaade16464b5f8c4341a0edd121a2b7357957bbd3568d49c9bc92e225b6bee7a8f14a018aad +SHA512 (junit-vintage-engine-5.5.1.pom) = c03dc8c487c461fd142a8ba3589a78939556e90392effe829733615d8a75bd902c5bc3493cdcb115798537080350bb4fb572f913c255f09ce0806cc6a7964313 From b7b84919ba16e1379b7d62a5333db604c9a4a588 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jul 2019 10:42:05 +0200 Subject: [PATCH 04/16] Fix incorrect version in changelog --- junit5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5.spec b/junit5.spec index 3d0b002..2dfd7a2 100644 --- a/junit5.spec +++ b/junit5.spec @@ -124,7 +124,7 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api - Update to upstream version 5.5.1 * Sat Jun 08 2019 Fabio Valentini - 5.4.2-1 -- Update to version 5.2.4. +- Update to version 5.4.2 * Fri May 24 2019 Mikolaj Izdebski - 5.4.0-2 - Mass rebuild for javapackages-tools 201901 From 17c3a9241c59a4a9cadb342eebd3770e63356818 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Sep 2019 15:16:16 +0200 Subject: [PATCH 05/16] Update to upstream version 5.5.2 --- .gitignore | 14 ++++++++++++++ junit5.spec | 7 +++++-- sources | 28 ++++++++++++++-------------- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 47ff861..1da8719 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,17 @@ /junit-platform-runner-1.5.1.pom /junit-platform-suite-api-1.5.1.pom /junit-vintage-engine-5.5.1.pom +/junit5-5.5.2.tar.gz +/junit-jupiter-api-5.5.2.pom +/junit-jupiter-engine-5.5.2.pom +/junit-jupiter-migrationsupport-5.5.2.pom +/junit-jupiter-params-5.5.2.pom +/junit-platform-commons-1.5.2.pom +/junit-platform-console-1.5.2.pom +/junit-platform-console-standalone-1.5.2.pom +/junit-platform-engine-1.5.2.pom +/junit-platform-launcher-1.5.2.pom +/junit-platform-reporting-1.5.2.pom +/junit-platform-runner-1.5.2.pom +/junit-platform-suite-api-1.5.2.pom +/junit-vintage-engine-5.5.2.pom diff --git a/junit5.spec b/junit5.spec index 2dfd7a2..1f2a84b 100644 --- a/junit5.spec +++ b/junit5.spec @@ -4,7 +4,7 @@ %global vintage_version %{version} Name: junit5 -Version: 5.5.1 +Version: 5.5.2 Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 @@ -59,7 +59,7 @@ JUnit 5 User Guide. %prep %setup -q -n %{name}-r%{version} -find -name \*.jar -delete +find -name '*.jar' -delete cp -p %{SOURCE100} pom.xml cp -p %{SOURCE200} junit-platform-commons/pom.xml @@ -120,6 +120,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Wed Sep 11 2019 Marian Koncek - 5.5.2-1 +- Update to upstream version 5.5.2 + * Mon Jul 22 2019 Marian Koncek - 5.5.1-1 - Update to upstream version 5.5.1 diff --git a/sources b/sources index 56d67d8..6796aaf 100644 --- a/sources +++ b/sources @@ -1,14 +1,14 @@ -SHA512 (junit5-5.5.1.tar.gz) = ff5d92e113fb4e16b7137cc936a33a5eaedf2563ae88d8f676a43a76ca2f66f6eeea4fced539e03106902f1324c1105688d6385f084dc563b5d2e33cc1432d01 -SHA512 (junit-jupiter-api-5.5.1.pom) = ed673ddb808a46ca0d151be05c06e70ae46eacc0349f985edc719f1a21c32eb856ee9dbba409ab50d68d0499898dddd4449e7a19657791b82f926542729793f1 -SHA512 (junit-jupiter-engine-5.5.1.pom) = 37b0239a2c23549b27d207dabdd91644117c5034f35f98724d10d1be841eec56cd31b6aab31c840a4477f94a8a4628d815f18f325443d69568f1f2dc8e49f65b -SHA512 (junit-jupiter-migrationsupport-5.5.1.pom) = 244bbc52d13c7ac993ca89560d88000aa5d9e30eb84201e3dc0e7dcadaaacc649809518020982bafa1d444abf58e3e438c14efe75d8b88e4acb10311bde2ada2 -SHA512 (junit-jupiter-params-5.5.1.pom) = 1ac97a26d8514834a9a8dbd3d7ff350c786bb34a8e602f9d538fc9cfbd0d0570c69d9c9869fc647d1b183cef1132a0644f897bb8f5184f2a7bd10f9142410055 -SHA512 (junit-platform-commons-1.5.1.pom) = 9eece79d783c5995f35c365a662696dfeb845564218e2a3ebbc6647b9a8feac578c7ec7f134de662c45a0fd2465fa4c304d04eec58f5d7911ea4c989f09b03ee -SHA512 (junit-platform-console-1.5.1.pom) = 3dcdb1942718e98cd71f26391e6aecab347aea7fb5ef0360908b16546e085efe04ca385ff174cbf07b0f410344ac5581affd5d1558ff5f57fe7a6832371db5d0 -SHA512 (junit-platform-console-standalone-1.5.1.pom) = e6417c5a38351143c4998cb0ad6ea7de679cf011bd69ce9487660c90b8b7dc0fb3a795410f682ff4a4e3d730c8a258ab4b9c630fb26db770bda9992ce89877b0 -SHA512 (junit-platform-engine-1.5.1.pom) = 3e7c9ab0a82ef77bb3b65bcddcd8187dee4a6beaa463eb602e8eeb1cdbc5592fc7bf48e701b9689be19735a46b448b300c8e2a3d4fe6cbc46fd76f89e005abc3 -SHA512 (junit-platform-launcher-1.5.1.pom) = 0b7cefe883cd493cda1673c8bc671a580e5f6bace1be831918200f3999970bbe3f8a618a5c5370e4b2cfef9096830a8fb5d3068ed09df59f9d7c9766925671f4 -SHA512 (junit-platform-reporting-1.5.1.pom) = fda3e34e2b994b63792aee79d17fbc932f1528ba845b9cbc50a3b815caf9c6faf8c396de27ad636a71b1af44abe9c6d612dd9b788bc429c8163f1cd1c19ceaff -SHA512 (junit-platform-runner-1.5.1.pom) = 43ac7c8176020381d69795724e7866e896920743ba3f56268b65d728507e35180c224b686852c3f2a9b3bbf605a13d33c41d74742dcbad00171198102deba2fc -SHA512 (junit-platform-suite-api-1.5.1.pom) = c68a8be6f66db8c38f38cb96295d779ac059f074ec777937e171dbaade16464b5f8c4341a0edd121a2b7357957bbd3568d49c9bc92e225b6bee7a8f14a018aad -SHA512 (junit-vintage-engine-5.5.1.pom) = c03dc8c487c461fd142a8ba3589a78939556e90392effe829733615d8a75bd902c5bc3493cdcb115798537080350bb4fb572f913c255f09ce0806cc6a7964313 +SHA512 (junit5-5.5.2.tar.gz) = 1d6a5fae7bfddc33b7c05f756819350cd89a44f3ba60cf74a520755ba36b535f1761ad43c45a2523ef9146f2361acc29350f506fe2e2cc25c61abe5e61b98541 +SHA512 (junit-jupiter-api-5.5.2.pom) = a03629bf37ba194f738b672440476c573400db5f1de5ca163ee8aaca2903f9aae5802f7c2a6f6dcd9f77b0f5bc632549a57716128e04244751bbcc4ec7b5124c +SHA512 (junit-jupiter-engine-5.5.2.pom) = c7a5c24d5de7294573e995242d0bfb557ac1c4390b094229f8083617c4ff909aa03b0f91cfa1a8aad836f0badffd285759636ee301ac82977eb605ec7e47baa8 +SHA512 (junit-jupiter-migrationsupport-5.5.2.pom) = a88bad81fa77e04301adc017fd79a288a0da620cdfc7318fcd8ba1c94edccdbfb867cb5badf1e43780b0ef514f15eb41b5c143450f82d4ae45decfbfaaeab2a7 +SHA512 (junit-jupiter-params-5.5.2.pom) = 0991c1d7d1ac49337970b0660e62ce6293ca3f7f576aacc6c4fbb3d996ecd751e0009f381a9ebf4955a937db180de5e33f58c2144425ba533b54a46f0684d00b +SHA512 (junit-platform-commons-1.5.2.pom) = 8ba867f0fe0dd31e758e03c1293de7ace865896db6f1ddd344138e8e1c5e5d28a5c26ae6bd189d3c9ebb27254ec8f6b0bf89fe9b69ed4698b13f63401145216e +SHA512 (junit-platform-console-1.5.2.pom) = 635698b075b97da4b6625a21a0f1faddfea15e4005ef3ed076bde44b3798a4233e5ab26f0091efdc53afdb62cbdf0f3bd2b4cc4d7e8a6e35d3f150b7f424030e +SHA512 (junit-platform-console-standalone-1.5.2.pom) = 35ee52c88309dfd6f392d58b8647cb29ed1d8ea465ce49619251c3b720afa42d336a13df8b153d2c31098a8c686373ebe42b366c5bd17647a4a320c45b414868 +SHA512 (junit-platform-engine-1.5.2.pom) = 37f9df42f90c9f20d03264d6b686bfa5c73f5f35b691a717b7a8c4d8dc9cd6d8b2f88f710f63469c68ba71ecbf3261abf91e7e34ef40ce209c8f8c17ed261002 +SHA512 (junit-platform-launcher-1.5.2.pom) = 4bd03ee23d23e632f7d7601f69234e6e93aa9fee22d69d209221d2242d734eb26a4932a4ca36dfac6d6afca3b85c17aaf361064e8d8e29aaa8759dfb9c1d327d +SHA512 (junit-platform-reporting-1.5.2.pom) = 1a2b293e6edc9799da25076b837a0dfa3b10ef0ecb5d1ebec37b0e896c6c0e3f71c3a36d9b11900ace2d340b63a64cfd6c43378c49fb4d55874c27156ac4c49e +SHA512 (junit-platform-runner-1.5.2.pom) = 729222bb7c4efbde90754e49a0ae5da57863536bd5c8a836dac419812f916a4ed20e0edefaff93d95686c6bc832eb8a194ebcc0ba8e67b2a739682ec62d50e43 +SHA512 (junit-platform-suite-api-1.5.2.pom) = 75a9a000adb4fbc096aff5404c104eb24f547495acb1ec1efe8f4bf2dea3f49cc1dfd04432b1052a33fd35bf4962ad962b5e1dc93f8ea690903efff6dd0c4b4f +SHA512 (junit-vintage-engine-5.5.2.pom) = bf1b77da9898a25b29c2443b7e193d5f7a61d056e6892acb324ae7771fb8175d5897d4f858622e7a71969f5405f0138a0cc0f8fbbb40860982d200ed121aadf1 From 1f3206c7c450dbc3830084fadec2a34f9b994b39 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 10:22:40 +0100 Subject: [PATCH 06/16] Build and install junit-jupiter aggregator --- .gitignore | 1 + aggregator.pom | 1 + junit5.spec | 7 ++++++- sources | 11 ++++++----- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1da8719..a04fe71 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /junit-platform-runner-1.5.2.pom /junit-platform-suite-api-1.5.2.pom /junit-vintage-engine-5.5.2.pom +/junit-jupiter-5.5.2.pom diff --git a/aggregator.pom b/aggregator.pom index 3129653..a858526 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -13,6 +13,7 @@ junit-platform-reporting junit-platform-runner junit-platform-suite-api + junit-jupiter junit-jupiter-api junit-jupiter-engine junit-jupiter-migrationsupport diff --git a/junit5.spec b/junit5.spec index 1f2a84b..c958bc1 100644 --- a/junit5.spec +++ b/junit5.spec @@ -5,7 +5,7 @@ Name: junit5 Version: 5.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java regression testing framework License: EPL-2.0 URL: http://junit.org/junit5/ @@ -25,6 +25,7 @@ Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform 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-reporting/%{platform_version}/junit-platform-reporting-%{platform_version}.pom # Jupiter POMs +Source300: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/%{jupiter_version}/junit-jupiter-%{jupiter_version}.pom 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 Source303: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-migrationsupport/%{jupiter_version}/junit-jupiter-migrationsupport-%{jupiter_version}.pom @@ -70,6 +71,7 @@ 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-reporting/pom.xml +cp -p %{SOURCE300} junit-jupiter/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 @@ -120,6 +122,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Mon Oct 28 2019 Mikolaj Izdebski - 5.5.2-2 +- Build and install junit-jupiter aggregator + * Wed Sep 11 2019 Marian Koncek - 5.5.2-1 - Update to upstream version 5.5.2 diff --git a/sources b/sources index 6796aaf..9e1e481 100644 --- a/sources +++ b/sources @@ -1,14 +1,15 @@ SHA512 (junit5-5.5.2.tar.gz) = 1d6a5fae7bfddc33b7c05f756819350cd89a44f3ba60cf74a520755ba36b535f1761ad43c45a2523ef9146f2361acc29350f506fe2e2cc25c61abe5e61b98541 -SHA512 (junit-jupiter-api-5.5.2.pom) = a03629bf37ba194f738b672440476c573400db5f1de5ca163ee8aaca2903f9aae5802f7c2a6f6dcd9f77b0f5bc632549a57716128e04244751bbcc4ec7b5124c -SHA512 (junit-jupiter-engine-5.5.2.pom) = c7a5c24d5de7294573e995242d0bfb557ac1c4390b094229f8083617c4ff909aa03b0f91cfa1a8aad836f0badffd285759636ee301ac82977eb605ec7e47baa8 -SHA512 (junit-jupiter-migrationsupport-5.5.2.pom) = a88bad81fa77e04301adc017fd79a288a0da620cdfc7318fcd8ba1c94edccdbfb867cb5badf1e43780b0ef514f15eb41b5c143450f82d4ae45decfbfaaeab2a7 -SHA512 (junit-jupiter-params-5.5.2.pom) = 0991c1d7d1ac49337970b0660e62ce6293ca3f7f576aacc6c4fbb3d996ecd751e0009f381a9ebf4955a937db180de5e33f58c2144425ba533b54a46f0684d00b SHA512 (junit-platform-commons-1.5.2.pom) = 8ba867f0fe0dd31e758e03c1293de7ace865896db6f1ddd344138e8e1c5e5d28a5c26ae6bd189d3c9ebb27254ec8f6b0bf89fe9b69ed4698b13f63401145216e SHA512 (junit-platform-console-1.5.2.pom) = 635698b075b97da4b6625a21a0f1faddfea15e4005ef3ed076bde44b3798a4233e5ab26f0091efdc53afdb62cbdf0f3bd2b4cc4d7e8a6e35d3f150b7f424030e SHA512 (junit-platform-console-standalone-1.5.2.pom) = 35ee52c88309dfd6f392d58b8647cb29ed1d8ea465ce49619251c3b720afa42d336a13df8b153d2c31098a8c686373ebe42b366c5bd17647a4a320c45b414868 SHA512 (junit-platform-engine-1.5.2.pom) = 37f9df42f90c9f20d03264d6b686bfa5c73f5f35b691a717b7a8c4d8dc9cd6d8b2f88f710f63469c68ba71ecbf3261abf91e7e34ef40ce209c8f8c17ed261002 SHA512 (junit-platform-launcher-1.5.2.pom) = 4bd03ee23d23e632f7d7601f69234e6e93aa9fee22d69d209221d2242d734eb26a4932a4ca36dfac6d6afca3b85c17aaf361064e8d8e29aaa8759dfb9c1d327d -SHA512 (junit-platform-reporting-1.5.2.pom) = 1a2b293e6edc9799da25076b837a0dfa3b10ef0ecb5d1ebec37b0e896c6c0e3f71c3a36d9b11900ace2d340b63a64cfd6c43378c49fb4d55874c27156ac4c49e SHA512 (junit-platform-runner-1.5.2.pom) = 729222bb7c4efbde90754e49a0ae5da57863536bd5c8a836dac419812f916a4ed20e0edefaff93d95686c6bc832eb8a194ebcc0ba8e67b2a739682ec62d50e43 SHA512 (junit-platform-suite-api-1.5.2.pom) = 75a9a000adb4fbc096aff5404c104eb24f547495acb1ec1efe8f4bf2dea3f49cc1dfd04432b1052a33fd35bf4962ad962b5e1dc93f8ea690903efff6dd0c4b4f +SHA512 (junit-platform-reporting-1.5.2.pom) = 1a2b293e6edc9799da25076b837a0dfa3b10ef0ecb5d1ebec37b0e896c6c0e3f71c3a36d9b11900ace2d340b63a64cfd6c43378c49fb4d55874c27156ac4c49e +SHA512 (junit-jupiter-5.5.2.pom) = 09fff9583df533c4d8da5e33b1eabaecdf22f649011925f0ddb312193aea4b464007d49d2b9dbb9ae8d2970ae8b2dfae83a3f9bd602ea09a34ba0cb9185a3168 +SHA512 (junit-jupiter-api-5.5.2.pom) = a03629bf37ba194f738b672440476c573400db5f1de5ca163ee8aaca2903f9aae5802f7c2a6f6dcd9f77b0f5bc632549a57716128e04244751bbcc4ec7b5124c +SHA512 (junit-jupiter-engine-5.5.2.pom) = c7a5c24d5de7294573e995242d0bfb557ac1c4390b094229f8083617c4ff909aa03b0f91cfa1a8aad836f0badffd285759636ee301ac82977eb605ec7e47baa8 +SHA512 (junit-jupiter-migrationsupport-5.5.2.pom) = a88bad81fa77e04301adc017fd79a288a0da620cdfc7318fcd8ba1c94edccdbfb867cb5badf1e43780b0ef514f15eb41b5c143450f82d4ae45decfbfaaeab2a7 +SHA512 (junit-jupiter-params-5.5.2.pom) = 0991c1d7d1ac49337970b0660e62ce6293ca3f7f576aacc6c4fbb3d996ecd751e0009f381a9ebf4955a937db180de5e33f58c2144425ba533b54a46f0684d00b SHA512 (junit-vintage-engine-5.5.2.pom) = bf1b77da9898a25b29c2443b7e193d5f7a61d056e6892acb324ae7771fb8175d5897d4f858622e7a71969f5405f0138a0cc0f8fbbb40860982d200ed121aadf1 From ca54c4eb1af013a8c5c6d14ad6e98e141eb2cdf4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 07/16] Mass rebuild for javapackages-tools 201902 --- junit5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/junit5.spec b/junit5.spec index c958bc1..528888b 100644 --- a/junit5.spec +++ b/junit5.spec @@ -5,7 +5,7 @@ Name: junit5 Version: 5.5.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java regression testing framework License: EPL-2.0 URL: http://junit.org/junit5/ @@ -122,6 +122,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 5.5.2-3 +- Mass rebuild for javapackages-tools 201902 + * Mon Oct 28 2019 Mikolaj Izdebski - 5.5.2-2 - Build and install junit-jupiter aggregator From d0b7868334f9ac24af02c3dbe60c37e1a0995ef3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Mar 2020 12:34:58 +0100 Subject: [PATCH 08/16] Update to upstream version 5.6.0 --- .gitignore | 15 +++++++++++++++ aggregator.pom | 1 + junit5.spec | 12 +++++++++--- sources | 30 +++++++++++++++--------------- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index a04fe71..1e51eae 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,18 @@ /junit-platform-suite-api-1.5.2.pom /junit-vintage-engine-5.5.2.pom /junit-jupiter-5.5.2.pom +/junit5-5.6.0.tar.gz +/junit-bom-5.6.0.pom +/junit-jupiter-api-5.6.0.pom +/junit-jupiter-engine-5.6.0.pom +/junit-jupiter-migrationsupport-5.6.0.pom +/junit-jupiter-params-5.6.0.pom +/junit-platform-commons-1.6.0.pom +/junit-platform-console-1.6.0.pom +/junit-platform-console-standalone-1.6.0.pom +/junit-platform-engine-1.6.0.pom +/junit-platform-launcher-1.6.0.pom +/junit-platform-reporting-1.6.0.pom +/junit-platform-runner-1.6.0.pom +/junit-platform-suite-api-1.6.0.pom +/junit-vintage-engine-5.6.0.pom diff --git a/aggregator.pom b/aggregator.pom index a858526..75a1aef 100644 --- a/aggregator.pom +++ b/aggregator.pom @@ -5,6 +5,7 @@ 1.0.0 pom + junit-bom junit-platform-commons junit-platform-console junit-platform-console-standalone diff --git a/junit5.spec b/junit5.spec index 528888b..a00bd34 100644 --- a/junit5.spec +++ b/junit5.spec @@ -4,11 +4,11 @@ %global vintage_version %{version} Name: junit5 -Version: 5.5.2 -Release: 3%{?dist} +Version: 5.6.0 +Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 -URL: http://junit.org/junit5/ +URL: https://junit.org/junit5/ BuildArch: noarch Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz @@ -32,6 +32,8 @@ Source303: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-m Source304: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/%{jupiter_version}/junit-jupiter-params-%{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 +# BOM POM +Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom BuildRequires: maven-local BuildRequires: mvn(com.univocity:univocity-parsers) @@ -77,6 +79,7 @@ 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 %{SOURCE400} junit-vintage-engine/pom.xml +cp -p %{SOURCE500} junit-bom/pom.xml for pom in $(find -mindepth 2 -name pom.xml); do # Set parent to aggregator @@ -122,6 +125,9 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %doc documentation/src/docs/* %changelog +* Wed Mar 04 2020 Marian Koncek - 5.6.0-1 +- Update to upstream version 5.6.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 5.5.2-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 9e1e481..ef4c654 100644 --- a/sources +++ b/sources @@ -1,15 +1,15 @@ -SHA512 (junit5-5.5.2.tar.gz) = 1d6a5fae7bfddc33b7c05f756819350cd89a44f3ba60cf74a520755ba36b535f1761ad43c45a2523ef9146f2361acc29350f506fe2e2cc25c61abe5e61b98541 -SHA512 (junit-platform-commons-1.5.2.pom) = 8ba867f0fe0dd31e758e03c1293de7ace865896db6f1ddd344138e8e1c5e5d28a5c26ae6bd189d3c9ebb27254ec8f6b0bf89fe9b69ed4698b13f63401145216e -SHA512 (junit-platform-console-1.5.2.pom) = 635698b075b97da4b6625a21a0f1faddfea15e4005ef3ed076bde44b3798a4233e5ab26f0091efdc53afdb62cbdf0f3bd2b4cc4d7e8a6e35d3f150b7f424030e -SHA512 (junit-platform-console-standalone-1.5.2.pom) = 35ee52c88309dfd6f392d58b8647cb29ed1d8ea465ce49619251c3b720afa42d336a13df8b153d2c31098a8c686373ebe42b366c5bd17647a4a320c45b414868 -SHA512 (junit-platform-engine-1.5.2.pom) = 37f9df42f90c9f20d03264d6b686bfa5c73f5f35b691a717b7a8c4d8dc9cd6d8b2f88f710f63469c68ba71ecbf3261abf91e7e34ef40ce209c8f8c17ed261002 -SHA512 (junit-platform-launcher-1.5.2.pom) = 4bd03ee23d23e632f7d7601f69234e6e93aa9fee22d69d209221d2242d734eb26a4932a4ca36dfac6d6afca3b85c17aaf361064e8d8e29aaa8759dfb9c1d327d -SHA512 (junit-platform-runner-1.5.2.pom) = 729222bb7c4efbde90754e49a0ae5da57863536bd5c8a836dac419812f916a4ed20e0edefaff93d95686c6bc832eb8a194ebcc0ba8e67b2a739682ec62d50e43 -SHA512 (junit-platform-suite-api-1.5.2.pom) = 75a9a000adb4fbc096aff5404c104eb24f547495acb1ec1efe8f4bf2dea3f49cc1dfd04432b1052a33fd35bf4962ad962b5e1dc93f8ea690903efff6dd0c4b4f -SHA512 (junit-platform-reporting-1.5.2.pom) = 1a2b293e6edc9799da25076b837a0dfa3b10ef0ecb5d1ebec37b0e896c6c0e3f71c3a36d9b11900ace2d340b63a64cfd6c43378c49fb4d55874c27156ac4c49e -SHA512 (junit-jupiter-5.5.2.pom) = 09fff9583df533c4d8da5e33b1eabaecdf22f649011925f0ddb312193aea4b464007d49d2b9dbb9ae8d2970ae8b2dfae83a3f9bd602ea09a34ba0cb9185a3168 -SHA512 (junit-jupiter-api-5.5.2.pom) = a03629bf37ba194f738b672440476c573400db5f1de5ca163ee8aaca2903f9aae5802f7c2a6f6dcd9f77b0f5bc632549a57716128e04244751bbcc4ec7b5124c -SHA512 (junit-jupiter-engine-5.5.2.pom) = c7a5c24d5de7294573e995242d0bfb557ac1c4390b094229f8083617c4ff909aa03b0f91cfa1a8aad836f0badffd285759636ee301ac82977eb605ec7e47baa8 -SHA512 (junit-jupiter-migrationsupport-5.5.2.pom) = a88bad81fa77e04301adc017fd79a288a0da620cdfc7318fcd8ba1c94edccdbfb867cb5badf1e43780b0ef514f15eb41b5c143450f82d4ae45decfbfaaeab2a7 -SHA512 (junit-jupiter-params-5.5.2.pom) = 0991c1d7d1ac49337970b0660e62ce6293ca3f7f576aacc6c4fbb3d996ecd751e0009f381a9ebf4955a937db180de5e33f58c2144425ba533b54a46f0684d00b -SHA512 (junit-vintage-engine-5.5.2.pom) = bf1b77da9898a25b29c2443b7e193d5f7a61d056e6892acb324ae7771fb8175d5897d4f858622e7a71969f5405f0138a0cc0f8fbbb40860982d200ed121aadf1 +SHA512 (junit5-5.6.0.tar.gz) = b913a23afdcc6bb31617d9ab035ce283a3395e4ef81561ba2eefd5c1a7f6675e41482fc5b2ae4d098334e589e8f03b53e4aff75f0575071a87a39e10121e5bdb +SHA512 (junit-bom-5.6.0.pom) = d6def10ebce22023efdca9238cb280116802018d1b99395942a4e095dfb5ffaacd729236962e9a51da477e8dbffb4e9d74248210d59ddb05269ff33a909e0047 +SHA512 (junit-jupiter-api-5.6.0.pom) = 80e0d62c3a90f8c6b43a7f6b8408621ec64a63677fc9292590e1e70f9a2b9edae54639554a3f01d677ddf426be46cf09bf6cf41d591f17c94a54e27fd4cdc4b0 +SHA512 (junit-jupiter-engine-5.6.0.pom) = 84333c6041d318dd5f8506551b92dbbb68864faf21cf80426b556b0d0a9a849b766ac39f5e7b9793b05ed4f9b8697095f647dd1b3f33f2cf601108cbf6e4827a +SHA512 (junit-jupiter-migrationsupport-5.6.0.pom) = b8a906aadf0b46c12ddc58dc134f3e75c7c745128de62485eb28510b3dc470669f97e03dc21a20cdb1802da94dd618200b0596a8bcedebfddf2eabf9f9c303ae +SHA512 (junit-jupiter-params-5.6.0.pom) = edd6119959837a82848330a8e30ca4b94c73fedfbcc460e552a160dbce2956009834d183c534f338d0393b881bcc949af3986550b2ee112e1d3e8a5aed3d2b92 +SHA512 (junit-platform-commons-1.6.0.pom) = 21e9beacb822eceb9472c5cda499ac8eea518f88ecc0297bed66b67fa10b4c35377253bcf83cefe176d1b9134dd99256ecc78b59814e6711b91f30cc6162cd70 +SHA512 (junit-platform-console-1.6.0.pom) = f80f4c43dc9c219ed016ba9270a5739ad479c38bee5c7c7ef245a6ba073978718f0fc012fb74b47ecfec5ed5de23e99330f7332d134cce103be24b902befc17b +SHA512 (junit-platform-console-standalone-1.6.0.pom) = 1321917051d403e61f874f313009f109b33137686a797bc67e08a3cca5fee8721a215af806442dd0b9950a5c29c4bbb014c6642a4d302cef2cd3d3985f4ac436 +SHA512 (junit-platform-engine-1.6.0.pom) = 60aaeb9d015a78ebbfab9aed64cfa231e3b357943bd27b5fe0347e034f7b46388cdee32ca4cbf2975c2f862014d6080ca536ce0496bbc984917e1ddc8d9bb393 +SHA512 (junit-platform-launcher-1.6.0.pom) = 62b588340ef5980cc51e1d80659c773d1850ca7f3592c3b150b80dae3be4985ea2eba6966e536f5572929f305dc3061ccbcc4dc5ac7d400109fc5072c013d93c +SHA512 (junit-platform-reporting-1.6.0.pom) = 8be9b5949f55619602c0ca49e9bb53459addeac4d86dd5ae007ccb00b19d16504b346c4743b10df2d3748dc8caa5d9931b45d935e61f616c57ec2434cf90c373 +SHA512 (junit-platform-runner-1.6.0.pom) = c4e044a1515bd6e3c61f5c179889cec9712e75f8ca68be1ae5c76d550982747181d71f342bc5f3abc1a6da30fcc09b3a896ca489da64891b33b41d926a69f0cf +SHA512 (junit-platform-suite-api-1.6.0.pom) = 4b5ccf870180a3e059d0f198fa51c8c40630784be1c91fb4e56df7a96c1b9e214fa1a56117898976ae7da4ad7a0979c40df74fe17c53646c65defc63820c8f7c +SHA512 (junit-vintage-engine-5.6.0.pom) = 3c80822cdbaca77de8d1fe2da151f3599f75800fd8edd0d44e93c60a0934b8800f78acad6f3c0becf736a3b610584022f4942eed8bca24879950e1e8bb912e57 From c1fe788926d11d9afd4bcee364cb1a4e6475b2a8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 4 Mar 2020 12:40:40 +0100 Subject: [PATCH 09/16] Fix sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 1e51eae..61e7746 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ /junit-platform-runner-1.6.0.pom /junit-platform-suite-api-1.6.0.pom /junit-vintage-engine-5.6.0.pom +/junit-jupiter-5.6.0.pom diff --git a/sources b/sources index ef4c654..ec0990d 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ SHA512 (junit5-5.6.0.tar.gz) = b913a23afdcc6bb31617d9ab035ce283a3395e4ef81561ba2eefd5c1a7f6675e41482fc5b2ae4d098334e589e8f03b53e4aff75f0575071a87a39e10121e5bdb SHA512 (junit-bom-5.6.0.pom) = d6def10ebce22023efdca9238cb280116802018d1b99395942a4e095dfb5ffaacd729236962e9a51da477e8dbffb4e9d74248210d59ddb05269ff33a909e0047 +SHA512 (junit-jupiter-5.6.0.pom) = a4b454c242a8f04987bf3d013cdf44cc21ef928190934f66b78e5efa8d1162f07e6c8b26475ee4cceb2ef57839c7d264a4d7031a79123aee75f23863b48d8bee SHA512 (junit-jupiter-api-5.6.0.pom) = 80e0d62c3a90f8c6b43a7f6b8408621ec64a63677fc9292590e1e70f9a2b9edae54639554a3f01d677ddf426be46cf09bf6cf41d591f17c94a54e27fd4cdc4b0 SHA512 (junit-jupiter-engine-5.6.0.pom) = 84333c6041d318dd5f8506551b92dbbb68864faf21cf80426b556b0d0a9a849b766ac39f5e7b9793b05ed4f9b8697095f647dd1b3f33f2cf601108cbf6e4827a SHA512 (junit-jupiter-migrationsupport-5.6.0.pom) = b8a906aadf0b46c12ddc58dc134f3e75c7c745128de62485eb28510b3dc470669f97e03dc21a20cdb1802da94dd618200b0596a8bcedebfddf2eabf9f9c303ae From 29df7511855bf9fee56995418d009260086cf254 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 May 2020 17:27:47 +0200 Subject: [PATCH 10/16] Drop guide subpackage --- junit5.spec | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/junit5.spec b/junit5.spec index a00bd34..2b4deb3 100644 --- a/junit5.spec +++ b/junit5.spec @@ -42,8 +42,6 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.opentest4j:opentest4j) -BuildRequires: asciidoc - %description JUnit is a popular regression testing framework for Java platform. @@ -53,13 +51,6 @@ Summary: Javadoc for %{name} %description javadoc Junit5 API documentation. -%package guide -Summary: Documentation for %{name} -Requires: %{name}-javadoc = %{version}-%{release} - -%description guide -JUnit 5 User Guide. - %prep %setup -q -n %{name}-r%{version} find -name '*.jar' -delete @@ -107,11 +98,6 @@ done %build %mvn_build -f -# Build docs. Ignore exit asciidoc -- it fails for some reason, but -# still produces readable docs. -asciidoc documentation/src/docs/asciidoc/index.adoc || : -ln -s ../../javadoc/junit5 documentation/src/docs/api - %install %mvn_install @@ -121,9 +107,6 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api %files javadoc -f .mfiles-javadoc %license LICENSE.md LICENSE-notice.md -%files guide -%doc documentation/src/docs/* - %changelog * Wed Mar 04 2020 Marian Koncek - 5.6.0-1 - Update to upstream version 5.6.0 From 9c8bf6662fa7001822b8056a62b53acd32ba15f3 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 28 Jul 2020 13:46:35 +0200 Subject: [PATCH 11/16] Update to upstream version 5.6.2 --- .gitignore | 16 ++++++++++++++++ junit5.spec | 5 ++++- sources | 32 ++++++++++++++++---------------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 61e7746..bed256c 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,19 @@ /junit-platform-suite-api-1.6.0.pom /junit-vintage-engine-5.6.0.pom /junit-jupiter-5.6.0.pom +/junit5-5.6.2.tar.gz +/junit-bom-5.6.2.pom +/junit-jupiter-5.6.2.pom +/junit-jupiter-api-5.6.2.pom +/junit-jupiter-engine-5.6.2.pom +/junit-jupiter-migrationsupport-5.6.2.pom +/junit-jupiter-params-5.6.2.pom +/junit-platform-commons-1.6.2.pom +/junit-platform-console-1.6.2.pom +/junit-platform-console-standalone-1.6.2.pom +/junit-platform-engine-1.6.2.pom +/junit-platform-launcher-1.6.2.pom +/junit-platform-reporting-1.6.2.pom +/junit-platform-runner-1.6.2.pom +/junit-platform-suite-api-1.6.2.pom +/junit-vintage-engine-5.6.2.pom diff --git a/junit5.spec b/junit5.spec index 2b4deb3..c55646c 100644 --- a/junit5.spec +++ b/junit5.spec @@ -4,7 +4,7 @@ %global vintage_version %{version} Name: junit5 -Version: 5.6.0 +Version: 5.6.2 Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 @@ -108,6 +108,9 @@ done %license LICENSE.md LICENSE-notice.md %changelog +* Tue Jul 28 2020 Marian Koncek - 5.6.2-1 +- Update to upstream version 5.6.2 + * Wed Mar 04 2020 Marian Koncek - 5.6.0-1 - Update to upstream version 5.6.0 diff --git a/sources b/sources index ec0990d..77dffb5 100644 --- a/sources +++ b/sources @@ -1,16 +1,16 @@ -SHA512 (junit5-5.6.0.tar.gz) = b913a23afdcc6bb31617d9ab035ce283a3395e4ef81561ba2eefd5c1a7f6675e41482fc5b2ae4d098334e589e8f03b53e4aff75f0575071a87a39e10121e5bdb -SHA512 (junit-bom-5.6.0.pom) = d6def10ebce22023efdca9238cb280116802018d1b99395942a4e095dfb5ffaacd729236962e9a51da477e8dbffb4e9d74248210d59ddb05269ff33a909e0047 -SHA512 (junit-jupiter-5.6.0.pom) = a4b454c242a8f04987bf3d013cdf44cc21ef928190934f66b78e5efa8d1162f07e6c8b26475ee4cceb2ef57839c7d264a4d7031a79123aee75f23863b48d8bee -SHA512 (junit-jupiter-api-5.6.0.pom) = 80e0d62c3a90f8c6b43a7f6b8408621ec64a63677fc9292590e1e70f9a2b9edae54639554a3f01d677ddf426be46cf09bf6cf41d591f17c94a54e27fd4cdc4b0 -SHA512 (junit-jupiter-engine-5.6.0.pom) = 84333c6041d318dd5f8506551b92dbbb68864faf21cf80426b556b0d0a9a849b766ac39f5e7b9793b05ed4f9b8697095f647dd1b3f33f2cf601108cbf6e4827a -SHA512 (junit-jupiter-migrationsupport-5.6.0.pom) = b8a906aadf0b46c12ddc58dc134f3e75c7c745128de62485eb28510b3dc470669f97e03dc21a20cdb1802da94dd618200b0596a8bcedebfddf2eabf9f9c303ae -SHA512 (junit-jupiter-params-5.6.0.pom) = edd6119959837a82848330a8e30ca4b94c73fedfbcc460e552a160dbce2956009834d183c534f338d0393b881bcc949af3986550b2ee112e1d3e8a5aed3d2b92 -SHA512 (junit-platform-commons-1.6.0.pom) = 21e9beacb822eceb9472c5cda499ac8eea518f88ecc0297bed66b67fa10b4c35377253bcf83cefe176d1b9134dd99256ecc78b59814e6711b91f30cc6162cd70 -SHA512 (junit-platform-console-1.6.0.pom) = f80f4c43dc9c219ed016ba9270a5739ad479c38bee5c7c7ef245a6ba073978718f0fc012fb74b47ecfec5ed5de23e99330f7332d134cce103be24b902befc17b -SHA512 (junit-platform-console-standalone-1.6.0.pom) = 1321917051d403e61f874f313009f109b33137686a797bc67e08a3cca5fee8721a215af806442dd0b9950a5c29c4bbb014c6642a4d302cef2cd3d3985f4ac436 -SHA512 (junit-platform-engine-1.6.0.pom) = 60aaeb9d015a78ebbfab9aed64cfa231e3b357943bd27b5fe0347e034f7b46388cdee32ca4cbf2975c2f862014d6080ca536ce0496bbc984917e1ddc8d9bb393 -SHA512 (junit-platform-launcher-1.6.0.pom) = 62b588340ef5980cc51e1d80659c773d1850ca7f3592c3b150b80dae3be4985ea2eba6966e536f5572929f305dc3061ccbcc4dc5ac7d400109fc5072c013d93c -SHA512 (junit-platform-reporting-1.6.0.pom) = 8be9b5949f55619602c0ca49e9bb53459addeac4d86dd5ae007ccb00b19d16504b346c4743b10df2d3748dc8caa5d9931b45d935e61f616c57ec2434cf90c373 -SHA512 (junit-platform-runner-1.6.0.pom) = c4e044a1515bd6e3c61f5c179889cec9712e75f8ca68be1ae5c76d550982747181d71f342bc5f3abc1a6da30fcc09b3a896ca489da64891b33b41d926a69f0cf -SHA512 (junit-platform-suite-api-1.6.0.pom) = 4b5ccf870180a3e059d0f198fa51c8c40630784be1c91fb4e56df7a96c1b9e214fa1a56117898976ae7da4ad7a0979c40df74fe17c53646c65defc63820c8f7c -SHA512 (junit-vintage-engine-5.6.0.pom) = 3c80822cdbaca77de8d1fe2da151f3599f75800fd8edd0d44e93c60a0934b8800f78acad6f3c0becf736a3b610584022f4942eed8bca24879950e1e8bb912e57 +SHA512 (junit5-5.6.2.tar.gz) = 9dd5de496b81a66f847f8e6c208e2a6ad7646120d9720e34ac983283a37aeb446023b5525d7846cb0c7377072f65424b7ddf74912ed776c7705b30c1cb8e5509 +SHA512 (junit-bom-5.6.2.pom) = d38eecbc6e55a06e1ba6818277c4ee1d645809325a524b3f79816ae06688b216a0f8aa1b2172c48c8dbfe592f61a862b657890e8270ad22e2d651131dc8ebd04 +SHA512 (junit-jupiter-5.6.2.pom) = 2f86da7c98f93d351e8f478e6e1fce069bb717c89f1d534eff6b84f4da8c4dfce61ae12f6bfd26b21a06fde383298e898da5314e6a5f97a97a33dfdb4a4bfe31 +SHA512 (junit-jupiter-api-5.6.2.pom) = d23342fb271a3852dfda8f77ae9f0e5e6d98c68f6d9e1380ce97617d3f393f4b3f02b678ca66da22413139cd0056b7ec7e030bda9c2067c2388d68f468aee2ae +SHA512 (junit-jupiter-engine-5.6.2.pom) = 38375c8db1c4e630e7abd5f0889acb23db964c7122e4aed7d0a08af1edc377274444e5aa8ccb2a6b8f559fc698df2bed117a28a1ff9c238080020fac18ece68d +SHA512 (junit-jupiter-migrationsupport-5.6.2.pom) = 83624d8b8f7c34296dead8f1816698b5e6ccb9560fdff5e7cdb07715ed2e446244ba2e1463f5b37fdd8a09b8c49ef56f4bf7744a5ff7803d1bf51fa131464950 +SHA512 (junit-jupiter-params-5.6.2.pom) = 94e36303621eb15ea131463db03cad3c72dc1b54716afc439ce08520cf6a84bb93e505827cec3d1c6ae2fc0987a13e3c0f117d254fd107266309e9e1493ebb1b +SHA512 (junit-platform-commons-1.6.2.pom) = c945d3a05222cbc2f125220b81baad67f401c41557c4fa53aae72bdcaee8ec2e094413877ed4edb4ea08da6583e729a7391dc5ce72d3cac0908c7aac4c7d3696 +SHA512 (junit-platform-console-1.6.2.pom) = 4174297ddaed43f70487d6531d7ffd2ab3469529cf5f96b552e6e8728ead8a44328a641ae73780e09750748645aed4b4b2fd636d6ab9ce7e778d9558e875066c +SHA512 (junit-platform-console-standalone-1.6.2.pom) = e35e28b39ae382b09e301f466989d4950ccefc9ad7371f6180eedad40df8a4ea4e568d8b5117499b7f38edf78d50ed8696c3a9f855885c953f79c020ad5c3372 +SHA512 (junit-platform-engine-1.6.2.pom) = c0f31912d118f1648dfe364c073094f0493cfc957f71a78590f0c0d26e44e8e2d503c7c5e3bc25c24359c4953acc3e95683e21d6c584abdf389aede0461511a7 +SHA512 (junit-platform-launcher-1.6.2.pom) = dd3fb3708990a56e75520f9e790e9890014f36588c3426e2563d0462b6a63102eacfcbf983e7d24c7021bf5ee0cd367989b65c22c1d16950193315ebb9cc6f6c +SHA512 (junit-platform-reporting-1.6.2.pom) = ee0cbc8a2056ea1cc7d4ab512796c5d780f081a32d350fcaa6bd0442793089f9f3e688b294418e85c099d0ecb3728b36713bedbef931b1e8cfcce1af8430efaf +SHA512 (junit-platform-runner-1.6.2.pom) = 8d792d026a42aa84501aecac0dd9839d8c1daa3d69f78aabd081c82497682b316a98389410b0e4679cb0fa2cc948b7bf6d902dca8bdccdb4e4923a674fdafaed +SHA512 (junit-platform-suite-api-1.6.2.pom) = 8257bba40b52468d4c36786495ce2b78d6a0b866e68e4e1ef6b8e4cfe04359647380f0f040287e398fc293bfde1d6415460e2a979d6e9eabe1090d7a63c535b7 +SHA512 (junit-vintage-engine-5.6.2.pom) = 6075031e76cbee380fe87848c9245ac39980e281c456aaa6789a00be736ce0b5fbf94676dca1e5d0b0855004496182b9b98cf08bc4a233e6a97c6b787d52f57d From e950e27b559b4a840489e0d6bca9ebf218015d70 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 21 Sep 2020 15:09:34 +0200 Subject: [PATCH 12/16] Update to upstream version 5.7.0 --- .gitignore | 16 ++++++++++++++++ junit5.spec | 5 ++++- sources | 32 ++++++++++++++++---------------- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index bed256c..b0737fa 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,19 @@ /junit-platform-runner-1.6.2.pom /junit-platform-suite-api-1.6.2.pom /junit-vintage-engine-5.6.2.pom +/junit5-5.7.0.tar.gz +/junit-bom-5.7.0.pom +/junit-jupiter-5.7.0.pom +/junit-jupiter-api-5.7.0.pom +/junit-jupiter-engine-5.7.0.pom +/junit-jupiter-migrationsupport-5.7.0.pom +/junit-jupiter-params-5.7.0.pom +/junit-platform-commons-1.7.0.pom +/junit-platform-console-1.7.0.pom +/junit-platform-console-standalone-1.7.0.pom +/junit-platform-engine-1.7.0.pom +/junit-platform-launcher-1.7.0.pom +/junit-platform-reporting-1.7.0.pom +/junit-platform-runner-1.7.0.pom +/junit-platform-suite-api-1.7.0.pom +/junit-vintage-engine-5.7.0.pom diff --git a/junit5.spec b/junit5.spec index c55646c..6dda5d1 100644 --- a/junit5.spec +++ b/junit5.spec @@ -4,7 +4,7 @@ %global vintage_version %{version} Name: junit5 -Version: 5.6.2 +Version: 5.7.0 Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 @@ -108,6 +108,9 @@ done %license LICENSE.md LICENSE-notice.md %changelog +* Mon Sep 21 2020 Marian Koncek - 5.7.0-1 +- Update to upstream version 5.7.0 + * Tue Jul 28 2020 Marian Koncek - 5.6.2-1 - Update to upstream version 5.6.2 diff --git a/sources b/sources index 77dffb5..75e34ce 100644 --- a/sources +++ b/sources @@ -1,16 +1,16 @@ -SHA512 (junit5-5.6.2.tar.gz) = 9dd5de496b81a66f847f8e6c208e2a6ad7646120d9720e34ac983283a37aeb446023b5525d7846cb0c7377072f65424b7ddf74912ed776c7705b30c1cb8e5509 -SHA512 (junit-bom-5.6.2.pom) = d38eecbc6e55a06e1ba6818277c4ee1d645809325a524b3f79816ae06688b216a0f8aa1b2172c48c8dbfe592f61a862b657890e8270ad22e2d651131dc8ebd04 -SHA512 (junit-jupiter-5.6.2.pom) = 2f86da7c98f93d351e8f478e6e1fce069bb717c89f1d534eff6b84f4da8c4dfce61ae12f6bfd26b21a06fde383298e898da5314e6a5f97a97a33dfdb4a4bfe31 -SHA512 (junit-jupiter-api-5.6.2.pom) = d23342fb271a3852dfda8f77ae9f0e5e6d98c68f6d9e1380ce97617d3f393f4b3f02b678ca66da22413139cd0056b7ec7e030bda9c2067c2388d68f468aee2ae -SHA512 (junit-jupiter-engine-5.6.2.pom) = 38375c8db1c4e630e7abd5f0889acb23db964c7122e4aed7d0a08af1edc377274444e5aa8ccb2a6b8f559fc698df2bed117a28a1ff9c238080020fac18ece68d -SHA512 (junit-jupiter-migrationsupport-5.6.2.pom) = 83624d8b8f7c34296dead8f1816698b5e6ccb9560fdff5e7cdb07715ed2e446244ba2e1463f5b37fdd8a09b8c49ef56f4bf7744a5ff7803d1bf51fa131464950 -SHA512 (junit-jupiter-params-5.6.2.pom) = 94e36303621eb15ea131463db03cad3c72dc1b54716afc439ce08520cf6a84bb93e505827cec3d1c6ae2fc0987a13e3c0f117d254fd107266309e9e1493ebb1b -SHA512 (junit-platform-commons-1.6.2.pom) = c945d3a05222cbc2f125220b81baad67f401c41557c4fa53aae72bdcaee8ec2e094413877ed4edb4ea08da6583e729a7391dc5ce72d3cac0908c7aac4c7d3696 -SHA512 (junit-platform-console-1.6.2.pom) = 4174297ddaed43f70487d6531d7ffd2ab3469529cf5f96b552e6e8728ead8a44328a641ae73780e09750748645aed4b4b2fd636d6ab9ce7e778d9558e875066c -SHA512 (junit-platform-console-standalone-1.6.2.pom) = e35e28b39ae382b09e301f466989d4950ccefc9ad7371f6180eedad40df8a4ea4e568d8b5117499b7f38edf78d50ed8696c3a9f855885c953f79c020ad5c3372 -SHA512 (junit-platform-engine-1.6.2.pom) = c0f31912d118f1648dfe364c073094f0493cfc957f71a78590f0c0d26e44e8e2d503c7c5e3bc25c24359c4953acc3e95683e21d6c584abdf389aede0461511a7 -SHA512 (junit-platform-launcher-1.6.2.pom) = dd3fb3708990a56e75520f9e790e9890014f36588c3426e2563d0462b6a63102eacfcbf983e7d24c7021bf5ee0cd367989b65c22c1d16950193315ebb9cc6f6c -SHA512 (junit-platform-reporting-1.6.2.pom) = ee0cbc8a2056ea1cc7d4ab512796c5d780f081a32d350fcaa6bd0442793089f9f3e688b294418e85c099d0ecb3728b36713bedbef931b1e8cfcce1af8430efaf -SHA512 (junit-platform-runner-1.6.2.pom) = 8d792d026a42aa84501aecac0dd9839d8c1daa3d69f78aabd081c82497682b316a98389410b0e4679cb0fa2cc948b7bf6d902dca8bdccdb4e4923a674fdafaed -SHA512 (junit-platform-suite-api-1.6.2.pom) = 8257bba40b52468d4c36786495ce2b78d6a0b866e68e4e1ef6b8e4cfe04359647380f0f040287e398fc293bfde1d6415460e2a979d6e9eabe1090d7a63c535b7 -SHA512 (junit-vintage-engine-5.6.2.pom) = 6075031e76cbee380fe87848c9245ac39980e281c456aaa6789a00be736ce0b5fbf94676dca1e5d0b0855004496182b9b98cf08bc4a233e6a97c6b787d52f57d +SHA512 (junit5-5.7.0.tar.gz) = 4a9b2fee79d009cf4ca7eaa14bcd6327b7fd31936e1b24873d1974f39c81d808295d7f8816ea47253a501a6fc5de5a8936b2bbef4a4ac5966a7262a221bd8376 +SHA512 (junit-bom-5.7.0.pom) = 9b44a638687600bf821e8506257b6e24e671bcb2a9e5e660e7ef08e34e7bcf1bbf7c1986724cb91f70267e4168bf1c000aaab5171f686b781d3f537d5ac175d7 +SHA512 (junit-jupiter-5.7.0.pom) = 3fe9eb607b7c69fb02a56d1304271dc9904a977c9dfcefb3a10798c221f56cfefebc7af1df5cd5349a48ae9e5e53bd7e20a4a50345ef545709581015ef4a18ca +SHA512 (junit-jupiter-api-5.7.0.pom) = ddae1d02b44274250f3ccc596248e1f7288b71dabb3e2de4801924857e6ea7bf77399560c90b88108a50bb44bd280e92597a0bcabc7d62dab8dba3ba1ce8482d +SHA512 (junit-jupiter-engine-5.7.0.pom) = 0937dc0a3554c639b46ab4ca216acffe7fa6161b7b658415e280e70928291091fd6d3438472f4b4e6a026bcf159ec67876c171d25bb1f1d492990dc7dba10ca4 +SHA512 (junit-jupiter-migrationsupport-5.7.0.pom) = d3ec7335f47846aa373a87719d7272fe6078e9c7fe2150d102bdc9e254fef0d5fa6cf39284e413c8e8a7ea0732a4a57a9d3d78633cefb172d0e54ac93dd9643d +SHA512 (junit-jupiter-params-5.7.0.pom) = c5a685c9d15378a074f70f48cf7228f45db4f3065bd7ef842e145c10a5cc4f638e67f284b8399d15c273f1c8bca045183defc019c91ab3a922fd554682a00872 +SHA512 (junit-platform-commons-1.7.0.pom) = f5430510c51b0fa736a46ca95783b7b537315750464d4d75685cb885cfc89829fa4fde192d87717f97cb5cd3053c786ac2ed4c89b5dc414f77afb6b91a0a791d +SHA512 (junit-platform-console-1.7.0.pom) = 48622f24757b47e99c5476eff3d93c1eaa5438ee1c66c1eddfe6e34f3a96c6cc87b4b3e7cedcfd1ad7cf5c92ade9cc57d997fa9b38310ff82915c662ab4f3ca4 +SHA512 (junit-platform-console-standalone-1.7.0.pom) = 4b70ca2cafcd406a0b6edd6d53f1a0aceab11f15b2022a40608fde98904af1b3cba94f68813c73ffb6e372be0bd565f3e94286733ab00708cca331dedb9dc7f9 +SHA512 (junit-platform-engine-1.7.0.pom) = 227b04523db0aeab62664b1527b690a9e3f0d7781d40c81a31c122fb0b1c6832b1d2a783f824a2017c08d8ee5e24622abc4a1b4e23850eb9bbe696c2f00d2d7e +SHA512 (junit-platform-launcher-1.7.0.pom) = 8bc7df41deeee95307ab47d080b2d03e17cfa1a57c7cc56fabef986ea012ea00b63c17d5a4d14ef887acbc9bb0afa7e2acc164bba76655238487439cdc8c216d +SHA512 (junit-platform-reporting-1.7.0.pom) = 09c500fdc6e57883ad2978da22432a0a62684d06ebc31ca7b3e183a701960a3c37cc3819ec240cb10c95cedd84d7d38849557da37d15a629188dea6bf2701133 +SHA512 (junit-platform-runner-1.7.0.pom) = b9b16352ce255d8f898b0e3b3be48216944dd60632c1dfb722a1a4fd3a4b1fc94f199d89f0ca7b903a689678e3c7c602636e58c64b7e77f8584f18d5d64b4c53 +SHA512 (junit-platform-suite-api-1.7.0.pom) = a05cebb26a1f441f39c0e76127abad152b5d668fe3e0edd60513b140cdf45f3dd623b07d2fd27f1444ae0f77fd97861d27d1710c3cd5b338f5a27bbd76ba307f +SHA512 (junit-vintage-engine-5.7.0.pom) = 8257786af5beaf99f565b71ad6370b5b2407a6ff493f72ffd33d60410a915f151986a52311154859df46a037babc5899d3e506b2e6df58fbef791e0450d64dbc From 84fd2700a52f8d1b365bd4ab209289ac5b096adb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 18 Mar 2021 14:48:41 +0100 Subject: [PATCH 13/16] BOM should not inherit from aggregator POM --- junit5.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/junit5.spec b/junit5.spec index 6dda5d1..15d2b80 100644 --- a/junit5.spec +++ b/junit5.spec @@ -82,6 +82,8 @@ for pom in $(find -mindepth 2 -name pom.xml); do %pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom done +%pom_remove_parent junit-bom + # 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 com.univocity:univocity-parsers:2.5.4 junit-jupiter-params From aaad540e335a90911d0a0c430cfa2b035e4850eb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 14/16] Conditionalize buildrequires in bootstrap mode --- junit5.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/junit5.spec b/junit5.spec index 15d2b80..dad6397 100644 --- a/junit5.spec +++ b/junit5.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + # Component versions, taken from gradle.properties %global platform_version 1.%(v=%{version}; echo ${v:2}) %global jupiter_version %{version} @@ -36,11 +38,15 @@ Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e Source500: https://repo1.maven.org/maven2/org/junit/junit-bom/%{version}/junit-bom-%{version}.pom BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.univocity:univocity-parsers) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apiguardian:apiguardian-api) BuildRequires: mvn(org.opentest4j:opentest4j) +%endif %description JUnit is a popular regression testing framework for Java platform. From 994385ec720773c4bf7a023350f228b907491e37 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 15/16] Turn off bootstrap mode by default --- junit5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit5.spec b/junit5.spec index dad6397..10b5a43 100644 --- a/junit5.spec +++ b/junit5.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap # Component versions, taken from gradle.properties %global platform_version 1.%(v=%{version}; echo ${v:2}) From 5d3932c10dc93e75867e1090809464f3320e71e7 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 14 May 2021 15:12:40 +0200 Subject: [PATCH 16/16] Update to upstream version 5.7.1 --- .gitignore | 16 ++++++++++++++++ junit5.spec | 8 ++++---- sources | 32 ++++++++++++++++---------------- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index b0737fa..e2fb525 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,19 @@ /junit-platform-runner-1.7.0.pom /junit-platform-suite-api-1.7.0.pom /junit-vintage-engine-5.7.0.pom +/junit5-5.7.1.tar.gz +/junit-bom-5.7.1.pom +/junit-jupiter-5.7.1.pom +/junit-jupiter-api-5.7.1.pom +/junit-jupiter-engine-5.7.1.pom +/junit-jupiter-migrationsupport-5.7.1.pom +/junit-jupiter-params-5.7.1.pom +/junit-platform-commons-1.7.1.pom +/junit-platform-console-1.7.1.pom +/junit-platform-console-standalone-1.7.1.pom +/junit-platform-engine-1.7.1.pom +/junit-platform-launcher-1.7.1.pom +/junit-platform-reporting-1.7.1.pom +/junit-platform-runner-1.7.1.pom +/junit-platform-suite-api-1.7.1.pom +/junit-vintage-engine-5.7.1.pom diff --git a/junit5.spec b/junit5.spec index 10b5a43..7b3a730 100644 --- a/junit5.spec +++ b/junit5.spec @@ -6,7 +6,7 @@ %global vintage_version %{version} Name: junit5 -Version: 5.7.0 +Version: 5.7.1 Release: 1%{?dist} Summary: Java regression testing framework License: EPL-2.0 @@ -94,9 +94,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 - Junit4 is needed for compilation too, not only runtime. -%pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine - # Disable the console modules %pom_disable_module junit-platform-console %pom_disable_module junit-platform-console-standalone @@ -116,6 +113,9 @@ done %license LICENSE.md LICENSE-notice.md %changelog +* Fri May 14 2021 Marian Koncek - 5.7.1-1 +- Update to upstream version 5.7.1 + * Mon Sep 21 2020 Marian Koncek - 5.7.0-1 - Update to upstream version 5.7.0 diff --git a/sources b/sources index 75e34ce..fe6a19f 100644 --- a/sources +++ b/sources @@ -1,16 +1,16 @@ -SHA512 (junit5-5.7.0.tar.gz) = 4a9b2fee79d009cf4ca7eaa14bcd6327b7fd31936e1b24873d1974f39c81d808295d7f8816ea47253a501a6fc5de5a8936b2bbef4a4ac5966a7262a221bd8376 -SHA512 (junit-bom-5.7.0.pom) = 9b44a638687600bf821e8506257b6e24e671bcb2a9e5e660e7ef08e34e7bcf1bbf7c1986724cb91f70267e4168bf1c000aaab5171f686b781d3f537d5ac175d7 -SHA512 (junit-jupiter-5.7.0.pom) = 3fe9eb607b7c69fb02a56d1304271dc9904a977c9dfcefb3a10798c221f56cfefebc7af1df5cd5349a48ae9e5e53bd7e20a4a50345ef545709581015ef4a18ca -SHA512 (junit-jupiter-api-5.7.0.pom) = ddae1d02b44274250f3ccc596248e1f7288b71dabb3e2de4801924857e6ea7bf77399560c90b88108a50bb44bd280e92597a0bcabc7d62dab8dba3ba1ce8482d -SHA512 (junit-jupiter-engine-5.7.0.pom) = 0937dc0a3554c639b46ab4ca216acffe7fa6161b7b658415e280e70928291091fd6d3438472f4b4e6a026bcf159ec67876c171d25bb1f1d492990dc7dba10ca4 -SHA512 (junit-jupiter-migrationsupport-5.7.0.pom) = d3ec7335f47846aa373a87719d7272fe6078e9c7fe2150d102bdc9e254fef0d5fa6cf39284e413c8e8a7ea0732a4a57a9d3d78633cefb172d0e54ac93dd9643d -SHA512 (junit-jupiter-params-5.7.0.pom) = c5a685c9d15378a074f70f48cf7228f45db4f3065bd7ef842e145c10a5cc4f638e67f284b8399d15c273f1c8bca045183defc019c91ab3a922fd554682a00872 -SHA512 (junit-platform-commons-1.7.0.pom) = f5430510c51b0fa736a46ca95783b7b537315750464d4d75685cb885cfc89829fa4fde192d87717f97cb5cd3053c786ac2ed4c89b5dc414f77afb6b91a0a791d -SHA512 (junit-platform-console-1.7.0.pom) = 48622f24757b47e99c5476eff3d93c1eaa5438ee1c66c1eddfe6e34f3a96c6cc87b4b3e7cedcfd1ad7cf5c92ade9cc57d997fa9b38310ff82915c662ab4f3ca4 -SHA512 (junit-platform-console-standalone-1.7.0.pom) = 4b70ca2cafcd406a0b6edd6d53f1a0aceab11f15b2022a40608fde98904af1b3cba94f68813c73ffb6e372be0bd565f3e94286733ab00708cca331dedb9dc7f9 -SHA512 (junit-platform-engine-1.7.0.pom) = 227b04523db0aeab62664b1527b690a9e3f0d7781d40c81a31c122fb0b1c6832b1d2a783f824a2017c08d8ee5e24622abc4a1b4e23850eb9bbe696c2f00d2d7e -SHA512 (junit-platform-launcher-1.7.0.pom) = 8bc7df41deeee95307ab47d080b2d03e17cfa1a57c7cc56fabef986ea012ea00b63c17d5a4d14ef887acbc9bb0afa7e2acc164bba76655238487439cdc8c216d -SHA512 (junit-platform-reporting-1.7.0.pom) = 09c500fdc6e57883ad2978da22432a0a62684d06ebc31ca7b3e183a701960a3c37cc3819ec240cb10c95cedd84d7d38849557da37d15a629188dea6bf2701133 -SHA512 (junit-platform-runner-1.7.0.pom) = b9b16352ce255d8f898b0e3b3be48216944dd60632c1dfb722a1a4fd3a4b1fc94f199d89f0ca7b903a689678e3c7c602636e58c64b7e77f8584f18d5d64b4c53 -SHA512 (junit-platform-suite-api-1.7.0.pom) = a05cebb26a1f441f39c0e76127abad152b5d668fe3e0edd60513b140cdf45f3dd623b07d2fd27f1444ae0f77fd97861d27d1710c3cd5b338f5a27bbd76ba307f -SHA512 (junit-vintage-engine-5.7.0.pom) = 8257786af5beaf99f565b71ad6370b5b2407a6ff493f72ffd33d60410a915f151986a52311154859df46a037babc5899d3e506b2e6df58fbef791e0450d64dbc +SHA512 (junit5-5.7.1.tar.gz) = a92e24050f8ff33e75c83027a13f7c2cf71f3dd7b960590f164932f14dfb2b238d1a650d6153543f437b8f69d54148503505681eda636be54c1e2eca2e98f5e8 +SHA512 (junit-bom-5.7.1.pom) = 912d7575efd03ce31a84053f6f6253fc145f79a6035fabf11314bb3f6f284213f740b35ebb427618cdee430dc99e7e0534e1669e38f7ca608f729b4e2873b5fc +SHA512 (junit-jupiter-5.7.1.pom) = c313c41fd82339a1f2ad195ba5a013fbf1ae6e71b1888209c49bd463c63ce7adb85c86c5470080027dd6f9578ffc7ee0a6a520e67b5b0df3028340304843f869 +SHA512 (junit-jupiter-api-5.7.1.pom) = 33d4c586326a34e2893609b3457b069d3e97f2f45b7af904eebb1e07cd955d00c913b9c0860d9210f72ef5edf5013ced29a4a28323eabcd34f14cf2682410b9c +SHA512 (junit-jupiter-engine-5.7.1.pom) = b250c598922b1c76bfae81e1539eff6ecd186169a761d69abcf62dfff71657956949510bb1aa7cfa0fb6d34c64c536866a347e8b4c0536bc05fc1715eaf80488 +SHA512 (junit-jupiter-migrationsupport-5.7.1.pom) = d8ea3e0a202d252ed2276c1a185f204ac4727d873632c2a4bb1357491805c8ad237be328d9877a6ad39d6b4a64bee8337773f777577a7e2af31c947e88985158 +SHA512 (junit-jupiter-params-5.7.1.pom) = 8d691315b9ce3f135e773bb63b6dc1772a9e9fcbd3bbc2b56e5e3bb33bb6935b147f220c044c861e7d06eabfd1060d297c23d8119b832c40451906d3b04090bb +SHA512 (junit-platform-commons-1.7.1.pom) = b6e4f8c966838140a2d5f88b47ed0dbcc902b8aa46b80ae862c293c582ff2a220eb4be032bd9d5f47da2acadbf017015d2def81d16422b9fd3d7e673ab654be9 +SHA512 (junit-platform-console-1.7.1.pom) = 24c239c1914eed87ac6244d5e0314bde9f206ecf894b430c8402907fc1dd2f2272b77b2ba9f2efa4e125098cf1f2d2fb6645018e91495dcf13027b900bbffc51 +SHA512 (junit-platform-console-standalone-1.7.1.pom) = 96ddafb17c67eff9725b06a5b9b98a1eefbf05eea434f91bc5267b8a166d59596db56562bd564e8a2d18a0417300d18c9f8be5bc513433898f7de8c169040768 +SHA512 (junit-platform-engine-1.7.1.pom) = bc1aa4fcfd4c77484ae8f946282644e8573227114331d8d59e84f0d8b0784b897979e9ba5c12ef9f3e7e2de490a4961b46c3c36fa0e9a2ecc7504edfd90b0476 +SHA512 (junit-platform-launcher-1.7.1.pom) = dc417328a7cbd86261e832fe0b5b271f9e6b65a59f6b99fa695c8fef6cf7f88a7c60ca0fc3496f4e1ed809f64e1014b92156463c36eb6df6a7dce94115dad410 +SHA512 (junit-platform-reporting-1.7.1.pom) = 9a82d0dbe55c2fc34e4db4023434270cc34894621e792aed36cd1530ddde9c3cee7e4608a425c7e7fdb08e120f17be63aa7904ed4d37f4d48b9a5368628ef95f +SHA512 (junit-platform-runner-1.7.1.pom) = bae0b11bc780b91c5c6d8033dc28978d3576ad309d2ac1712d5ab390fdfcc64ed5f0e79b2dce46df18487fd46163397ee90395011a16e129c24617be5d4831fc +SHA512 (junit-platform-suite-api-1.7.1.pom) = 0f9c3c69b96adc8132c07216badac1dc2425cc39f3a666b13eae97012dc9818b2dff89f0f529cbd9e7c07469f54550cc7a8cf8ff250b884f93ab6e8017776604 +SHA512 (junit-vintage-engine-5.7.1.pom) = 738d3877fc4654b8a5833c1176bb447f7cad8061774967801c2424f2c46727ea5ea1d02102ea154a298427eb62f17e49b374e5d0a5d8a7d054b42bf763a77fc0