louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1067 from phax/java17-base

Browse Source 
Set Java 17 as base + dependency updates + test fix
This commit is contained in:
Jochen Staerk
2026-05-07 13:22:43 +02:00
committed by GitHub
parent d8313dae20 51a216bb94
commit f6b6c0a36e
15 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
validator/pom.xml
View File

@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>false</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>${java.version}</maven.compiler.release>
</properties>
<dependencies>
<!-- compile dependencies -->
@@ -141,8 +141,8 @@
<!-- http://stackoverflow.com/questions/574594/how-can-i-create-an-executable-jar-with-dependencies-using-maven
mvn clean compile assembly:single -->
<!-- or whatever version you use -->
<source>11</source>
<target>11</target>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<!-- /ZUV -->
@@ -273,7 +273,7 @@
<configuration>
<toolchains>
<jdk>
<version>11</version>
<version>${java.version}</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>
@@ -293,7 +293,7 @@
<plugin>
<groupId>com.helger.maven</groupId>
<artifactId>ph-schematron-maven-plugin</artifactId>
<version>${version.com.helger.maven}</version>
<version>${version.com.helger.maven.schematron}</version>
<configuration>
<schematronDirectory>${basedir}/src/main/resources/schematron</schematronDirectory>
<xsltDirectory>${basedir}/src/main/resources/xslt</xsltDirectory>

6
validator/src/main/java/org/mustangproject/validator/PDFValidator.java
View File

@@ -113,7 +113,7 @@ public class PDFValidator extends Validator {
ItemDetails itemDetails = ItemDetails.fromValues(pdfFilename);
inputStream.mark(Integer.MAX_VALUE);
processorResult = processor.process(itemDetails, inputStream);
pdfReport = processorResult.getValidationResult().toString().replaceAll(
pdfReport = processorResult.getValidationResults().get(0).toString().replaceAll(
"<\\?xml version=\"1\\.0\" encoding=\"utf-8\"\\?>",
""
);
@@ -330,11 +330,11 @@ public class PDFValidator extends Validator {
//end
final long endTime = Calendar.getInstance().getTimeInMillis();
if (!processorResult.getValidationResult().isCompliant()) {
if (!processorResult.getValidationResults().get (0).isCompliant()) {
context.setInvalid();
}
PDFAFlavour pdfaFlavourFromValidationResult = processorResult.getValidationResult().getPDFAFlavour();
PDFAFlavour pdfaFlavourFromValidationResult = processorResult.getValidationResults().get (0).getPDFAFlavour();
if (Arrays.stream(PDF_A_3_FLAVOURS)
.noneMatch(pdfaFlavourFromValidationResult::equals)) {
context.addResultItem(

4
validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
View File

@@ -24,15 +24,15 @@ import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.mustangproject.util.ByteArraySearcher;
import org.mustangproject.XMLTools;
import org.mustangproject.util.ByteArraySearcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.base.io.stream.StreamHelper;
import jakarta.xml.bind.DatatypeConverter;