From: Dominik Stadler <centic@apache.org>
Date: Tue, 2 Nov 2021 13:18:20 +0000 (+0000)
Subject: Keep junit-versions in sync between Ant and Gradle
X-Git-Tag: REL_5_2_0~287
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb306470148eafd8dd3092fc9c83f1033ccaec37;p=poi.git

Keep junit-versions in sync between Ant and Gradle

Also remove outdated versions of junit 5 jars
This breaks CI builds in strange ways otherwise

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894678 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index b83c0acba2..0f56642d93 100644
--- a/build.xml
+++ b/build.xml
@@ -275,9 +275,9 @@ under the License.
     <dependency prefix="main.junit-params" artifact="org.junit.jupiter:junit-jupiter-params:5.8.1" usage="main-tests"/>
     <dependency prefix="main.junit-opentest4j" artifact="org.opentest4j:opentest4j:1.2.0" usage="main-tests"/>
     <dependency prefix="main.junit-apiguardian" artifact="org.apiguardian:apiguardian-api:1.1.0" usage="main-tests"/>
-    <dependency prefix="main.junit-pcommons" artifact="org.junit.platform:junit-platform-commons:1.7.1" usage="main-tests"/>
-    <dependency prefix="main.junit-pengine" artifact="org.junit.platform:junit-platform-engine:1.7.1" usage="main-tests"/>
-    <dependency prefix="main.junit-plauncher" artifact="org.junit.platform:junit-platform-launcher:1.7.1" usage="main-tests"/>
+    <dependency prefix="main.junit-pcommons" artifact="org.junit.platform:junit-platform-commons:1.8.1" usage="main-tests"/>
+    <dependency prefix="main.junit-pengine" artifact="org.junit.platform:junit-platform-engine:1.8.1" usage="main-tests"/>
+    <dependency prefix="main.junit-plauncher" artifact="org.junit.platform:junit-platform-launcher:1.8.1" usage="main-tests"/>
 
 
     <dependency prefix="main.jmh" artifact="org.openjdk.jmh:jmh-core:1.33" usage="main-tests"/>
@@ -678,7 +678,10 @@ under the License.
                 <include name="hamcrest-core*"/>
                 <include name="junit-4*.jar"/>
                 <include name="*slf4j*.jar"/>
-            </fileset>
+				<include name="junit-jupiter-*-5.8.0.jar"/>
+				<include name="junit-jupiter-*-5.7.*.jar"/>
+				<include name="junit-platform-*-1.7.*.jar"/>
+			</fileset>
             <fileset dir="${basedir}/lib/ooxml">
                 <include name="xmlbeans-3*.jar"/>
                 <include name="xmlbeans-4*.jar"/>