From 2370b63beb2729de62270c670eae8f41618113e7 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 15 Jul 2025 23:48:30 +0100 Subject: [PATCH 1/4] test with xmlbeans snapshot --- build.gradle | 8 +++++++- poi-ooxml-full/build.gradle | 4 +++- poi-ooxml-lite-agent/build.gradle | 4 +++- poi-ooxml-lite/build.gradle | 4 +++- poi-ooxml/build.gradle | 4 +++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 776a5cdd1ca..21f7e3cc9a0 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,9 @@ plugins { repositories { mavenCentral() // maven { url 'https://repository.apache.org/content/repositories/staging' } + maven { + url 'https://central.sonatype.com/repository/maven-snapshots/' + } } // Only add the plugin for Sonar if enabled @@ -116,7 +119,7 @@ subprojects { log4jVersion = '2.24.3' mockitoVersion = '4.11.0' hamcrestVersion = '3.0' - xmlbeansVersion = '5.3.0' + xmlbeansVersion = '5.4.0-SNAPSHOT' batikVersion = '1.19' graphics2dVersion = '3.0.3' pdfboxVersion = '3.0.5' @@ -168,6 +171,9 @@ subprojects { repositories { mavenCentral() // maven { url 'https://repository.apache.org/content/repositories/staging' } + maven { + url 'https://central.sonatype.com/repository/maven-snapshots/' + } } dependencies { diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 4495a6c8b4d..aad7f794566 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -34,7 +34,9 @@ sourceSets { } dependencies { - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + transitive: false + } } idea { diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index fef003b3274..4d17a98e094 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -24,7 +24,9 @@ sourceSets { dependencies { api 'net.bytebuddy:byte-buddy:1.17.5' api 'net.bytebuddy:byte-buddy-agent:1.17.5' - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + transitive: false + } } final MODULE_NAME = 'org.apache.poi.ooxml_lite' diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 655b8fc32ce..8231daa4c96 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -34,7 +34,9 @@ sourceSets { } dependencies { - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + transitive: false + } compileOnly project(':poi-ooxml-full') } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 8a9309799b6..9f34e64ee84 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -58,7 +58,9 @@ dependencies { api project(':poi-ooxml-full') api project(path: ':poi-ooxml-full', configuration: 'archives') - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" + api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + transitive: false + } api "org.apache.commons:commons-compress:${commonsCompressVersion}" api "commons-io:commons-io:${commonsIoVersion}" api 'com.github.virtuald:curvesapi:1.08' From a4ebfd272952f19117698d31f882b641b71c747c Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 15 Jul 2025 23:52:15 +0100 Subject: [PATCH 2/4] fix gradle --- poi-ooxml-full/build.gradle | 2 +- poi-ooxml-lite-agent/build.gradle | 2 +- poi-ooxml-lite/build.gradle | 2 +- poi-ooxml/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index aad7f794566..55e5f075177 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -35,7 +35,7 @@ sourceSets { dependencies { api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { - transitive: false + transitive = false } } diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index 4d17a98e094..a15095ab348 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -25,7 +25,7 @@ dependencies { api 'net.bytebuddy:byte-buddy:1.17.5' api 'net.bytebuddy:byte-buddy-agent:1.17.5' api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { - transitive: false + transitive = false } } diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 8231daa4c96..41cae9fd6ba 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -35,7 +35,7 @@ sourceSets { dependencies { api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { - transitive: false + transitive = false } compileOnly project(':poi-ooxml-full') } diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index 9f34e64ee84..c04a227c065 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -59,7 +59,7 @@ dependencies { api project(path: ':poi-ooxml-full', configuration: 'archives') api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { - transitive: false + transitive = false } api "org.apache.commons:commons-compress:${commonsCompressVersion}" api "commons-io:commons-io:${commonsIoVersion}" From 7c101b295145b27a02fc640e4e61c934324ea8ad Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Tue, 15 Jul 2025 23:56:21 +0100 Subject: [PATCH 3/4] fix groupId --- poi-ooxml-full/build.gradle | 2 +- poi-ooxml-lite-agent/build.gradle | 2 +- poi-ooxml-lite/build.gradle | 2 +- poi-ooxml/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index 55e5f075177..dbb01d5e4f7 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -34,7 +34,7 @@ sourceSets { } dependencies { - api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } } diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index a15095ab348..aa14507babc 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -24,7 +24,7 @@ sourceSets { dependencies { api 'net.bytebuddy:byte-buddy:1.17.5' api 'net.bytebuddy:byte-buddy-agent:1.17.5' - api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } } diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index 41cae9fd6ba..d1b98a01610 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -34,7 +34,7 @@ sourceSets { } dependencies { - api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } compileOnly project(':poi-ooxml-full') diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle index c04a227c065..ba824cf60ad 100644 --- a/poi-ooxml/build.gradle +++ b/poi-ooxml/build.gradle @@ -58,7 +58,7 @@ dependencies { api project(':poi-ooxml-full') api project(path: ':poi-ooxml-full', configuration: 'archives') - api ("com.pjfanning.github:xmlbeans:${xmlbeansVersion}") { + api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } api "org.apache.commons:commons-compress:${commonsCompressVersion}" From 155cff2db516ff1947ee6476c93245c2e01680a8 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 16 Jul 2025 00:01:43 +0100 Subject: [PATCH 4/4] log4j --- poi-ooxml-full/build.gradle | 1 + poi-ooxml-lite-agent/build.gradle | 1 + poi-ooxml-lite/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle index dbb01d5e4f7..b5449d660f3 100644 --- a/poi-ooxml-full/build.gradle +++ b/poi-ooxml-full/build.gradle @@ -37,6 +37,7 @@ dependencies { api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" } idea { diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle index aa14507babc..1779fa2c771 100644 --- a/poi-ooxml-lite-agent/build.gradle +++ b/poi-ooxml-lite-agent/build.gradle @@ -27,6 +27,7 @@ dependencies { api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" } final MODULE_NAME = 'org.apache.poi.ooxml_lite' diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle index d1b98a01610..9bdfea89916 100644 --- a/poi-ooxml-lite/build.gradle +++ b/poi-ooxml-lite/build.gradle @@ -37,6 +37,7 @@ dependencies { api ("com.github.pjfanning:xmlbeans:${xmlbeansVersion}") { transitive = false } + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" compileOnly project(':poi-ooxml-full') }