diff --git a/History.md b/History.md index 3ea46c77..2c1e73f2 100644 --- a/History.md +++ b/History.md @@ -4,6 +4,7 @@ - #790 - upgrade from PDFBOX 3.0.2 to 3.0.5 - #817 +- #833 2.16.4 ======= diff --git a/validator/pom.xml b/validator/pom.xml index b98368ef..bce750a1 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -230,10 +230,10 @@ - src/main/resources/xslt/ZF_232/ + src/main/resources/xslt/ZF_233/ - ${basedir}/src/main/resources/schematron/ZF_232/ + ${basedir}/src/main/resources/schematron/ZF_233/ **/*.xml diff --git a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java index cf911dc6..9202b91f 100644 --- a/validator/src/main/java/org/mustangproject/validator/XMLValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/XMLValidator.java @@ -205,7 +205,7 @@ public class XMLValidator extends Validator { boolean isEN16931 = false; boolean isExtended = false; boolean isXRechnung = false; - String currentZFVersionDir = "ZF_232"; + String currentZFVersionDir = "ZF_233"; int mainSchematronSectionErrorTypeCode = 4; String xsltFilename = null; // urn:ferd:CrossIndustryDocument:invoice:1p0:extended, diff --git a/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931.xsd rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED.xsd rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM.xsd rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM.xsd diff --git a/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from validator/src/main/resources/schema/ZF_232/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to validator/src/main/resources/schema/ZF_233/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL.sch rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL.sch diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC-WL_codedb.xml rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC-WL_codedb.xml diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC.sch rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC.sch diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_BASIC_codedb.xml rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_BASIC_codedb.xml diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931.sch rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931.sch diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EN16931_codedb.xml rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EN16931_codedb.xml diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED.sch rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED.sch diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_EXTENDED_codedb.xml rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_EXTENDED_codedb.xml diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM.sch rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM.sch diff --git a/validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml b/validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml similarity index 100% rename from validator/src/main/resources/schematron/ZF_232/FACTUR-X_MINIMUM_codedb.xml rename to validator/src/main/resources/schematron/ZF_233/FACTUR-X_MINIMUM_codedb.xml