From: Andreas Beeker <kiwiwings@apache.org>
Date: Sat, 30 Jun 2018 20:36:47 +0000 (+0000)
Subject: Fix gradle ant-junit dependencies when not using the gradle wrapper / update ant... 
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6193f895ba65cd5ae290b3c6f3c954e2c8781b9f;p=poi.git

Fix gradle ant-junit dependencies when not using the gradle wrapper / update ant version

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

diff --git a/build.gradle b/build.gradle
index 35b01b4ba2..8a95968107 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,20 @@ if (project.hasProperty('enableSonar')) {
 // For help converting an Ant build to a Gradle build, see
 // https://docs.gradle.org/current/userguide/ant.html
 
+configurations {
+    antLibs
+}
+
+dependencies {
+    antLibs("junit:junit:4.12")
+    antLibs("org.apache.ant:ant-junit:1.10.4")
+    antLibs("org.apache.ant:ant-junit4:1.10.4")
+}
+
+ant.taskdef(name: "junit",
+        classname: "org.apache.tools.ant.taskdefs.optional.junit.JUnitTask",
+        classpath: configurations.antLibs.asPath)
+
 ant.importBuild 'build.xml'
 
 /**
@@ -241,7 +255,7 @@ project('excelant') {
     sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
 
     dependencies {
-        compile 'org.apache.ant:ant:1.10.1'
+        compile 'org.apache.ant:ant:1.10.4'
 
         compile project(':main')
         compile project(':ooxml')
@@ -265,7 +279,7 @@ project('integrationtest') {
     sourceSets.test.java.srcDirs = ['../../src/integrationtest']
 
     dependencies {
-        compile 'org.apache.ant:ant:1.10.1'
+        compile 'org.apache.ant:ant:1.10.4'
 
         compile project(':main')
         compile project(':ooxml')