started migration to Junit 5

This commit is contained in:
chengzihan2 2020-09-04 16:04:57 +08:00
parent ee9498861b
commit 76f68e711c
3 changed files with 61 additions and 2 deletions

View File

@ -0,0 +1,52 @@
From a671eac4ae355b1d45907d8df71dfdd294906651 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Sun, 17 Jun 2018 13:52:09 +0200
Subject: [PATCH] Revert "started migration to Junit 5"
This reverts upstream commit 6ca437135e19c7506286458416485b0d6abcbf1c.
---
pom.xml | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index b532637..934b9d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<maven.home>${user.home}/SDKs/apache-maven-3.5.0</maven.home>
<min.maven.api>3.0</min.maven.api>
- <junit.version>5.2.0</junit.version>
</properties>
<issueManagement>
@@ -237,9 +236,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -464,13 +463,6 @@
<test.folder>${project.build.testOutputDirectory}</test.folder>
</systemPropertyVariables>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.junit.platform</groupId>
- <artifactId>junit-platform-surefire-provider</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
--
2.17.1

View File

@ -1,12 +1,12 @@
Name: java-comment-preprocessor
Version: 6.1.4
Release: 3
Release: 4
Summary: The Most Powerful Multi-Pass Java Preprocessor
License: ASL 2.0
URL: https://github.com/raydac/java-comment-preprocessor
Source0: https://github.com/raydac/%name/archive/%version/%name-%version.tar.gz
BuildArch: noarch
Patch0000: java-comment-preprocessor-6.1.4-revert-junit5.patch
BuildRequires: maven-local mvn(commons-io:commons-io) mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.commons:commons-lang3) mvn(org.apache.maven:maven-core)
@ -50,5 +50,8 @@ find -name "*.jar" -or -name "*.class" -delete
%files help -f .mfiles-javadoc
%changelog
* Fri Sep 4 2020 leiju<leiju4@huawei.com> - 6.1.4-4
- started migration to Junit 5
* Wed Mar 4 2020 zhouyihang<zhouyihang1@huawei.com> - 6.1.4-3
- Pakcage init

View File

@ -0,0 +1,4 @@
version_control: github
src_repo: raydac/java-comment-preprocessor
tag_prefix: "^"
seperator: "."