moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1834762 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2018-06-30 20:36:47 +00:00
parent 31674ea13b
commit 6193f895ba
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@ -34,6 +34,20 @@ if (project.hasProperty('enableSonar')) {
// For help converting an Ant build to a Gradle build, see // For help converting an Ant build to a Gradle build, see
// https://docs.gradle.org/current/userguide/ant.html // 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' ant.importBuild 'build.xml'
/** /**
@ -241,7 +255,7 @@ project('excelant') {
sourceSets.test.java.srcDirs = ['../../src/excelant/testcases'] sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
dependencies { dependencies {
compile 'org.apache.ant:ant:1.10.1' compile 'org.apache.ant:ant:1.10.4'
compile project(':main') compile project(':main')
compile project(':ooxml') compile project(':ooxml')
@ -265,7 +279,7 @@ project('integrationtest') {
sourceSets.test.java.srcDirs = ['../../src/integrationtest'] sourceSets.test.java.srcDirs = ['../../src/integrationtest']
dependencies { dependencies {
compile 'org.apache.ant:ant:1.10.1' compile 'org.apache.ant:ant:1.10.4'
compile project(':main') compile project(':main')
compile project(':ooxml') compile project(':ooxml')