Author: centic
Date: Tue Aug 1 08:24:54 2023
New Revision: 1911383
URL: http://svn.apache.org/viewvc?rev=1911383&view=rev
Log:
Update Apache Ant to 1.10.13 and use newer Gradle syntax
Modified:
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/poi-examples/src/main/groovy/build.gradle
poi/trunk/poi-excelant/build.gradle
poi/trunk/poi-integration/build.gradle
poi/trunk/poi/build.gradle
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Tue Aug 1 08:24:54 2023
@@ -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',
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Tue Aug 1 08:24:54 2023
@@ -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"/>
Modified: poi/trunk/poi-examples/src/main/groovy/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-examples/src/main/groovy/build.gradle?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/poi-examples/src/main/groovy/build.gradle (original)
+++ poi/trunk/poi-examples/src/main/groovy/build.gradle Tue Aug 1 08:24:54 2023
@@ -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'
Modified: poi/trunk/poi-excelant/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-excelant/build.gradle?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/poi-excelant/build.gradle (original)
+++ poi/trunk/poi-excelant/build.gradle Tue Aug 1 08:24:54 2023
@@ -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')
Modified: poi/trunk/poi-integration/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-integration/build.gradle?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/poi-integration/build.gradle (original)
+++ poi/trunk/poi-integration/build.gradle Tue Aug 1 08:24:54 2023
@@ -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'
Modified: poi/trunk/poi/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/build.gradle?rev=1911383&r1=1911382&r2=1911383&view=diff
==============================================================================
--- poi/trunk/poi/build.gradle (original)
+++ poi/trunk/poi/build.gradle Tue Aug 1 08:24:54 2023
@@ -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}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
