From 02585f021aa8155bafc169e4f3be48746f010a6e Mon Sep 17 00:00:00 2001 From: Svante Schubert Date: Mon, 19 Dec 2022 17:16:48 +0100 Subject: [PATCH 1/3] Updating vera-pdf to version 1.22.2 --- validator/pom.xml | 2 +- .../java/org/mustangproject/validator/PDFValidator.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/validator/pom.xml b/validator/pom.xml index 767ef776..4256e060 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -82,7 +82,7 @@ org.verapdf validation-model - 1.16.1 + 1.22.2 diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java index a110f783..0cd6c4ad 100644 --- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java @@ -32,7 +32,7 @@ import org.verapdf.features.FeatureExtractorConfig; import org.verapdf.features.FeatureFactory; import org.verapdf.metadata.fixer.FixerFactory; import org.verapdf.metadata.fixer.MetadataFixerConfig; -import org.verapdf.pdfa.VeraGreenfieldFoundryProvider; +import org.verapdf.gf.foundry.VeraGreenfieldFoundryProvider; import org.verapdf.pdfa.validation.validators.ValidatorConfig; import org.verapdf.pdfa.validation.validators.ValidatorFactory; import org.verapdf.processor.BatchProcessor; @@ -111,9 +111,8 @@ public class PDFValidator extends Validator { final List files = new ArrayList<>(); files.add(new File(pdfFilename)); // starting the processor - processor.process(files, ProcessorFactory.getHandler(FormatOption.MRR, true, reportStream, 100, - processorConfig.getValidatorConfig().isRecordPasses())); - + processor.process(files, ProcessorFactory.getHandler(FormatOption.MRR, true, reportStream, + processorConfig.getValidatorConfig().isRecordPasses())); pdfReport = reportStream.toString("utf-8").replaceAll("<\\?xml version=\"1\\.0\" encoding=\"utf-8\"\\?>", ""); } catch (final VeraPDFException e) { From c0cce2188c664a1e82e56c179355535303d5e0c9 Mon Sep 17 00:00:00 2001 From: Svante Schubert Date: Mon, 19 Dec 2022 17:20:38 +0100 Subject: [PATCH 2/3] Updating pdfbox to version 2.0.27 --- library/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/pom.xml b/library/pom.xml index 0133dbe3..abe9417a 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -73,12 +73,12 @@ org.apache.pdfbox preflight - 2.0.24 + 2.0.27 org.apache.pdfbox pdfbox - 2.0.24 + 2.0.27 org.dom4j From 92af95d90f72f42ce9890351fd9881fc6096634d Mon Sep 17 00:00:00 2001 From: Svante Schubert Date: Mon, 19 Dec 2022 17:28:34 +0100 Subject: [PATCH 3/3] Adjusting JUnit tests to Jupiter API --- .../src/test/java/org/mustangproject/commandline/CliIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mustang-CLI/src/test/java/org/mustangproject/commandline/CliIT.java b/Mustang-CLI/src/test/java/org/mustangproject/commandline/CliIT.java index 43a1a2d1..73c35cd0 100644 --- a/Mustang-CLI/src/test/java/org/mustangproject/commandline/CliIT.java +++ b/Mustang-CLI/src/test/java/org/mustangproject/commandline/CliIT.java @@ -1,7 +1,5 @@ package org.mustangproject.commandline; -import org.junit.Test; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -11,7 +9,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; public class CliIT {