upgraded ph-schematron

History.md

@@ -6,6 +6,7 @@
 - zugferdimporter to accept xml files
 - UBL importer to also parse contacts
 - https://github.com/ZUGFeRD/mustangproject/pull/369
+- upgrade ph-scematron from 6.3.3 to 8
 
 2.10.0
 =======

validator/pom.xml

@@ -53,6 +53,17 @@
             <version>2.1.3</version>
         </dependency>
         <!-- for ph-schematron -->
+        <dependency>
+            <groupId>com.helger.commons</groupId>
+            <artifactId>ph-commons</artifactId>
+            <version>11.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        <!-- /for ph-schematron -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
@@ -88,7 +99,7 @@
         <dependency>
             <groupId>com.helger.schematron</groupId>
             <artifactId>ph-schematron-xslt</artifactId>
-            <version>6.3.3</version>
+            <version>8.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.helger</groupId>

validator/src/main/java/org/mustangproject/validator/XMLValidator.java

@@ -273,15 +273,20 @@ public void validate() throws IrrecoverableValidationError {
 					LOGGER.debug("UBL");
 					validateSchema(zfXML.getBytes(StandardCharsets.UTF_8), "UBL_21/maindoc/UBL-Invoice-2.1.xsd", 18, EPart.fx);
 					xsltFilename = "/xslt/UBL_21/EN16931-UBL-validation.xsl";
+					validateSchematron(zfXML, xsltFilename, 24, ESeverity.error);
 
 					if (isXRechnung) {
-						LOGGER.debug("is XRechnung");
 						/*
 						the validation against the XRechnung Schematron will happen below but a
 						XRechnung is a EN16931 subset so the validation vis a vis FACTUR-X_EN16931.xslt=schematron also has to pass
 						* */
 						//validateSchema(zfXML.getBytes(StandardCharsets.UTF_8), "ZF_211/EN16931/FACTUR-X_EN16931.xsd", 18, EPart.fx);
-						xsltFilename = "/xslt/XR_30/XRechnung-UBL-validation.xslt";
+						String xrVersion=context.getProfile().substring(context.getProfile().length()-3).replace(".","");
+						if (!xrVersion.equals("12")&&!xrVersion.equals("20")&&!xrVersion.equals("21")&&!xrVersion.equals("22")&&!xrVersion.equals("23")&&!xrVersion.equals("30")) {
+							throw new Exception("Unsupported XR version");
+						}
+						LOGGER.debug("is XRechnung v"+xrVersion);
+						xsltFilename = "/xslt/XR_"+xrVersion+"/XRechnung-UBL-validation.xslt";
 						XrechnungSeverity = ESeverity.error;
 
 					}