diff --git a/java-comment-preprocessor-6.1.4-revert-junit5.patch b/java-comment-preprocessor-6.1.4-revert-junit5.patch new file mode 100644 index 0000000..8ea0502 --- /dev/null +++ b/java-comment-preprocessor-6.1.4-revert-junit5.patch @@ -0,0 +1,52 @@ +From a671eac4ae355b1d45907d8df71dfdd294906651 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +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 @@ + yyyyMMddHHmm + ${user.home}/SDKs/apache-maven-3.5.0 + 3.0 +- 5.2.0 + + + +@@ -237,9 +236,9 @@ + compile + + +- org.junit.vintage +- junit-vintage-engine +- ${junit.version} ++ junit ++ junit ++ 4.12 + test + + +@@ -464,13 +463,6 @@ + ${project.build.testOutputDirectory} + + +- +- +- org.junit.platform +- junit-platform-surefire-provider +- 1.2.0 +- +- + + + +-- +2.17.1 + diff --git a/java-comment-preprocessor.spec b/java-comment-preprocessor.spec index d5a5ce1..0f38729 100644 --- a/java-comment-preprocessor.spec +++ b/java-comment-preprocessor.spec @@ -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 - 6.1.4-4 +- started migration to Junit 5 + * Wed Mar 4 2020 zhouyihang - 6.1.4-3 - Pakcage init diff --git a/java-comment-preprocessor.yaml b/java-comment-preprocessor.yaml new file mode 100644 index 0000000..00fd326 --- /dev/null +++ b/java-comment-preprocessor.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: raydac/java-comment-preprocessor +tag_prefix: "^" +seperator: "."