diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index bdcb49d..0000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# junit5
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Instructions
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### Contribution
-
-1. Fork the repository
-2. Create Feat_xxx branch
-3. Commit your code
-4. Create Pull Request
-
-
-#### Gitee Feature
-
-1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4. The most valuable open source project [GVP](https://gitee.com/gvp)
-5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.md b/README.md
deleted file mode 100644
index da53bf7..0000000
--- a/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# junit5
-
-#### 介绍
-{**以下是码云平台说明,您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本仓库
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 码云特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
-2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
-5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/aggregator.pom b/aggregator.pom
index f48fa4d..a56a174 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -10,9 +10,9 @@
junit-platform-console-standalone
junit-platform-engine
junit-platform-launcher
+ junit-platform-reporting
junit-platform-runner
junit-platform-suite-api
- junit-platform-surefire-provider
junit-jupiter-api
junit-jupiter-engine
junit-jupiter-migrationsupport
diff --git a/junit-jupiter-api-5.3.1.pom b/junit-jupiter-api-5.4.0.pom
similarity index 95%
rename from junit-jupiter-api-5.3.1.pom
rename to junit-jupiter-api-5.4.0.pom
index 8620768..47d1359 100644
--- a/junit-jupiter-api-5.3.1.pom
+++ b/junit-jupiter-api-5.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.jupiter
junit-jupiter-api
- 5.3.1
+ 5.4.0
JUnit Jupiter API
Module "junit-jupiter-api" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -67,7 +67,7 @@
org.junit.platform
junit-platform-commons
- 1.3.1
+ 1.4.0
compile
diff --git a/junit-jupiter-engine-5.3.1.pom b/junit-jupiter-engine-5.4.0.pom
similarity index 94%
rename from junit-jupiter-engine-5.3.1.pom
rename to junit-jupiter-engine-5.4.0.pom
index 3a70927..33e632a 100644
--- a/junit-jupiter-engine-5.3.1.pom
+++ b/junit-jupiter-engine-5.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.jupiter
junit-jupiter-engine
- 5.3.1
+ 5.4.0
JUnit Jupiter Engine
Module "junit-jupiter-engine" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -61,13 +61,13 @@
org.junit.platform
junit-platform-engine
- 1.3.1
+ 1.4.0
compile
org.junit.jupiter
junit-jupiter-api
- 5.3.1
+ 5.4.0
compile
diff --git a/junit-jupiter-migrationsupport-5.3.1.pom b/junit-jupiter-migrationsupport-5.4.0.pom
similarity index 95%
rename from junit-jupiter-migrationsupport-5.3.1.pom
rename to junit-jupiter-migrationsupport-5.4.0.pom
index 551e821..c3a2cec 100644
--- a/junit-jupiter-migrationsupport-5.3.1.pom
+++ b/junit-jupiter-migrationsupport-5.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.jupiter
junit-jupiter-migrationsupport
- 5.3.1
+ 5.4.0
JUnit Jupiter Migration Support
Module "junit-jupiter-migrationsupport" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -52,22 +52,22 @@
https://github.com/junit-team/junit5
-
- org.apiguardian
- apiguardian-api
- 1.0.0
- compile
-
junit
junit
4.12
compile
+
+ org.apiguardian
+ apiguardian-api
+ 1.0.0
+ compile
+
org.junit.jupiter
junit-jupiter-api
- 5.3.1
+ 5.4.0
compile
diff --git a/junit-jupiter-params-5.3.1.pom b/junit-jupiter-params-5.4.0.pom
similarity index 95%
rename from junit-jupiter-params-5.3.1.pom
rename to junit-jupiter-params-5.4.0.pom
index ef10482..961fc51 100644
--- a/junit-jupiter-params-5.3.1.pom
+++ b/junit-jupiter-params-5.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.jupiter
junit-jupiter-params
- 5.3.1
+ 5.4.0
JUnit Jupiter Params
Module "junit-jupiter-params" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -61,7 +61,7 @@
org.junit.jupiter
junit-jupiter-api
- 5.3.1
+ 5.4.0
compile
diff --git a/junit-platform-commons-1.3.1.pom b/junit-platform-commons-1.4.0.pom
similarity index 96%
rename from junit-platform-commons-1.3.1.pom
rename to junit-platform-commons-1.4.0.pom
index 8b40da7..c7d974e 100644
--- a/junit-platform-commons-1.3.1.pom
+++ b/junit-platform-commons-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-commons
- 1.3.1
+ 1.4.0
JUnit Platform Commons
Module "junit-platform-commons" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
diff --git a/junit-platform-console-1.3.1.pom b/junit-platform-console-1.4.0.pom
similarity index 93%
rename from junit-platform-console-1.3.1.pom
rename to junit-platform-console-1.4.0.pom
index 60ddbf5..0790402 100644
--- a/junit-platform-console-1.3.1.pom
+++ b/junit-platform-console-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-console
- 1.3.1
+ 1.4.0
JUnit Platform Console
Module "junit-platform-console" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -60,8 +60,8 @@
org.junit.platform
- junit-platform-launcher
- 1.3.1
+ junit-platform-reporting
+ 1.4.0
compile
diff --git a/junit-platform-console-standalone-1.3.1.pom b/junit-platform-console-standalone-1.4.0.pom
similarity index 86%
rename from junit-platform-console-standalone-1.3.1.pom
rename to junit-platform-console-standalone-1.4.0.pom
index 455f8e0..0aa299f 100644
--- a/junit-platform-console-standalone-1.3.1.pom
+++ b/junit-platform-console-standalone-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-console-standalone
- 1.3.1
+ 1.4.0
JUnit Platform Console Standalone
Module "junit-platform-console-standalone" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -51,12 +51,4 @@
scm:git:git://github.com/junit-team/junit5.git
https://github.com/junit-team/junit5
-
-
- org.apiguardian
- apiguardian-api
- 1.0.0
- compile
-
-
diff --git a/junit-platform-engine-1.3.1.pom b/junit-platform-engine-1.4.0.pom
similarity index 95%
rename from junit-platform-engine-1.3.1.pom
rename to junit-platform-engine-1.4.0.pom
index b5c745c..974cbe0 100644
--- a/junit-platform-engine-1.3.1.pom
+++ b/junit-platform-engine-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-engine
- 1.3.1
+ 1.4.0
JUnit Platform Engine API
Module "junit-platform-engine" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -58,17 +58,17 @@
1.0.0
compile
-
- org.junit.platform
- junit-platform-commons
- 1.3.1
- compile
-
org.opentest4j
opentest4j
1.1.1
compile
+
+ org.junit.platform
+ junit-platform-commons
+ 1.4.0
+ compile
+
diff --git a/junit-platform-launcher-1.3.1.pom b/junit-platform-launcher-1.4.0.pom
similarity index 95%
rename from junit-platform-launcher-1.3.1.pom
rename to junit-platform-launcher-1.4.0.pom
index c585ac2..ea3df9b 100644
--- a/junit-platform-launcher-1.3.1.pom
+++ b/junit-platform-launcher-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-launcher
- 1.3.1
+ 1.4.0
JUnit Platform Launcher
Module "junit-platform-launcher" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -61,7 +61,7 @@
org.junit.platform
junit-platform-engine
- 1.3.1
+ 1.4.0
compile
diff --git a/junit-platform-reporting-1.4.0.pom b/junit-platform-reporting-1.4.0.pom
new file mode 100644
index 0000000..3dc7c92
--- /dev/null
+++ b/junit-platform-reporting-1.4.0.pom
@@ -0,0 +1,68 @@
+
+
+ 4.0.0
+ org.junit.platform
+ junit-platform-reporting
+ 1.4.0
+ JUnit Platform Reporting
+ Module "junit-platform-reporting" of JUnit 5.
+ https://junit.org/junit5/
+
+
+ Eclipse Public License v2.0
+ http://www.eclipse.org/legal/epl-v20.html
+
+
+
+
+ bechte
+ Stefan Bechtold
+ stefan.bechtold@me.com
+
+
+ jlink
+ Johannes Link
+ business@johanneslink.net
+
+
+ marcphilipp
+ Marc Philipp
+ mail@marcphilipp.de
+
+
+ mmerdes
+ Matthias Merdes
+ Matthias.Merdes@heidelberg-mobil.com
+
+
+ sbrannen
+ Sam Brannen
+ sam@sambrannen.com
+
+
+ sormuras
+ Christian Stein
+ sormuras@gmail.com
+
+
+
+ scm:git:git://github.com/junit-team/junit5.git
+ scm:git:git://github.com/junit-team/junit5.git
+ https://github.com/junit-team/junit5
+
+
+
+ org.apiguardian
+ apiguardian-api
+ 1.0.0
+ compile
+
+
+ org.junit.platform
+ junit-platform-launcher
+ 1.4.0
+ compile
+
+
+
diff --git a/junit-platform-runner-1.3.1.pom b/junit-platform-runner-1.4.0.pom
similarity index 95%
rename from junit-platform-runner-1.3.1.pom
rename to junit-platform-runner-1.4.0.pom
index 7c19e35..3811b38 100644
--- a/junit-platform-runner-1.3.1.pom
+++ b/junit-platform-runner-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-runner
- 1.3.1
+ 1.4.0
JUnit Platform Runner
Module "junit-platform-runner" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -52,6 +52,12 @@
https://github.com/junit-team/junit5
+
+ junit
+ junit
+ 4.12
+ compile
+
org.apiguardian
apiguardian-api
@@ -61,19 +67,13 @@
org.junit.platform
junit-platform-launcher
- 1.3.1
+ 1.4.0
compile
org.junit.platform
junit-platform-suite-api
- 1.3.1
- compile
-
-
- junit
- junit
- 4.12
+ 1.4.0
compile
diff --git a/junit-platform-suite-api-1.3.1.pom b/junit-platform-suite-api-1.4.0.pom
similarity index 88%
rename from junit-platform-suite-api-1.3.1.pom
rename to junit-platform-suite-api-1.4.0.pom
index 5bd8eed..8e5ce08 100644
--- a/junit-platform-suite-api-1.3.1.pom
+++ b/junit-platform-suite-api-1.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.platform
junit-platform-suite-api
- 1.3.1
+ 1.4.0
JUnit Platform Suite API
Module "junit-platform-suite-api" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -58,11 +58,5 @@
1.0.0
compile
-
- org.junit.platform
- junit-platform-commons
- 1.3.1
- compile
-
diff --git a/junit-platform-surefire-provider-1.3.1.pom b/junit-platform-surefire-provider-1.3.1.pom
deleted file mode 100644
index bae82ba..0000000
--- a/junit-platform-surefire-provider-1.3.1.pom
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
- 4.0.0
- org.junit.platform
- junit-platform-surefire-provider
- 1.3.1
- JUnit Platform Surefire Provider
- Module "junit-platform-surefire-provider" of JUnit 5.
- http://junit.org/junit5/
-
-
- The Apache License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
-
-
-
-
- bechte
- Stefan Bechtold
- stefan.bechtold@me.com
-
-
- jlink
- Johannes Link
- business@johanneslink.net
-
-
- marcphilipp
- Marc Philipp
- mail@marcphilipp.de
-
-
- mmerdes
- Matthias Merdes
- Matthias.Merdes@heidelberg-mobil.com
-
-
- sbrannen
- Sam Brannen
- sam@sambrannen.com
-
-
- sormuras
- Christian Stein
- sormuras@gmail.com
-
-
-
- scm:git:git://github.com/junit-team/junit5.git
- scm:git:git://github.com/junit-team/junit5.git
- https://github.com/junit-team/junit5
-
-
-
- org.apiguardian
- apiguardian-api
- 1.0.0
- compile
-
-
- org.junit.platform
- junit-platform-launcher
- 1.3.1
- compile
-
-
- org.apache.maven.surefire
- surefire-api
- 2.22.0
- runtime
-
-
- org.apache.maven.surefire
- common-java5
- 2.22.0
- runtime
-
-
-
diff --git a/junit-vintage-engine-5.3.1.pom b/junit-vintage-engine-5.4.0.pom
similarity index 95%
rename from junit-vintage-engine-5.3.1.pom
rename to junit-vintage-engine-5.4.0.pom
index 3eda4fa..8d7f870 100644
--- a/junit-vintage-engine-5.3.1.pom
+++ b/junit-vintage-engine-5.4.0.pom
@@ -4,10 +4,10 @@
4.0.0
org.junit.vintage
junit-vintage-engine
- 5.3.1
+ 5.4.0
JUnit Vintage Engine
Module "junit-vintage-engine" of JUnit 5.
- http://junit.org/junit5/
+ https://junit.org/junit5/
Eclipse Public License v2.0
@@ -61,7 +61,7 @@
org.junit.platform
junit-platform-engine
- 1.3.1
+ 1.4.0
compile
diff --git a/junit5-5.4.0.tar.gz b/junit5-5.4.0.tar.gz
new file mode 100644
index 0000000..f73de4f
Binary files /dev/null and b/junit5-5.4.0.tar.gz differ
diff --git a/junit5.spec b/junit5.spec
index 64692cf..f77abbb 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -1,121 +1,117 @@
-#Global macro or variable
-%global junit_url https://repo1.maven.org/maven2/org/junit
-%global platform junit-platform
-%global platform_version 1.3.1
-%global jupiter junit-jupiter
-%global vintage junit-vintage
-
-#Basic Information
-Name: junit5
-Version: 5.3.1
-Release: 3
-Summary: Java regression testing framework
-License: EPL-2.0 and ASL 2.0
-URL: http://junit.org/junit5/
-Source0: https://github.com/junit-team/junit5/archive/r%{version}.tar.gz
-Source100: aggregator.pom
-Source200: %{junit_url}/platform/%{platform}-commons/%{platform_version}/%{platform}-commons-%{platform_version}.pom
-Source201: %{junit_url}/platform/%{platform}-console/%{platform_version}/%{platform}-console-%{platform_version}.pom
-Source202: %{junit_url}/platform/%{platform}-console-standalone/%{platform_version}/%{platform}-console-standalone-%{platform_version}.pom
-Source203: %{junit_url}/platform/%{platform}-engine/%{platform_version}/%{platform}-engine-%{platform_version}.pom
-Source205: %{junit_url}/platform/%{platform}-launcher/%{platform_version}/%{platform}-launcher-%{platform_version}.pom
-Source206: %{junit_url}/platform/%{platform}-runner/%{platform_version}/%{platform}-runner-%{platform_version}.pom
-Source207: %{junit_url}/platform/%{platform}-suite-api/%{platform_version}/%{platform}-suite-api-%{platform_version}.pom
-Source208: %{junit_url}/platform/%{platform}-surefire-provider/%{platform_version}/%{platform}-surefire-provider-%{platform_version}.pom
-Source301: %{junit_url}/jupiter/%{jupiter}-api/%{version}/%{jupiter}-api-%{version}.pom
-Source302: %{junit_url}/jupiter/%{jupiter}-engine/%{version}/%{jupiter}-engine-%{version}.pom
-Source303: %{junit_url}/jupiter/%{jupiter}-migrationsupport/%{version}/%{jupiter}-migrationsupport-%{version}.pom
-Source304: %{junit_url}/jupiter/%{jupiter}-params/%{version}/%{jupiter}-params-%{version}.pom
-Source400: %{junit_url}/vintage/%{vintage}-engine/%{version}/%{vintage}-engine-%{version}.pom
-BuildArch: noarch
-
-#Dependency
-BuildRequires: maven-local
-BuildRequires: mvn(com.univocity:univocity-parsers)
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.maven.surefire:common-java5)
-BuildRequires: mvn(org.apache.maven.surefire:surefire-api)
-BuildRequires: mvn(org.apiguardian:apiguardian-api)
-BuildRequires: mvn(org.opentest4j:opentest4j)
-BuildRequires: asciidoc
-
+%global platform_version 1.4.0
+%global jupiter_version %{version}
+%global vintage_version %{version}
+%bcond_with console
+Name: junit5
+Version: 5.4.0
+Release: 1
+Summary: Java regression testing framework
+License: EPL-2.0
+URL: http://junit.org/junit5/
+Source0: https://github.com/junit-team/junit5/archive/r%{version}/junit5-%{version}.tar.gz
+Source100: aggregator.pom
+Source200: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/%{platform_version}/junit-platform-commons-%{platform_version}.pom
+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
+Source205: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-launcher/%{platform_version}/junit-platform-launcher-%{platform_version}.pom
+Source206: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-runner/%{platform_version}/junit-platform-runner-%{platform_version}.pom
+Source207: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-suite-api/%{platform_version}/junit-platform-suite-api-%{platform_version}.pom
+Source208: https://repo1.maven.org/maven2/org/junit/platform/junit-platform-reporting/%{platform_version}/junit-platform-reporting-%{platform_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
+Source304: https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/%{jupiter_version}/junit-jupiter-params-%{jupiter_version}.pom
+Source400: https://repo1.maven.org/maven2/org/junit/vintage/junit-vintage-engine/%{vintage_version}/junit-vintage-engine-%{vintage_version}.pom
+BuildRequires: maven-local mvn(com.univocity:univocity-parsers) mvn(junit:junit)
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) mvn(org.apiguardian:apiguardian-api)
+BuildRequires: mvn(org.opentest4j:opentest4j)
+%if %{with console}
+BuildRequires: mvn(info.picocli:picocli)
+%endif
+BuildRequires: asciidoc
+%if %{with console}
+Requires: javapackages-tools
+%endif
+BuildArch: noarch
%description
JUnit is a popular regression testing framework for Java platform.
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{name}
%description javadoc
Junit5 API documentation.
-%package_help
+%package guide
+Summary: Documentation for %{name}
+Requires: %{name}-javadoc = %{version}-%{release}
+
+%description guide
+JUnit 5 User Guide.
-#Build sections
%prep
%setup -q -n %{name}-r%{version}
find -name \*.jar -delete
-
-cp -p %{jupiter}-api/LICENSE.md LICENSE-Eclipse.md
-cp -p %{platform}-surefire-provider/LICENSE.md LICENSE-Apache.md
-
cp -p %{SOURCE100} pom.xml
-cp -p %{SOURCE200} %{platform}-commons/pom.xml
-cp -p %{SOURCE201} %{platform}-console/pom.xml
-cp -p %{SOURCE202} %{platform}-console-standalone/pom.xml
-cp -p %{SOURCE203} %{platform}-engine/pom.xml
-cp -p %{SOURCE205} %{platform}-launcher/pom.xml
-cp -p %{SOURCE206} %{platform}-runner/pom.xml
-cp -p %{SOURCE207} %{platform}-suite-api/pom.xml
-cp -p %{SOURCE208} %{platform}-surefire-provider/pom.xml
-cp -p %{SOURCE301} %{jupiter}-api/pom.xml
-cp -p %{SOURCE302} %{jupiter}-engine/pom.xml
-cp -p %{SOURCE303} %{jupiter}-migrationsupport/pom.xml
-cp -p %{SOURCE304} %{jupiter}-params/pom.xml
-cp -p %{SOURCE400} %{vintage}-engine/pom.xml
-
+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 %{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 %{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 %{SOURCE400} junit-vintage-engine/pom.xml
for pom in $(find -mindepth 2 -name pom.xml); do
# Set parent to aggregator
- %pom_xpath_inject pom:project "org.openeuler.xmvn.junit5aggregator1.0.0" $pom
+ %pom_xpath_inject pom:project "org.openeuler.xmvn.junit5aggregator1.0.0" $pom
# OSGi BSN
bsn=$(sed 's|/pom.xml$||;s|.*/|org.|;s|-|.|g' <<<"$pom")
%pom_xpath_inject pom:project "${bsn}" $pom
# Incorrect scope - API guardian is just annotation, needed only during compilation
%pom_xpath_set -f "pom:dependency[pom:artifactId='apiguardian-api']/pom:scope" provided $pom
done
-
-%pom_add_dep net.sf.jopt-simple:jopt-simple:5.0.4 %{platform}-console
-%pom_add_dep com.univocity:univocity-parsers:2.5.4 %{jupiter}-params
-
-%pom_xpath_set "pom:dependency[pom:groupId='org.apache.maven.surefire']/pom:scope" provided %{platform}-surefire-provider
-
-%pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile %{vintage}-engine
-
-%pom_disable_module %{platform}-console
-%pom_disable_module %{platform}-console-standalone
-
+%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
+%pom_xpath_set "pom:dependency[pom:artifactId='junit']/pom:scope" compile junit-vintage-engine
+%if %{without console}
+%pom_disable_module junit-platform-console
+%pom_disable_module junit-platform-console-standalone
+%endif
%mvn_package :aggregator __noinstall
%build
%mvn_build -f
-
asciidoc documentation/src/docs/asciidoc/index.adoc || :
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 list
%files -f .mfiles
-%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
+%if %{with console}
+%{_bindir}/%{name}
+%endif
+%license LICENSE.md LICENSE-notice.md
%files javadoc -f .mfiles-javadoc
-%license LICENSE.md LICENSE-Eclipse.md LICENSE-Apache.md
+%license LICENSE.md LICENSE-notice.md
-%files help
+%files guide
%doc documentation/src/docs/*
%changelog
+* Fri Aug 14 2020 leiju - 5.4.0-1
+- Update from 5.3.1 to 5.4.0
+
* Thu Feb 27 2020 Jiangping Hu - 5.3.1-3
- Package init
diff --git a/junit5.yaml b/junit5.yaml
new file mode 100644
index 0000000..5a169d2
--- /dev/null
+++ b/junit5.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: junit-team/junit5
+tag_prefix: "r"
+seperator: "."
diff --git a/r5.3.1.tar.gz b/r5.3.1.tar.gz
deleted file mode 100644
index 6b68620..0000000
Binary files a/r5.3.1.tar.gz and /dev/null differ