From 31c2257c54fa1fd2f533f91ee6b8731889b76336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20Bergst=C3=B8l?= Date: Tue, 13 Aug 2024 21:06:04 +0200 Subject: [PATCH] Update phive dependencies for peppol validation of the May 2025 rules --- pom.xml | 25 ++++++++++--------- validation/NOTICE | 7 +++--- validation/pom.xml | 15 +++++++---- .../DefaultPeppolBilling3Validation.java | 18 ++++++------- 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index cf7c3de..57d133c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ UTF-8 11 11 + 11 @@ -41,7 +42,7 @@ org.junit junit-bom - 5.5.2 + 5.10.3 pom import @@ -53,12 +54,12 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.16 org.hamcrest hamcrest - 2.2-rc1 + 3.0 test @@ -97,7 +98,7 @@ maven-surefire-plugin - 3.0.0-M3 + 3.3.1 -Djava.util.logging.config.file=/logging.properties @@ -119,21 +120,21 @@ maven-install-plugin - 3.0.0-M1 + 3.1.1 maven-deploy-plugin - 3.0.0-M1 + 3.1.2 org.codehaus.mojo versions-maven-plugin - 2.7 + 2.17.1 org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.3.0 com.github.siom79.japicmp @@ -159,7 +160,7 @@ maven-compiler-plugin - 3.8.1 + 3.13.0 ${maven.compiler.source} ${maven.compiler.target} @@ -167,7 +168,7 @@ maven-dependency-plugin - 3.1.2 + 3.7.1 @@ -217,8 +218,8 @@ org.jasig.maven - maven-notice-plugin - 1.1.0 + notice-maven-plugin + 2.0.0 true diff --git a/validation/NOTICE b/validation/NOTICE index 2ad3a6d..c783560 100644 --- a/validation/NOTICE +++ b/validation/NOTICE @@ -18,13 +18,14 @@ This project includes: Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0 Eaxy Easy XML library under The Apache Licence, version 2.0 FindBugs-jsr305 under The Apache Software License, Version 2.0 - Jakarta Activation API jar under EDL 1.0 + Jakarta Activation API under EDL 1.0 Jakarta XML Binding API under Eclipse Distribution License - v 1.0 jsr305 under GNU Lesser Public License peppol-bis-billing-3-generator-domain under Apache License, Version 2.0 peppol-bis-billing-3-generator-validation under Apache License, Version 2.0 ph-cii-d16b under Apache 2 ph-commons under Apache 2 + ph-diver-api under Apache 2 ph-jaxb under Apache 2 ph-jaxb-adapter under Apache 2 ph-schematron-api under Apache 2 @@ -32,6 +33,7 @@ This project includes: ph-schematron-schxslt under Apache 2 ph-schematron-xslt under Apache 2 ph-ubl21 under Apache 2 + ph-ubl23 under Apache 2 ph-xml under Apache 2 ph-xsds-ccts-cct-schemamodule under Apache 2 ph-xsds-xades132 under Apache 2 @@ -39,11 +41,10 @@ This project includes: ph-xsds-xml under Apache 2 ph-xsds-xmldsig under Apache 2 phive-api under Apache 2 - phive-engine under Apache 2 phive-rules-peppol under Apache 2 + phive-xml under Apache 2 Saxon-HE under Mozilla Public License Version 2.0 SchXslt Core under MIT License SLF4J API Module under MIT License - XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License XML Resolver under Apache License version 2.0 diff --git a/validation/pom.xml b/validation/pom.xml index 868e54f..07f79c3 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -21,23 +21,28 @@ com.helger.commons ph-commons - 11.0.1 + 11.1.6 com.helger.phive.rules phive-rules-peppol - 2.1.18 + 3.1.12 compile + + com.helger.diver + ph-diver-api + 1.2.0 + com.helger.phive - phive-engine - 7.2.4 + phive-xml + 9.2.2 com.helger.phive phive-api - 7.2.4 + 9.2.2 org.eaxy diff --git a/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java b/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java index c6afa35..9a67315 100644 --- a/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java +++ b/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java @@ -17,16 +17,16 @@ import com.helger.commons.error.list.ErrorList; import com.helger.commons.io.resource.inmemory.ReadableResourceString; +import com.helger.diver.api.version.VESID; import com.helger.phive.api.execute.ValidationExecutionManager; import com.helger.phive.api.executorset.IValidationExecutorSet; -import com.helger.phive.api.executorset.VESID; +import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.api.executorset.ValidationExecutorSetRegistry; import com.helger.phive.api.result.ValidationResultList; -import com.helger.phive.engine.source.IValidationSourceXML; -import com.helger.phive.engine.source.ValidationSourceXML; import com.helger.phive.peppol.PeppolValidation; -import com.helger.phive.peppol.PeppolValidation3_14_0; -import com.helger.phive.peppol.PeppolValidation3_15_0; +import com.helger.phive.peppol.PeppolValidation2024_05; +import com.helger.phive.xml.source.IValidationSourceXML; +import com.helger.phive.xml.source.ValidationSourceXML; import org.eaxy.Document; import peppol.bis.invoice3.domain.BillingCommon; import peppol.bis.invoice3.domain.CreditNote; @@ -41,15 +41,15 @@ public class DefaultPeppolBilling3Validation implements PeppolBilling3Validation { - private static ValidationExecutorSetRegistry validationExecutorSetRegistry; + private static IValidationExecutorSetRegistry validationExecutorSetRegistry; private static VESID vesid_invoice; private static VESID vesid_creditNote; { if (vesid_invoice == null) - DefaultPeppolBilling3Validation.setVesid_invoice(PeppolValidation3_15_0.VID_OPENPEPPOL_INVOICE_UBL_V3); + DefaultPeppolBilling3Validation.setVesid_invoice(PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3); if (vesid_creditNote == null) - DefaultPeppolBilling3Validation.setVesid_creditNote(PeppolValidation3_15_0.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3); + DefaultPeppolBilling3Validation.setVesid_creditNote(PeppolValidation2024_05.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3); } @Override @@ -86,7 +86,7 @@ public ValidationResult isValid(Document billingDocument) { private ValidationResult doValidation(IValidationExecutorSet aVES, String s) { // Shortcut introduced in v6 - final ValidationSourceXML validationSourceXML = ValidationSourceXML.create(new ReadableResourceString(s, StandardCharsets.UTF_8)); + final IValidationSourceXML validationSourceXML = ValidationSourceXML.create(new ReadableResourceString(s, StandardCharsets.UTF_8)); final ValidationResultList vResult = ValidationExecutionManager.executeValidation(aVES, validationSourceXML); if (vResult.containsAtLeastOneError()) {