This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new fffa395d17 Improved: Update to Apache Tika 3.0.0 (OFBIZ-13155)
fffa395d17 is described below
commit fffa395d17a930bfc6c10b6986876b48ebc63c6d
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Oct 21 18:47:44 2024 +0200
Improved: Update to Apache Tika 3.0.0 (OFBIZ-13155)
This reverts commit 7c3a622f08e37d6a68125844383820dac1592f23.
When running testSendOrderConfirmation and testFopMacroLibrary
there are a lot of issues with dependencies related to
org.apache.xmlgraphics Tika, FOP and PDFBox
To be checked before going further using PDFBox 33.0.3 and FOP 2.10
I'll put the the error stack for testSendOrderConfirmation in the Jira
---
dependencies.gradle | 9 ++++-----
.../java/org/apache/ofbiz/entity/serialize/XmlSerializer.java | 2 +-
.../src/main/java/org/apache/ofbiz/security/SecuredUpload.java | 3 +--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index 621b9b4327..f902364959 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -53,15 +53,14 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.20.0' // the API of
log4j 2
implementation 'org.apache.logging.log4j:log4j-core:2.20.0' // Somehow
needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:5.3.0'
- implementation 'org.apache.pdfbox:pdfbox:3.0.3'
+ implementation 'org.apache.pdfbox:pdfbox:2.0.32' // 3.0.1 does not compile
implementation 'org.apache.shiro:shiro-core:1.13.0'
implementation 'org.apache.shiro:shiro-crypto-cipher:2.0.0'
implementation 'org.apache.sshd:sshd-core:2.13.1'
implementation 'org.apache.sshd:sshd-sftp:2.13.1'
- implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
- implementation 'org.apache.tika:tika-core:3.0.0'
- implementation 'org.apache.tika:tika-parsers:3.0.0'
- implementation 'org.apache.tika:tika-parser-pdf-module:3.0.0'
+ implementation 'org.apache.tika:tika-core:2.9.2'
+ implementation 'org.apache.tika:tika-parsers:2.9.2'
+ implementation 'org.apache.tika:tika-parser-pdf-module:2.9.2'
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.4' // 4.x+
requires javax.xml.bind -> jakarta.xml.bind namespace change
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.91' // Remember
to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.91'
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
index e7e9eadd04..ce954005a7 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
@@ -44,7 +44,7 @@ import java.util.TreeSet;
import java.util.Vector;
import java.util.WeakHashMap;
-import jakarta.xml.bind.DatatypeConverter;
+import javax.xml.bind.DatatypeConverter;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.ofbiz.base.util.Debug;
diff --git
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index 7e7670ed88..8e83b452bb 100644
---
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -76,7 +76,6 @@ import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.base.util.UtilXml;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.util.EntityUtilProperties;
-import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
@@ -531,7 +530,7 @@ public class SecuredUpload {
}
// OK no JS code, pass to check 2: detect if the document has any
embedded files
PDEmbeddedFilesNameTreeNode efTree = null;
- try (PDDocument pdDocument = Loader.loadPDF(file)) {
+ try (PDDocument pdDocument = PDDocument.load(file)) {
PDDocumentNameDictionary names = new
PDDocumentNameDictionary(pdDocument.getDocumentCatalog());
efTree = names.getEmbeddedFiles();
}
