Skip to content

Fixed: Complete Mustang 2.26 compatibility #1806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mridulpathak merged 1 commit into from
Aug 29, 2026
Merged

Fixed: Complete Mustang 2.26 compatibility #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-api:2.25.4' // the API of log4j 2
implementation 'org.apache.logging.log4j:log4j-core:2.25.4' // Somehow needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:4.1.2' // poi-ooxml-schemas-5.0.0.pom'. Received status code 401 from server
implementation 'org.apache.pdfbox:pdfbox:2.0.37' // 3.0.1 does not compile
implementation 'org.apache.pdfbox:pdfbox:3.0.8'
implementation 'org.apache.pdfbox:pdfbox-io:3.0.8'
implementation 'org.apache.shiro:shiro-core:1.13.0'
implementation 'org.apache.shiro:shiro-crypto-cipher:2.1.0'
implementation 'org.apache.sshd:sshd-core:2.17.1'
implementation 'org.apache.sshd:sshd-sftp:2.17.1'
implementation 'org.apache.tika:tika-core:2.9.4'
implementation 'org.apache.tika:tika-parsers:2.9.4'
implementation 'org.apache.tika:tika-parser-pdf-module:2.9.4'
implementation 'org.apache.tika:tika-core:3.3.2'
implementation 'org.apache.tika:tika-parsers:3.3.2'
implementation 'org.apache.tika:tika-parser-pdf-module:3.3.2'
implementation 'org.apache.cxf:cxf-rt-frontend-jaxrs:3.6.12' // 4.0.3 does not compile
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.121' // Remember to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.121'
Expand Down
2 changes: 1 addition & 1 deletion framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import java.util.Vector;
import java.util.WeakHashMap;

import javax.xml.bind.DatatypeConverter;
import jakarta.xml.bind.DatatypeConverter;
import javax.xml.parsers.ParserConfigurationException;

import org.apache.ofbiz.base.util.Debug;
Expand Down
4 changes: 3 additions & 1 deletion framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@
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.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
import org.apache.pdfbox.pdmodel.PDEmbeddedFilesNameTreeNode;
Expand Down Expand Up @@ -1019,7 +1021,7 @@ private static boolean isValidPdfFile(String fileName) {
}
// OK no JS code, pass to check 2: detect if the document has any embedded files
PDEmbeddedFilesNameTreeNode efTree = null;
try (PDDocument pdDocument = PDDocument.load(file)) {
try (PDDocument pdDocument = Loader.loadPDF(new RandomAccessReadBufferedFile(fileName))) {
PDDocumentNameDictionary names = new PDDocumentNameDictionary(pdDocument.getDocumentCatalog());
efTree = names.getEmbeddedFiles();
}
Expand Down