diff options
39 files changed, 76 insertions, 73 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 23eacde9..a900b385 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ variables: LANGUAGE: "en_US" LIB_NAME: "PDF-AS 4" GIT_DEPTH: "2" - SECURE_LOG_LEVEL: "debug" - + SECURE_LOG_LEVEL: "debug" + include: - template: Dependency-Scanning.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml @@ -18,16 +18,16 @@ dependency_scanning: variables: MAVEN_CLI_OPTS: "-DskipTests --settings ${CI_PROJECT_DIR}/.cisettings.xml" DS_JAVA_VERSION: 11 - + spotbugs-sast: variables: - MAVEN_CLI_OPTS: "-DskipTests --settings ${CI_PROJECT_DIR}/.cisettings.xml" - SAST_JAVA_VERSION: 11 - + MAVEN_CLI_OPTS: "-DskipTests --settings ${CI_PROJECT_DIR}/.cisettings.xml" + SAST_JAVA_VERSION: 11 + default: tags: - docker - + stages: - assemble - test @@ -43,41 +43,44 @@ cache: assemble: stage: assemble tags: - - docker + - docker except: - - tags + - tags script: | - ./gradlew --warning-mode all -x test clean build + ./gradlew --warning-mode all clean build artifacts: when: always reports: junit: "**/build/test-results/test/**/TEST-*.xml" + paths: + - "**/pdf-as-tests/src/test/test-suites" + release_packaging: stage: package tags: - - docker + - docker except: - - tags + - tags - /^feature/.*$/i - /^issue.*$/i before_script: - mkdir -p ~/.ssh - ssh-keyscan apps.egiz.gv.at >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts script: | ./gradlew --stacktrace -x test assemble uploadArchives artifacts: when: always - name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" + name: "${CI_PROJECT_NAME}-${CI_COMMIT_SHORT_SHA}" reports: - dotenv: variables.env - + dotenv: variables.env + release: stage: release image: registry.gitlab.com/gitlab-org/release-cli:latest tags: - - docker + - docker needs: - job: assemble artifacts: true diff --git a/build.gradle b/build.gradle index 62ac8b50..d1b725ed 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,12 @@ subprojects { } } maven { + url "https://apps.egiz.gv.at/maven-internal/" + mavenContent { + releasesOnly() + } + } + maven { url "https://apps.egiz.gv.at/maven-snapshot/" mavenContent { snapshotsOnly() diff --git a/pdf-as-cli/src/test/resources/test.p12 b/pdf-as-cli/src/test/resources/test.p12 Binary files differindex ec55d100..660bf7cc 100644 --- a/pdf-as-cli/src/test/resources/test.p12 +++ b/pdf-as-cli/src/test/resources/test.p12 diff --git a/pdf-as-tests/build.gradle b/pdf-as-tests/build.gradle index 785f5ead..1ee5e964 100644 --- a/pdf-as-tests/build.gradle +++ b/pdf-as-tests/build.gradle @@ -8,12 +8,12 @@ jar { } repositories { - mavenLocal() - mavenCentral() - maven { url "https://repository.jboss.org/maven2/" } - maven { url "http://anonsvn.icesoft.org/repo/maven2/releases/" } - maven { url "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/" } - + maven { url "https://apps.egiz.gv.at/maven-internal/" } +// mavenLocal() +// mavenCentral() +// maven { url "https://repository.jboss.org/maven2/" } +// maven { url "https://repository.jboss.org/nexus/content/repositories/thirdparty-releases/" } +// } configurations{ @@ -33,11 +33,9 @@ dependencies { implementation project (':signature-standards:sigs-pkcs7detached') implementation project (':signature-standards:sigs-pades') - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36' implementation group: 'javax.activation', name: 'activation', version: '1.1.1' - testImplementation group: 'org.icepdf.os', name: 'icepdf-core', version: '6.1.1' - implementation project (':pdf-as-pdfbox-2') //compile group: 'org.apache.pdfbox', name: 'preflight', version: '2.0.21' //compile group: 'org.apache.pdfbox', name: 'pdfbox', version: '2.0.21' diff --git a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java index cb06b669..84d12cfb 100644 --- a/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java +++ b/pdf-as-tests/src/test/java/at/gv/egiz/param_tests/SignaturePositionTest.java @@ -1,6 +1,9 @@ package at.gv.egiz.param_tests; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.awt.Color; import java.awt.Graphics; @@ -16,10 +19,8 @@ import java.util.List; import javax.imageio.ImageIO; -import org.icepdf.core.pobjects.Document; -import org.icepdf.core.pobjects.PDimension; -import org.icepdf.core.pobjects.Page; -import org.icepdf.core.util.GraphicsRenderingHints; +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.rendering.PDFRenderer; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; @@ -222,8 +223,16 @@ public class SignaturePositionTest extends SignatureTest { BufferedImage sigPageImage = captureImage(baseTestData.getOutputFile(), sigPageNumber); assertNotNull("Could not get image of page", sigPageImage); + + /* + * Re-classify. + * Only use this after manually check all signature block results that currently fail! + * + * <code>ImageIO.write(sigPageImage, "png", new File(refImageFileName));</code> + */ + BufferedImage refImage = ImageIO.read(new File(refImageFileName)); - assertNotNull("Could not get reference image", sigPageImage); + assertNotNull("Could not get reference image", refImage); assertEquals("Width of image differs from reference", refImage.getWidth(), sigPageImage.getWidth()); @@ -235,7 +244,7 @@ public class SignaturePositionTest extends SignatureTest { int imageHeight = sigPageImage.getHeight(); ignoreAreas(sigPageGraphics, imageHeight); ignoreAreas(refImageGraphics, imageHeight); - + String refImageIgnored = extractDirectoryString(baseTestData .getOutputFile()) + "refImage_ignored.png"; ImageIO.write(refImage, "png", new File(refImageIgnored)); @@ -303,8 +312,7 @@ public class SignaturePositionTest extends SignatureTest { } /** - * This method captures an image of a page of a PDF document. This is done - * using the rendering capabilities of ICEPDF. + * This method captures an image of a page of a PDF document. * * @param fileName * the name of the PDF file @@ -313,30 +321,18 @@ public class SignaturePositionTest extends SignatureTest { * @return the captured image * @throws InterruptedException */ - private BufferedImage captureImage(String fileName, int pageNumber) throws InterruptedException { - Document document = new Document(); - try { - document.setFile(fileName); - } catch (Exception e) { - document.dispose(); - fail(String - .format("Not possible to capture page %d of file %s, because of %s.", - pageNumber, fileName, e.getMessage())); - } - Page page = document.getPageTree().getPage(pageNumber - 1); - page.init(); - PDimension sz = page.getSize(Page.BOUNDARY_CROPBOX, 0, ZOOM); - - int pageWidth = (int) sz.getWidth(); - int pageHeight = (int) sz.getHeight(); - - BufferedImage image = new BufferedImage(pageWidth, pageHeight, - BufferedImage.TYPE_4BYTE_ABGR); - Graphics g = image.createGraphics(); - page.paint(g, GraphicsRenderingHints.PRINT, Page.BOUNDARY_CROPBOX, 0, - ZOOM); - document.dispose(); - return image; + private BufferedImage captureImage(String fileName, int pageNumber) throws InterruptedException { + try { + PDDocument signedPdf = PDDocument.load(new File(fileName)); + PDFRenderer renderer = new PDFRenderer(signedPdf); + return renderer.renderImage(pageNumber - 1, ZOOM); + + } catch (IOException e) { + fail(String + .format("Not possible to capture page %d of file %s, because of %s.", + pageNumber, fileName, e.getMessage())); + return null; + } } } diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/config.properties index c612cba8..7409d0d8 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_AMTSSIGNATURBLOCK_DE profile.id=AMTSSIGNATURBLOCK_DE parent=../auto_pos_example.properties -position.ignored_areas=215,683,142,9 +position.ignored_areas=215,679,142,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/example_ref.png Binary files differindex abae9fbf..3802aae4 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/config.properties index a2558440..186f5bdd 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_AMTSSIGNATURBLOCK_DE_SMALL profile.id=AMTSSIGNATURBLOCK_DE_SMALL parent=../auto_pos_example.properties -position.ignored_areas=285,693,90,6 +position.ignored_areas=285,685,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/example_ref.png Binary files differindex 0142a949..1eb82370 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_DE_SMALL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/config.properties index 4bb4b426..4ddf33d0 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_AMTSSIGNATURBLOCK_EN profile.id=AMTSSIGNATURBLOCK_EN parent=../auto_pos_example.properties -position.ignored_areas=215,683,142,9 +position.ignored_areas=215,679,142,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/example_ref.png Binary files differindex b4035715..ab26c869 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/config.properties index 64459d91..1110f058 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_AMTSSIGNATURBLOCK_EN_SMALL profile.id=AMTSSIGNATURBLOCK_EN_SMALL parent=../auto_pos_example.properties -position.ignored_areas=285,693,90,6 +position.ignored_areas=285,685,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/example_ref.png Binary files differindex 66439630..49f9b00e 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AMTSSIGNATURBLOCK_EN_SMALL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AUTO/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AUTO/example_ref.png Binary files differindex c90e29bc..8d679bbe 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AUTO/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_AUTO/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/config.properties index bac0aba0..c8ccefb0 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_DE profile.id=SIGNATURBLOCK_DE parent=../auto_pos_example.properties -position.ignored_areas=215,683,142,9 +position.ignored_areas=215,687,142,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/example_ref.png Binary files differindex 3c3a2b3b..75234dcc 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_MINIMAL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_MINIMAL/example_ref.png Binary files differindex 4d6ef09b..f01aaa6b 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_MINIMAL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_MINIMAL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_NOTE/example_ref.png Binary files differindex 9e3b7a50..fc02f592 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/config.properties index 2519069e..ab0108a6 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_DE_PDFA profile.id=SIGNATURBLOCK_DE_PDFA parent=../auto_pos_example.properties -position.ignored_areas=229,685,146,9 +position.ignored_areas=229,686,146,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/example_ref.png Binary files differindex 6b579323..4d8be34f 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA_NOTE/example_ref.png Binary files differindex 109f8bdd..126e877b 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_PDFA_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/config.properties index 0dc32b51..58f415c1 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_DE_SMALL profile.id=SIGNATURBLOCK_SMALL_DE parent=../auto_pos_example.properties -position.ignored_areas=287,688,90,6 +position.ignored_areas=287,690,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/example_ref.png Binary files differindex 54d62df9..87e5e8f5 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/config.properties index cc486478..6276ab18 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_DE_SMALL_NOTE profile.id=SIGNATURBLOCK_SMALL_DE_NOTE parent=../auto_pos_example.properties -position.ignored_areas=287,688,90,6 +position.ignored_areas=287,690,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/example_ref.png Binary files differindex b78a80b7..8c9a6ff3 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_DE_SMALL_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/config.properties index 2ae8636a..3107a1e9 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_EN profile.id=SIGNATURBLOCK_EN parent=../auto_pos_example.properties -position.ignored_areas=215,683,142,9 +position.ignored_areas=215,687,142,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/example_ref.png Binary files differindex b86cb373..b7b30433 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_MINIMAL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_MINIMAL/example_ref.png Binary files differindex c33d5080..5bb02e82 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_MINIMAL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_MINIMAL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/config.properties index e2acb791..5c3d8c30 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_EN_NOTE profile.id=SIGNATURBLOCK_EN_NOTE parent=../auto_pos_example.properties -position.ignored_areas=200,683,160,9 +position.ignored_areas=200,686,160,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/example_ref.png Binary files differindex f66c7ffb..c0a3a7ee 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/config.properties index f7a7c5fd..d6f9cc5c 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_EN_PDFA profile.id=SIGNATURBLOCK_EN_PDFA parent=../auto_pos_example.properties -position.ignored_areas=212,685,146,9 +position.ignored_areas=212,686,146,9 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/example_ref.png Binary files differindex 144eac8b..fc20dcc7 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA_NOTE/example_ref.png Binary files differindex 4cd2a234..47684166 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_PDFA_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/config.properties index 8edb9a3d..7cdd8d64 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_EN_SMALL profile.id=SIGNATURBLOCK_SMALL_EN parent=../auto_pos_example.properties -position.ignored_areas=287,688,90,6 +position.ignored_areas=287,690,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/example_ref.png Binary files differindex cba258ea..65915a67 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/config.properties b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/config.properties index fdb06520..65c045cb 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/config.properties +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/config.properties @@ -2,4 +2,4 @@ test.type=position test.name=POS_SIGNATURBLOCK_EN_SMALL_NOTE profile.id=SIGNATURBLOCK_SMALL_EN_NOTE parent=../auto_pos_example.properties -position.ignored_areas=282,688,90,6 +position.ignored_areas=282,690,90,6 diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/example_ref.png b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/example_ref.png Binary files differindex ec03ed26..775504c2 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/example_ref.png +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/POS_SIGNATURBLOCK_EN_SMALL_NOTE/example_ref.png diff --git a/pdf-as-tests/src/test/test-suites/public_pdfbox2/test.p12 b/pdf-as-tests/src/test/test-suites/public_pdfbox2/test.p12 Binary files differindex ec55d100..660bf7cc 100644 --- a/pdf-as-tests/src/test/test-suites/public_pdfbox2/test.p12 +++ b/pdf-as-tests/src/test/test-suites/public_pdfbox2/test.p12 diff --git a/settings.gradle b/settings.gradle index b7d6e2f4..e82f1166 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include "pdf-as-common", "signature-standards:sigs-pkcs7detached", "signature-standards:sigs-pades", "pdf-as-lib", "pdf-as-pdfbox-2", "pdf-as-moa", "pdf-as-cli", "pdf-as-legacy", "pdf-as-web-status", "pdf-as-web-statistic-api", "pdf-as-web", "pdf-as-web-db", "pdf-as-web-client"
\ No newline at end of file +include "pdf-as-common", "signature-standards:sigs-pkcs7detached", "signature-standards:sigs-pades", "pdf-as-lib", "pdf-as-pdfbox-2", "pdf-as-moa", "pdf-as-cli", "pdf-as-legacy", "pdf-as-web-status", "pdf-as-web-statistic-api", "pdf-as-web", "pdf-as-web-db", "pdf-as-web-client", "pdf-as-tests"
\ No newline at end of file |
