Update to latest upstream release
Conditionally build the console modules Remove stuff for discontinued gradle plugin
This commit is contained in:
Mat Booth
parent
06a06e352f
commit
8119da9b8a
14
.gitignore
vendored
14
.gitignore
vendored
@ -28,3 +28,17 @@
|
||||
/junit-platform-suite-api-1.2.0.pom
|
||||
/junit-platform-surefire-provider-1.2.0.pom
|
||||
/junit-vintage-engine-5.2.0.pom
|
||||
/r5.3.1.tar.gz
|
||||
/junit-jupiter-api-5.3.1.pom
|
||||
/junit-jupiter-engine-5.3.1.pom
|
||||
/junit-jupiter-migrationsupport-5.3.1.pom
|
||||
/junit-jupiter-params-5.3.1.pom
|
||||
/junit-platform-commons-1.3.1.pom
|
||||
/junit-platform-console-1.3.1.pom
|
||||
/junit-platform-console-standalone-1.3.1.pom
|
||||
/junit-platform-engine-1.3.1.pom
|
||||
/junit-platform-launcher-1.3.1.pom
|
||||
/junit-platform-runner-1.3.1.pom
|
||||
/junit-platform-suite-api-1.3.1.pom
|
||||
/junit-platform-surefire-provider-1.3.1.pom
|
||||
/junit-vintage-engine-5.3.1.pom
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
<module>junit-platform-console</module>
|
||||
<module>junit-platform-console-standalone</module>
|
||||
<module>junit-platform-engine</module>
|
||||
<module>junit-platform-gradle-plugin</module>
|
||||
<module>junit-platform-launcher</module>
|
||||
<module>junit-platform-runner</module>
|
||||
<module>junit-platform-suite-api</module>
|
||||
|
||||
77
junit5.spec
77
junit5.spec
@ -1,16 +1,15 @@
|
||||
# Component versions, taken from gradle.properties
|
||||
%global platform_version 1.2.0
|
||||
%global jupiter_version 5.2.0
|
||||
%global vintage_version 5.2.0
|
||||
%global platform_version 1.%(v=%{version}; echo ${v:2})
|
||||
%global jupiter_version %{version}
|
||||
%global vintage_version %{version}
|
||||
|
||||
# Build with or without Gradle plugin.
|
||||
# NOTE: We are always building junit5 using Maven.
|
||||
# Turned off by default as it's not compatible with current gradle
|
||||
%bcond_with gradle
|
||||
# Build with or without the console modules
|
||||
# Disabled by default due to missing dep: info.picocli:picocli
|
||||
%bcond_with console
|
||||
|
||||
Name: junit5
|
||||
Version: 5.2.0
|
||||
Release: 3%{?dist}
|
||||
Version: 5.3.1
|
||||
Release: 1%{?dist}
|
||||
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 ASL 2.0
|
||||
@ -26,7 +25,6 @@ Source200: https://repo1.maven.org/maven2/org/junit/platform/junit-platform
|
||||
Source201: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console/%{platform_version}/junit-platform-console-%{platform_version}.pom
|
||||
Source202: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/%{platform_version}/junit-platform-console-standalone-%{platform_version}.pom
|
||||
Source203: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/%{platform_version}/junit-platform-engine-%{platform_version}.pom
|
||||
Source204: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-gradle-plugin/%{platform_version}/junit-platform-gradle-plugin-%{platform_version}.pom
|
||||
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
|
||||
@ -42,34 +40,23 @@ Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-e
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.univocity:univocity-parsers)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(net.sf.jopt-simple:jopt-simple)
|
||||
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)
|
||||
|
||||
%if %{with gradle}
|
||||
BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin)
|
||||
BuildRequires: mvn(org.codehaus.groovy:groovy-all)
|
||||
BuildRequires: mvn(org.gradle:gradle-base-services)
|
||||
BuildRequires: mvn(org.gradle:gradle-base-services-groovy)
|
||||
BuildRequires: mvn(org.gradle:gradle-core)
|
||||
BuildRequires: mvn(org.gradle:gradle-language-jvm)
|
||||
BuildRequires: mvn(org.gradle:gradle-model-core)
|
||||
BuildRequires: mvn(org.gradle:gradle-platform-base)
|
||||
BuildRequires: mvn(org.gradle:gradle-platform-jvm)
|
||||
BuildRequires: mvn(org.gradle:gradle-plugins)
|
||||
BuildRequires: mvn(org.gradle:gradle-reporting)
|
||||
BuildRequires: mvn(org.gradle:gradle-testing-base)
|
||||
BuildRequires: mvn(org.gradle:gradle-testing-jvm)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-api)
|
||||
%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.
|
||||
@ -99,7 +86,6 @@ cp -p %{SOURCE200} junit-platform-commons/pom.xml
|
||||
cp -p %{SOURCE201} junit-platform-console/pom.xml
|
||||
cp -p %{SOURCE202} junit-platform-console-standalone/pom.xml
|
||||
cp -p %{SOURCE203} junit-platform-engine/pom.xml
|
||||
cp -p %{SOURCE204} junit-platform-gradle-plugin/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
|
||||
@ -117,7 +103,7 @@ for pom in $(find -mindepth 2 -name pom.xml); do
|
||||
bsn=$(sed 's|/pom.xml$||;s|.*/|org.|;s|-|.|g' <<<"$pom")
|
||||
%pom_xpath_inject pom:project "<properties><osgi.bsn>${bsn}</osgi.bsn></properties>" $pom
|
||||
# Incorrect scope - API guardian is just annotation, needed only during compilation
|
||||
%pom_xpath_set -r "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom
|
||||
%pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom
|
||||
done
|
||||
|
||||
# Add deps which are shaded by upstream and therefore not present in POMs.
|
||||
@ -130,28 +116,10 @@ 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 %{with gradle}
|
||||
|
||||
# Gradle plugin is written in Groovy, so compile it with GMavenPlus.
|
||||
%pom_xpath_inject pom:project "<build><plugins><plugin><groupId>org.codehaus.gmavenplus</groupId><artifactId>gmavenplus-plugin</artifactId><version>1.6</version><executions><execution><goals><goal>compile</goal></goals></execution></executions></plugin></plugins></build>" junit-platform-gradle-plugin
|
||||
|
||||
# Gradle deps are only for compilation, and therefore not included in POM.
|
||||
%pom_add_dep org.codehaus.groovy:groovy-all::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-base-services-groovy::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-base-services::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-core::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-language-jvm::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-model-core::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-platform-base::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-platform-jvm::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-plugins::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-reporting::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-testing-base::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.gradle:gradle-testing-jvm::provided junit-platform-gradle-plugin
|
||||
%pom_add_dep org.slf4j:slf4j-api::provided junit-platform-gradle-plugin
|
||||
|
||||
%else
|
||||
%pom_disable_module junit-platform-gradle-plugin
|
||||
%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
|
||||
@ -167,10 +135,14 @@ 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-Eclipse.md LICENSE-Apache.md
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
@ -180,6 +152,11 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
|
||||
%doc documentation/src/docs/*
|
||||
|
||||
%changelog
|
||||
* Tue Sep 11 2018 Mat Booth <mat.booth@redhat.com> - 5.3.1-1
|
||||
- Update to latest upstream release
|
||||
- Conditionally build the console modules
|
||||
- Remove stuff for discontinued gradle plugin
|
||||
|
||||
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 5.2.0-3
|
||||
- Add explicit requirement on javapackages-tools since junit5 script
|
||||
uses java-functions. See RHBZ#1600426.
|
||||
|
||||
29
sources
29
sources
@ -1,15 +1,14 @@
|
||||
SHA512 (r5.2.0.tar.gz) = 31f770aa2f51f3132aa3dfc6dee6b867e848580ce26e2eeb7a36a3bef31003e5855c33d89ecbd721387e935982b9eea579666afc99afb619d97521059ae91266
|
||||
SHA512 (junit-jupiter-api-5.2.0.pom) = 114aa22f86f61281f9f94d47f6c349f01ed5ffcecbd234a93c356ab1c8219db0a328b83caeaaf12f5ca293df22a245ec7872bf2ad7c451c40bbd89a58909ffd8
|
||||
SHA512 (junit-jupiter-engine-5.2.0.pom) = 54a67d50985063cc49b1c261042ab105cbc90e342e0de77b3908f1a28e300eabf2b4f8116e40da0b68b59151d54f5fed51e58e444a3f46a2b1ed0a640420a79e
|
||||
SHA512 (junit-jupiter-migrationsupport-5.2.0.pom) = 6449fcabc5f48e5b43c3afb70208049ddbe71473412598f602ba383a1dd97bff616b3130e321125a5adce95fdc344ea6a1d7a9d892ca03161d9898a7e9b117d0
|
||||
SHA512 (junit-jupiter-params-5.2.0.pom) = 3b59545d6e56b594525905cf5b48862e5dda272bc442919cbaa2cb6b116afbd5c249fbf6f77ffa15d1e7717e095a8ea9943057040142c67bd01c73d6a1328d03
|
||||
SHA512 (junit-platform-commons-1.2.0.pom) = a72b0e3db0b51f7917feb27e9761e2dacd6a4e1896e22cd8530793c82d4315914e7239f0344c765aa3fbef4ddf5092b7ae1c2e16b2ccf8e51ef02e7680dfe3d2
|
||||
SHA512 (junit-platform-console-1.2.0.pom) = b5694340036173ab4e5d012f6fba39b296004ec1891edab47617afef95996297cd82604c4526c2920656c8c02d62d7605c8308b88a53f0123251014050c2e9e0
|
||||
SHA512 (junit-platform-console-standalone-1.2.0.pom) = 707c738d67e00a5c5c120f98841f6474569f6978b4e11e8f87796b097918b1083f754f2c89e60917add2d046392ec794558b58d52d7ff60728cda0efffc46d76
|
||||
SHA512 (junit-platform-engine-1.2.0.pom) = 2bf73f85a29b43920f3ba77c40922edbfe5ea7b4e6a4691d61ae62af124ef7dac074a7c56025cb5224efc6c1c67d79ed0dea7c04348be5bd5ac0349e53387fc9
|
||||
SHA512 (junit-platform-gradle-plugin-1.2.0.pom) = 2020482462f03d6638760b67ce373404de53ffba01093db3311f4cd1a307f929cddc418c511955860763abfe7d032b842ecdff57894adff4c5fa4a1f2d8cae0d
|
||||
SHA512 (junit-platform-launcher-1.2.0.pom) = 816ebb3428209fe96296dc7132245176bbf9222f8f521fadd505b8164e66d9fda39e89160ecb509b3d376ad37c04836f88a45f932c11cbac693872668b759eae
|
||||
SHA512 (junit-platform-runner-1.2.0.pom) = 237f1f28647e26c96f30cbdfef58ab442b243a6043a56b78a8969e4a828c31945aebce718900d5d3d419227966bc81e50fc59a93211dc17153c339a9ec06c1f6
|
||||
SHA512 (junit-platform-suite-api-1.2.0.pom) = 4a8aced87ccc0331659d3095b1627130dc82fc43c6e6548167608e7f755dad60ab12439340088e99f770fff01a80f0c399645a127ebef4463ecac3222d0b19ba
|
||||
SHA512 (junit-platform-surefire-provider-1.2.0.pom) = 20626a52029ab68e4929d2ee1ca7f02e55ebd737fbe4d36200871611015898511006627bae6df807e7b8daf206883204ed781c0e88efb5d73b8cf344802d6d86
|
||||
SHA512 (junit-vintage-engine-5.2.0.pom) = 8dd68e06fe4b8c186eb0819342b988a299d448f6442babd4f076b8866ea1cfc5aee1a202b80ead6b908a78b9ebb879eba68de3c4d554e36b1489262dcced18e2
|
||||
SHA512 (r5.3.1.tar.gz) = f81c140b7e8d8d4349929794e9467875592be2f5a5037dbdabe487c6dfa30063f12e09cef608679fba900702140708dcbd6b6dc7e5fd92b8afe7a785e821a7d8
|
||||
SHA512 (junit-jupiter-api-5.3.1.pom) = 85859b67143971f45877be7daf3d98c0b89bbe2b35c69fafe4c680cc7bb018f453c5e1c58adf7fb72b9bb62741596844b66c688575ff9f474761c702f9743724
|
||||
SHA512 (junit-jupiter-engine-5.3.1.pom) = dc6d708c8fc1e8298976c2387cfbbc49beb0ce78d490eb76eaaf796556029f8480aef3e012aeab9eba2972359fbd0cf72c3f92ef476bfe7b0578aea8d1a167d2
|
||||
SHA512 (junit-jupiter-migrationsupport-5.3.1.pom) = d0db14030ab618d62920cb1c24413d4f28bbf4123f8b5bbe3c7b010237b9d7fe7d15d96e4cc8fa22c214333b8c582ecab17440204de7ac635b92f1283faecbe3
|
||||
SHA512 (junit-jupiter-params-5.3.1.pom) = ef839733ddebb129f4fb6b2428d122ea6d8705832565657277f6c9306a7794b6ccd32ca5387e033337d0de73f3c6878bcb86f949a433bf908c285774f45023be
|
||||
SHA512 (junit-platform-commons-1.3.1.pom) = 171ef32b964d39ad52597a2e7150b6502c28794e94187d6c97ee5ed50d19440f349b04b9dc6583c05d600155ef2dd0832736e6183bc371fe186a09139da2e3dd
|
||||
SHA512 (junit-platform-console-1.3.1.pom) = 17ae1e00dc6101aded315998bae2106ed9f970a9662096a06cd33bf2c331bd3d56d45d3195afc08c4b2c4481a9839f5fc6b81a1e86bb4b2ef5de337474fbc0b6
|
||||
SHA512 (junit-platform-console-standalone-1.3.1.pom) = 6eb5d7dffb8c7b60187af95c8791eb83648c16cbbe57eb02878f9e7fc5624d78c3bfed3eb322c12c4b207c5d4aba87d596ff2382c8836d98f8eba9c849254308
|
||||
SHA512 (junit-platform-engine-1.3.1.pom) = 581f925fd7631d5c3636461d6c1f2ccb828c2f0d4864364824b7773a507db94dee78502822e43108d2232927e07bb75c2ea93732b44ee466aef124c95ccb8382
|
||||
SHA512 (junit-platform-launcher-1.3.1.pom) = 210f6b6d4eb9dff85434ca3a893d40d8b2eb8a8a7380908a88ef11f5e6a260c29f74512871b108a4b0b6082cd3222a8ab15a576613e2126598dd6c5ef9253cdd
|
||||
SHA512 (junit-platform-runner-1.3.1.pom) = 6147e2fb5090ab584a69c9e61792031d4485d7ae748062cd11ff796114fc8c140d831603e30649583c73dfb0684fecbb747fc2e202d6b80a7d73a1a551088a11
|
||||
SHA512 (junit-platform-suite-api-1.3.1.pom) = 16bc38472e247d71976e33c09eb1f54e591067513ee284a6cc4fed2b766452958dfed699515a5e591904fe90b8ef5f63caceda3bc231aea9d0e263a7b7897493
|
||||
SHA512 (junit-platform-surefire-provider-1.3.1.pom) = a5d83337ffb50ce265bf0f20ad688ee5e97de703ed41b9ca686c0521cd48e5cc375a525f1cfafadcd303f1976a7e4e09305aa15aab8f9ce0f1577eba5f5d123a
|
||||
SHA512 (junit-vintage-engine-5.3.1.pom) = c0b18b55fafac9a46bb0e6a7c9af71fcd86d3badd5d96a6d3bdb423d6e0e78bc4171958d050ff4550348262c6959a5a3314d29cacb9e74e85ac39c0202104ec5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user