diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java index 2fe8e9c2..d4d355f6 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java @@ -22,8 +22,7 @@ import java.io.InputStreamReader; import java.util.List; -import at.gv.egiz.pdfas.lib.impl.pdfbox2.placeholder.SignatureFieldsAndPlaceHolderExtractor; - +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; //Imports @@ -43,6 +42,7 @@ import at.asit.pdfover.gui.workflow.Status; import at.asit.pdfover.gui.workflow.config.ConfigurationManager; import at.asit.pdfover.signer.SignaturePosition; +import at.gv.egiz.pdfas.lib.impl.pdfbox3.PDFBoxPlaceholderExtractor; import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData; import lombok.extern.slf4j.Slf4j; @@ -127,7 +127,7 @@ public void run() { // scan for signature placeholders // - see if we want to scan for placeholders in the settings if (config.getEnablePlaceholderUsage()) { - try (PDDocument pddocument = PDDocument.load(getStateMachine().status.document)) { + try (PDDocument pddocument = Loader.loadPDF(getStateMachine().status.document)) { // - scan for placeholders boolean useSignatureFields = config.getUseSignatureFields(); boolean useMarker = config.getUseMarker(); @@ -135,7 +135,7 @@ public void run() { //first check the signature fields placeholder if (useSignatureFields) { - List fields = SignatureFieldsAndPlaceHolderExtractor.findEmptySignatureFields(pddocument); + List fields = PDFBoxPlaceholderExtractor.findEmptySignatureFields(pddocument); if (fields.size() > 0) { while (true) @@ -183,7 +183,7 @@ public void run() { // second check if qr code placeholder search is enabled } else if (useMarker) { - SignaturePlaceholderData signaturePlaceholderData = SignatureFieldsAndPlaceHolderExtractor.getNextUnusedSignaturePlaceHolder(pddocument); + SignaturePlaceholderData signaturePlaceholderData = PDFBoxPlaceholderExtractor.getNextUnusedSignaturePlaceholder(pddocument); if (null != signaturePlaceholderData) { diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java index cf7e91c8..7008350e 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java @@ -19,6 +19,7 @@ import java.io.File; import java.io.IOException; +import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException; import org.eclipse.swt.SWT; @@ -75,7 +76,7 @@ private void openPDFDocument() throws IOException { PDDocument pdf = null; try { - pdf = PDDocument.load(documentPath); + pdf = Loader.loadPDF(documentPath); if (pdf.getNumberOfPages() > 0) pdf.getPage(0); else diff --git a/pdf-over-signer/pom.xml b/pdf-over-signer/pom.xml index b6ae2c25..1f60f850 100644 --- a/pdf-over-signer/pom.xml +++ b/pdf-over-signer/pom.xml @@ -7,10 +7,10 @@ .. pdf-over-signer - PDF-Over PDF-AS 4 Signer + PDF-Over PDF-AS Signer ${project.basedir}/.. - 4.4.2 + 5.0.1-SNAPSHOT @@ -25,7 +25,7 @@ at.gv.egiz.pdfas - pdf-as-pdfbox-2 + pdf-as-pdfbox-3 ${pdfover-build.pdfas-version} @@ -36,17 +36,17 @@ iaik iaik_eccelerate - 3.01 + 6.02 iaik iaik_cms - 2.15 + 5.1.1 iaik iaik_eccelerate_cms - 3.01 + 6.02 at.a-sit diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java index b45b559c..ccd6aa93 100644 --- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java +++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java @@ -16,8 +16,8 @@ package at.asit.pdfover.signer.pdfas; // Imports -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; import at.asit.pdfover.signer.BkuSlConnector; import at.asit.pdfover.signer.SignatureException; diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java index 17299354..73cb7e3d 100644 --- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java +++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java @@ -3,8 +3,6 @@ import java.io.ByteArrayOutputStream; import java.util.UUID; -import javax.activation.DataSource; - import at.asit.pdfover.commons.Constants; import at.asit.pdfover.commons.Profile; import at.asit.pdfover.signer.ByteArrayDocumentSource; @@ -87,7 +85,7 @@ public static PdfAs4SigningState prepare(PdfAs4SignatureParameter parameter) thr PdfAs4SigningState state = new PdfAs4SigningState(); ByteArrayOutputStream output = new ByteArrayOutputStream(); - DataSource input = new ByteArrayDataSource(parameter.inputDocument.getByteArray()); + ByteArrayDataSource input = new ByteArrayDataSource(parameter.inputDocument.getByteArray()); SignParameter param = PdfAsFactory.createSignParameter(config, input, output); if (sigPos != null) { param.setSignaturePosition(sigPos); diff --git a/pom.xml b/pom.xml index 7c5f23ce..0864a78f 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 21 21 ${project.basedir} - 2.0.34 + 3.0.6 3.134.0 @@ -232,11 +232,6 @@ metadata-extractor 2.18.0 - - javax.activation - activation - 1.1.1 - com.google.code.findbugs jsr305 diff --git a/release-instructions/publish.sh b/release-instructions/publish.sh index 4b7a02ad..4a115825 100644 --- a/release-instructions/publish.sh +++ b/release-instructions/publish.sh @@ -1,5 +1,18 @@ #!/bin/bash +orig="$PWD" +if [[ "$orig" != /tmp/* ]]; then + tmp=$(mktemp -d) + + mvn clean + cp -a . "$tmp/repo" + + cd "$tmp/repo" + ./release-instructions/publish.sh "$@" + + cp -a pdf-over-build "$orig/" +fi + #### CONFIGURE: ###### LOG_DIR="/tmp/pdfover_log" diff --git a/repo/iaik/iaik_cms/2.15/iaik_cms-2.15.jar b/repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.jar similarity index 53% rename from repo/iaik/iaik_cms/2.15/iaik_cms-2.15.jar rename to repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.jar index 2696ed2b..127160d1 100644 Binary files a/repo/iaik/iaik_cms/2.15/iaik_cms-2.15.jar and b/repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.jar differ diff --git a/repo/iaik/iaik_cms/2.15/iaik_cms-2.15.pom b/repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.pom similarity index 94% rename from repo/iaik/iaik_cms/2.15/iaik_cms-2.15.pom rename to repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.pom index b7913010..af9dbe9a 100644 --- a/repo/iaik/iaik_cms/2.15/iaik_cms-2.15.pom +++ b/repo/iaik/iaik_cms/5.1.1/iaik_cms-5.1.1.pom @@ -4,6 +4,6 @@ 4.0.0 iaik iaik_cms - 2.15 + 5.1.1 POM was created from install:install-file diff --git a/repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.jar b/repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.jar deleted file mode 100644 index 0ec31103..00000000 Binary files a/repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.jar and /dev/null differ diff --git a/repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar b/repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar new file mode 100644 index 00000000..e30b629e Binary files /dev/null and b/repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.jar differ diff --git a/repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.pom b/repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.pom similarity index 94% rename from repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.pom rename to repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.pom index 625307e4..1cb18168 100644 --- a/repo/iaik/iaik_eccelerate/3.01/iaik_eccelerate-3.01.pom +++ b/repo/iaik/iaik_eccelerate/6.02/iaik_eccelerate-6.02.pom @@ -4,6 +4,6 @@ 4.0.0 iaik iaik_eccelerate - 3.01 + 6.02 POM was created from install:install-file diff --git a/repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar b/repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar deleted file mode 100644 index 3c9ac832..00000000 Binary files a/repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.jar and /dev/null differ diff --git a/repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar b/repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar new file mode 100644 index 00000000..32d7aec0 Binary files /dev/null and b/repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.jar differ diff --git a/repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.pom b/repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.pom similarity index 94% rename from repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.pom rename to repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.pom index 12f42b4f..36ad16ad 100644 --- a/repo/iaik/iaik_eccelerate_cms/3.01/iaik_eccelerate_cms-3.01.pom +++ b/repo/iaik/iaik_eccelerate_cms/6.02/iaik_eccelerate_cms-6.02.pom @@ -4,6 +4,6 @@ 4.0.0 iaik iaik_eccelerate_cms - 3.01 + 6.02 POM was created from install:install-file