Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Apache Ant to 1.10.13 and use newer Gradle syntax 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1911383 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2023-08-01 08:24:54 +00:00
parent ce1e4695e7
commit 8e2b749cf6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -67,7 +67,7 @@ configurations {
dependencies {
antLibs("org.junit.jupiter:junit-jupiter:5.10.0")
antLibs("org.apache.ant:ant-junitlauncher:1.10.12")
antLibs("org.apache.ant:ant-junitlauncher:1.10.13")
}
ant.taskdef(name: "junit",
@ -366,7 +366,7 @@ subprojects {
jvmArgs += [
// see https://github.com/java9-modularity/gradle-modules-plugin/issues/97
// opposed to the recommendation there, it doesn't work to add ... to the dependencies
// testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.7.1'
// testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.0'
// gradles gradle-worker.jar is still not a JPMS module and thus runs as unnamed module
'--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=org.apache.poi.poi',
'--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED',

4
build.xml
View File

@ -291,8 +291,8 @@ under the License.
<dependency prefix="main.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.20.0" usage="main-tests"/>
<dependency prefix="main.commons-logging" artifact="commons-logging:commons-logging:1.2" usage="main-tests"/>
<dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.12" usage="excelant"/>
<dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.12" usage="excelant"/>
<dependency prefix="main.ant" artifact="org.apache.ant:ant:1.10.13" usage="excelant"/>
<dependency prefix="main.antlauncher" artifact="org.apache.ant:ant-launcher:1.10.13" usage="excelant"/>
<!-- xml signature libs - not part of the distribution -->
<dependency prefix="dsig.xmlsec" artifact="org.apache.santuario:xmlsec:3.0.2" usage="ooxml-provided"/>

2
poi-examples/src/main/groovy/build.gradle
View File

@ -37,7 +37,7 @@ tasks.withType(JavaExec) {
classpath = sourceSets.main.runtimeClasspath
}
task runScript(type: JavaExec) {
main = "SpreadSheetDemo"
mainClass = "SpreadSheetDemo"
args = ["../../../test-data/spreadsheet/Simple.xls"]
}
defaultTasks 'runScript'

2
poi-excelant/build.gradle
View File

@ -31,7 +31,7 @@ sourceSets {
}
dependencies {
api 'org.apache.ant:ant:1.10.12'
api 'org.apache.ant:ant:1.10.13'
api project(':poi-ooxml')
compileOnly project(path: ':poi-ooxml', configuration: 'archives')

2
poi-integration/build.gradle
View File

@ -39,7 +39,7 @@ sourceSets {
}
dependencies {
testImplementation 'org.apache.ant:ant:1.10.12'
testImplementation 'org.apache.ant:ant:1.10.13'
testImplementation 'org.apache.commons:commons-collections4:4.4'
testImplementation 'com.google.guava:guava:32.1.1-jre'

2
poi/build.gradle
View File

@ -44,7 +44,7 @@ dependencies {
api "org.apache.logging.log4j:log4j-api:${log4jVersion}"
testImplementation 'org.reflections:reflections:0.10.2'
testImplementation 'org.apache.ant:ant:1.10.12'
testImplementation 'org.apache.ant:ant:1.10.13'
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"