From 6c14a96db118497061c60db18eea644785b75445 Mon Sep 17 00:00:00 2001 From: Emina Ahmetovic Date: Wed, 20 Jan 2021 16:11:58 +0100 Subject: preparing 4.1.7 RC --- build.gradle | 2 +- .../impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java | 7 ------- .../gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java | 4 +--- pdf-as-web/build.gradle | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index e0fa1866..9fc9c0cb 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ task wrapper(type: Wrapper) { allprojects { apply plugin: "com.github.ben-manes.versions" repositories { mavenCentral() } - version = '4.1.7-SNAPSHOT' + version = '4.1.7-RC' } configurations { diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java index 0998a2eb..8a2c1cff 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java @@ -130,13 +130,6 @@ public class SignaturePlaceholderExtractor extends PDFStreamEngine implements Pl return placeholders; } - public void setPlaceholders(List placeholders) { - this.placeholders = placeholders; - } - - public static void clearPlaceholders() { - placeholders.clear(); - } /** * Search the document for placeholder images and possibly included diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java index cff5fc7f..09f1a7ee 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java @@ -158,7 +158,6 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { placeholders = SignaturePlaceholderExtractor.getPlaceholders(); - if(placeholder_id.equalsIgnoreCase("")){ if(checkAvailablePlaceholders(placeholders,existingSignatureLocations(doc))!=null) { @@ -176,7 +175,6 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { if (signaturePlaceholderData != null) { // Placeholder found! - placeholders.clear(); logger.info("Placeholder data found."); if (signaturePlaceholderData.getProfile() != null) { logger.debug("Placeholder Profile set to: " + signaturePlaceholderData.getProfile()); @@ -901,7 +899,7 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { public SignaturePlaceholderData checkAvailablePlaceholders(List placeholders, List existingPlaceholders) { SignaturePlaceholderData result = null; - if(placeholders!=null){ + if(placeholders!=null) { for(int i = 0; i < placeholders.size(); ++i) { if(!existingPlaceholders.contains(placeholders.get(i).getPlaceholderName())) { result = placeholders.get(i); diff --git a/pdf-as-web/build.gradle b/pdf-as-web/build.gradle index f0fadfb3..d97ad500 100644 --- a/pdf-as-web/build.gradle +++ b/pdf-as-web/build.gradle @@ -48,7 +48,6 @@ dependencies { pdfbox1 project (':pdf-as-pdfbox') compile project (':pdf-as-web-status') compile project (':pdf-as-web-statistic-api') - compile group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.1' compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21' compile group: 'org.apache.pdfbox', name: 'pdfbox-tools', version: '2.0.21' -- cgit v1.2.3