Merge pull request #167 from mendix/run/4952-upgrade-dependencies

[RUN-4952] Upgrade dependencies

Author: atennapel

build.gradle

@@ -25,7 +25,7 @@ mxMarketplace {
     moduleLicense = 'Apache V2'
     appDirectory = "src/CommunityCommons"
     versionPathPrefix = "_Version " // the path prefix within the module to the version folder
-    includeFiles = ["$mprDir/License.txt", "$mprDir/SiemensMendixCommunityCommons__11.4.0__READMEOSS.html"]
+    includeFiles = ["$mprDir/License.txt", "$mprDir/SiemensMendixCommunityCommons__11.5.0__READMEOSS.html"]
     syncJavaDependenciesBeforeBuild = true
 }
 

gradle.properties

@@ -1 +1 @@
-version=11.4.1-SNAPSHOT
+version=11.5.0-SNAPSHOT

marketplace/release-notes/11.5.0.txt

@@ -0,0 +1,7 @@
+- We upgraded guava to 33.5.0-jre
+- We upgraded owasp-java-html-sanitizer to 20240325.1
+- We upgraded commons-io to 2.21.0
+- We upgraded pdfbox to 3.0.6
+- We upgraded commons-lang3 to 3.20.0
+- We upgraded commons-text to 1.14.0
+- We added the pdfbox-io 3.0.6 dependency

src/CommunityCommons/CommunityCommons.mpr

@@ -36,6 +36,9 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
+import org.apache.pdfbox.io.RandomAccessRead;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
+import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.multipdf.Overlay;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -629,12 +632,12 @@ public static Language getDefaultLanguage(IContext context) throws CoreException
 	public static boolean mergePDF(IContext context, List<FileDocument> documents, IMendixObject mergedDocument) throws IOException {
 		if (getMergeMultiplePdfs_MaxAtOnce() <= 0 || documents.size() <= getMergeMultiplePdfs_MaxAtOnce()) {
 
-			List<InputStream> sources = new ArrayList<>();
+			List<RandomAccessRead> sources = new ArrayList<>();
 			try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
 				PDFMergerUtility mergePdf = new PDFMergerUtility();
 
 				for (FileDocument file : documents) {
-					InputStream content = Core.getFileDocumentContent(context, file.getMendixObject());
+					RandomAccessRead content = new RandomAccessReadBuffer(Core.getFileDocumentContent(context, file.getMendixObject()));
 					sources.add(content);
 				}
 				mergePdf.addSources(sources);
@@ -648,7 +651,7 @@ public static boolean mergePDF(IContext context, List<FileDocument> documents, I
 			} catch (IOException e) {
 				throw new RuntimeException("Failed to merge documents" + e.getMessage(), e);
 			} finally { // We cannot use try-with-resources because streams would be prematurely closed
-				for (InputStream is : sources) {
+				for (RandomAccessRead is : sources) {
 					is.close();
 				}
 			}
@@ -675,8 +678,10 @@ public static boolean mergePDF(IContext context, List<FileDocument> documents, I
 	public static boolean overlayPdf(IContext context, IMendixObject generatedDocumentMendixObject, IMendixObject overlayMendixObject, boolean onTopOfContent) throws IOException {
 		Logging.trace(LOGNODE, "Retrieve generated document");
 		try (
-			PDDocument inputDoc = PDDocument.load(Core.getFileDocumentContent(context, generatedDocumentMendixObject));
-			PDDocument overlayDoc = PDDocument.load(Core.getFileDocumentContent(context, overlayMendixObject));
+			RandomAccessRead generatedDocumentInput = new RandomAccessReadBuffer(Core.getFileDocumentContent(context, generatedDocumentMendixObject));
+			RandomAccessRead overlayInput = new RandomAccessReadBuffer(Core.getFileDocumentContent(context, overlayMendixObject));
+			PDDocument inputDoc = Loader.loadPDF(generatedDocumentInput);
+			PDDocument overlayDoc = Loader.loadPDF(overlayInput);
 			ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
 			Logging.trace(LOGNODE, "Overlay PDF start, retrieve overlay PDF");