This is an automated email from the ASF dual-hosted git repository.
centic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9e1afbbab1 Fix some more Gradle deprecation-warnings in preparation
for Gradle 9
9e1afbbab1 is described below
commit 9e1afbbab10c99562d2a03a0682c79092c1b7972
Author: Dominik Stadler <[email protected]>
AuthorDate: Thu Dec 18 08:33:13 2025 +0100
Fix some more Gradle deprecation-warnings in preparation for Gradle 9
Only signing-handling in poi-ooxml is still remaining, but
this deprecation seems to have been moved to Gradle 10 anyway.
Gradle 9 will require JDK 17, though, so we can only upgrade
when the min. supported JDK is bumped once more.
---
build.gradle | 20 ++++++++++----------
poi-examples/build.gradle | 2 +-
poi-excelant/build.gradle | 4 ++--
poi-integration/build.gradle | 4 ++--
poi-ooxml-lite-agent/build.gradle | 2 +-
poi-ooxml-lite/build.gradle | 2 +-
poi-ooxml/build.gradle | 4 ++--
poi-scratchpad/build.gradle | 4 ++--
poi/build.gradle | 6 +++---
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/build.gradle b/build.gradle
index 16b791c0e3..42512be7c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -227,14 +227,14 @@ subprojects {
tasks.withType(Jar).configureEach {
duplicatesStrategy = DuplicatesStrategy.FAIL
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
doLast {
// make sure we do not have distribution jar-files with different
versions
// in the build-dir as those lead to strange errors about
"duplicate modules"
// when building java9 JPMS class files ("java9")
ant.delete(failOnError: true, verbose: true) {
- fileset(dir:
"../build/dist/maven/${project.archivesBaseName}", erroronmissingdir: false) {
+ fileset(dir: "../build/dist/maven/${base.archivesName.get()}",
erroronmissingdir: false) {
include(name: '*.jar')
exclude(name: "*${version}.jar")
exclude(name: "*${version}-sources.jar")
@@ -260,7 +260,7 @@ subprojects {
}
// use failOnError=false for -javadoc and -tests as not all
modules create this directory
ant.delete(failOnError: false, verbose: true) {
- fileset(dir:
"../build/dist/maven/${project.archivesBaseName}-javadoc", erroronmissingdir:
false) {
+ fileset(dir:
"../build/dist/maven/${base.archivesName.get()}-javadoc", erroronmissingdir:
false) {
include(name: '*-javadoc.jar')
exclude(name: "*${version}-javadoc.jar")
@@ -275,7 +275,7 @@ subprojects {
}
}
ant.delete(failOnError: false, verbose: true) {
- fileset(dir:
"../build/dist/maven/${project.archivesBaseName}-tests", erroronmissingdir:
false) {
+ fileset(dir:
"../build/dist/maven/${base.archivesName.get()}-tests", erroronmissingdir:
false) {
include(name: '*-tests.jar')
exclude(name: "*${version}-tests.jar")
@@ -290,8 +290,8 @@ subprojects {
}
}
- ant.checksum(file: it.archivePath, algorithm: 'SHA-256', fileext:
'.sha256', format: 'MD5SUM')
- ant.checksum(file: it.archivePath, algorithm: 'SHA-512', fileext:
'.sha512', format: 'MD5SUM')
+ ant.checksum(file: it.archiveFile.get().asFile, algorithm:
'SHA-256', fileext: '.sha256', format: 'MD5SUM')
+ ant.checksum(file: it.archiveFile.get().asFile, algorithm:
'SHA-512', fileext: '.sha512', format: 'MD5SUM')
}
}
@@ -319,11 +319,11 @@ subprojects {
javadocJar {
// if javadocs and binaries are in the same directory, JPMS complaints
about duplicated modules
// in the module-path
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-javadoc")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-javadoc")
}
sourcesJar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
exclude 'META-INF/services/**'
}
@@ -504,7 +504,7 @@ subprojects {
publications {
POI(MavenPublication) {
groupId = 'org.apache.poi'
- artifactId = project.archivesBaseName
+ artifactId = base.archivesName.get()
from components.java
@@ -585,7 +585,7 @@ subprojects {
}
}
- generatePomFileForPOIPublication.destination =
"../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
+ generatePomFileForPOIPublication.destination =
"../build/dist/maven/${base.archivesName.get()}/${base.archivesName.get()}-${project.version}.pom"
tasks.withType(GenerateModuleMetadata).configureEach {
enabled = false
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
index 86b5a4a235..c8a5a0cca1 100644
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@@ -67,7 +67,7 @@ tasks.register('compileJava9', JavaCompile) {
jar {
dependsOn compileJava9
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release':
'true')
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
index 4e0e2acabd..290125cebc 100644
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@@ -95,7 +95,7 @@ tasks.register('compileTest9', JavaCompile) {
jar {
dependsOn compileJava9
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release':
'true')
@@ -119,7 +119,7 @@ sourcesJar {
// Create a separate jar for test-code to depend on it in other projects
// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-tests")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-tests")
setArchiveClassifier 'tests'
// ignore second module-info.class from main
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
index a6e02af472..3a09a4bb33 100644
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@@ -109,7 +109,7 @@ tasks.register('compileTest9', JavaCompile) {
jar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release':
'true')
@@ -119,7 +119,7 @@ jar {
// Create a separate jar for test-code to depend on it in other projects
// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-tests")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-tests")
setArchiveClassifier 'tests'
// ignore second module-info.class from main
diff --git a/poi-ooxml-lite-agent/build.gradle
b/poi-ooxml-lite-agent/build.gradle
index 01df3553c8..8334b90096 100644
--- a/poi-ooxml-lite-agent/build.gradle
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -56,7 +56,7 @@ tasks.register('compileJava9', JavaCompile) {
}
jar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes (
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
index 71b58b0958..32cd1c0ae3 100644
--- a/poi-ooxml-lite/build.gradle
+++ b/poi-ooxml-lite/build.gradle
@@ -107,7 +107,7 @@ task compileJava9(type: JavaCompile, dependsOn:
'compileJava') {
}
jar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
doFirst {
File clazzFile = file("${OOXML_LITE_REPORT}.clazz")
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
index 069691099e..4902dab65e 100644
--- a/poi-ooxml/build.gradle
+++ b/poi-ooxml/build.gradle
@@ -187,7 +187,7 @@ tasks.register('compileTest9', JavaCompile) {
jar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release':
'true')
@@ -197,7 +197,7 @@ jar {
// Create a separate jar for test-code to depend on it in other projects
// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
task testJar(type: Jar, dependsOn: testClasses) {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-tests")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-tests")
setArchiveClassifier 'tests'
// ignore second module-info.class from main
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index fd37a9922f..e67aed79ae 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -88,7 +88,7 @@ tasks.register('compileTest9', JavaCompile) {
jar {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}")
manifest {
attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release':
'true')
@@ -98,7 +98,7 @@ jar {
// Create a separate jar for test-code to depend on it in other projects
// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
task testJar(type: Jar, dependsOn: testClasses) {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-tests")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-tests")
setArchiveClassifier 'tests'
// ignore second module-info.class from main
diff --git a/poi/build.gradle b/poi/build.gradle
index 7fd4b5f544..d11aaf9ac6 100644
--- a/poi/build.gradle
+++ b/poi/build.gradle
@@ -124,7 +124,7 @@ jar {
// Create a separate jar for test-code to depend on it in other projects
// See http://stackoverflow.com/questions/5144325/gradle-test-dependency
task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ]) {
- destinationDirectory =
file("../build/dist/maven/${project.archivesBaseName}-tests")
+ destinationDirectory =
file("../build/dist/maven/${base.archivesName.get()}-tests")
setArchiveClassifier 'tests'
// ignore second module-info.class from main
@@ -138,11 +138,11 @@ task testJar(type: Jar, dependsOn: [ testClasses,
compileTest9 ]) {
}
javadoc {
- dependsOn configurations.javadocs.dependencies.collect{ ':' +
it.dependencyProject.name + ':compileJava' }
+ dependsOn configurations.javadocs.dependencies.collect{ ':' +
project.project(it.path).name + ':compileJava' }
doFirst {
options {
- classpath += files(configurations.javadocs.dependencies.collect{
it.dependencyProject.sourceSets.main.output.classesDirs })
+ classpath += files(configurations.javadocs.dependencies.collect{
project.project(it.path).sourceSets.main.output.classesDirs })
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
