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

diff --git a/build.gradle b/build.gradle
index dbca0f60c2b073ff3496198b7b7bbe77f2c52a3f..cd278a919fb1cf0309201a9d5521cac4e4d64858 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -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',

diff --git a/build.xml b/build.xml
index 12f8d61914e974c89f670ae95a0f6482d47f5940..319913fed5a9cf14ce00d40727159b1fbd769ada 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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"/>

diff --git a/poi-examples/src/main/groovy/build.gradle b/poi-examples/src/main/groovy/build.gradle
index 95121081d88d0b63271bed510cc13a213e912cef..cc8e6f738fe76df1a6fb7ddda2773662c96b442f 100644 (file)
--- a/poi-examples/src/main/groovy/build.gradle
+++ b/poi-examples/src/main/groovy/build.gradle
@@ -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'

diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 9c14fe26a354752560613c8f07d30e5a3eaa0266..3bfdf08da52b251bdc3970adc19f4d3a18ed9182 100644 (file)
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -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')

diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index 3e631a2ff9b01adee4fee5f9a769b97321c17a0e..b75ec95f178fed764f968f7afe84406cec8bcc1c 100644 (file)
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -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'
 

diff --git a/poi/build.gradle b/poi/build.gradle
index bf54b17b0ad59d987125d0c4c8d15f816fc18274..b454a1d1eb426ad04f75b3e18423da77ad9a31d5 100644 (file)
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -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}"