From 48c5c8b5cbc153067bd0e734530408509e0af282 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Mon, 16 Mar 2026 21:13:44 +0100 Subject: [PATCH] Updated to Java 17 + version bumps --- Mustang-CLI/pom.xml | 8 ++-- library/pom.xml | 14 +++++-- .../java/org/mustangproject/CII/CIIToUBL.java | 2 +- .../ZUGFeRD/ZUGFeRDVisualizer.java | 2 +- pom.xml | 39 ++++++++++--------- validator/pom.xml | 10 ++--- .../validator/PDFValidator.java | 6 +-- .../validator/ZUGFeRDValidator.java | 4 +- 8 files changed, 46 insertions(+), 39 deletions(-) diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml index 14c1649b..703b33d1 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -13,7 +13,7 @@ jar UTF-8 - 11 + ${java.version} @@ -118,8 +118,8 @@ - 11 - 11 + ${java.version} + ${java.version} @@ -209,7 +209,7 @@ - 11 + ${java.version} adopt diff --git a/library/pom.xml b/library/pom.xml index 88de56f6..3476064a 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -44,7 +44,7 @@ github -Xdoclint:none - 11 + ${java.version} true @@ -149,6 +149,12 @@ ${version.org.glassfish.jaxb} test + + org.slf4j + slf4j-simple + ${version.org.slf4j} + test + @@ -169,8 +175,8 @@ - 11 - 11 + ${java.version} + ${java.version} @@ -331,7 +337,7 @@ - 11 + ${java.version} adopt diff --git a/library/src/main/java/org/mustangproject/CII/CIIToUBL.java b/library/src/main/java/org/mustangproject/CII/CIIToUBL.java index 816f6992..8480e81b 100644 --- a/library/src/main/java/org/mustangproject/CII/CIIToUBL.java +++ b/library/src/main/java/org/mustangproject/CII/CIIToUBL.java @@ -3,7 +3,7 @@ package org.mustangproject.CII; import java.io.File; import java.io.Serializable; -import com.helger.commons.error.list.ErrorList; +import com.helger.diagnostics.error.list.ErrorList; import com.helger.en16931.cii2ubl.CIIToUBL23Converter; import com.helger.ubl23.UBL23Marshaller; diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java index cf9551aa..357a3b87 100644 --- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java +++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java @@ -20,7 +20,7 @@ */ package org.mustangproject.ZUGFeRD; -import com.helger.commons.io.stream.StreamHelper; +import com.helger.base.io.stream.StreamHelper; import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.io.IOUtils; diff --git a/pom.xml b/pom.xml index f7db1beb..ace43ed3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,8 @@ github -Xdoclint:none - 11 + 17 + 17 true @@ -47,20 +48,20 @@ First the versions for plugins, then those for libraries. --> - 3.13.0 - 3.0.0-M1 - 1.6 - 3.4.2 - 3.0.1 - 2.5.3 - 3.1.0 - 3.5.3 - 3.3.1 - 3.5.3 - 3.1.0 - 1.9.5 + 3.15.0 + 3.1.4 + 3.2.8 + 3.5.0 + 3.12.0 + 3.3.1 + 3.5.0 + 3.6.1 + 3.4.0 + 3.5.5 + 3.2.0 + 2.2.1 1.0.0 - 8.0.0 + 9.1.1 1.7.0 1.5.18 @@ -74,13 +75,13 @@ 3.0.7 2.11 3.1.12 - 2.1.5 - 4.0.5 + 2.2.0 + 4.0.7 5.13.4 2.0-rc1 2.0.17 - 1.26.5 - 2.10.3 + 1.28.2 + 2.11.0 @@ -244,7 +245,7 @@ - 11 + 17 adopt diff --git a/validator/pom.xml b/validator/pom.xml index 649d85ec..1e465b8a 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -26,7 +26,7 @@ UTF-8 false - 11 + ${java.version} @@ -141,8 +141,8 @@ - 11 - 11 + ${java.version} + ${java.version} @@ -273,7 +273,7 @@ - 11 + ${java.version} adopt @@ -293,7 +293,7 @@ com.helger.maven ph-schematron-maven-plugin - ${version.com.helger.maven} + ${version.com.helger.maven.schematron} ${basedir}/src/main/resources/schematron ${basedir}/src/main/resources/xslt diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java index 08d0906f..15e480e1 100644 --- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java @@ -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\"\\?>", "" ); @@ -324,11 +324,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( diff --git a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java index e6a319a4..f71b79dd 100644 --- a/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java @@ -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;