From 0006e5c5f364058b19e3587f7be5d5abfcece1f0 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 8 Oct 2024 17:18:16 +0200 Subject: [PATCH 1/5] Updated to 1.3.13 --- .travis.yml | 12 ------------ README.md | 4 +++- pom-license.xml | 4 ++-- pom-preprocess.xml | 8 ++++---- pom-validate.xml | 6 +++--- pom-xslt-preprocessed.xml | 8 ++++---- pom-xslt.xml | 8 ++++---- run-tests-cii.cmd | 2 +- run-tests-ubl.cmd | 2 +- update-xslt-and-validate.cmd | 2 +- update-xslt-and-validate.sh | 4 ++-- 11 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2a7c5c87..00000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: required - -services: - - docker - -env: - - PERFORM=cii - - PERFORM=ubl - -script: - - docker run --rm -it -v $(pwd):/src difi/vefa-validator build -x -t -p $PERFORM /src - diff --git a/README.md b/README.md index e9f44ef2..c744fe9f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Official Schematron eInvoicing-EN16931 artefacts for CEN/TC 434. This repository does not contain eInvoicing-EN16931 rules for any CIUS. Latest release - * UBL & CII: **v1.3.12** (2024-04-10) - [https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.12](https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.12) + * UBL & CII: **v1.3.13** (2024-10-08) - [https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.13](https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/validation-1.3.13) * EDIFACT: **v1.0.0** (2018-02-08) - https://github.com/ConnectingEurope/eInvoicing-EN16931/releases/tag/eInvoicing-EN16931-1.0.0 For each syntax a separate folder exists where all related artefacts are to be published. @@ -31,6 +31,8 @@ That was Licensed under the Apache License, Version 2.0 # News and noteworthy +* v1.3.13 - 2024-10-08 (UBL and CII only) + * See all fixed issues: https://github.com/ConnectingEurope/eInvoicing-EN16931/issues?q=is%3Aissue+is%3Aclosed+milestone%3A1.3.13 * v1.3.12 - 2024-04-10 (UBL and CII only) * See all fixed issues: https://github.com/ConnectingEurope/eInvoicing-EN16931/issues?q=is%3Aissue+is%3Aclosed+milestone%3A1.3.12 * v1.3.11 - 2023-10-04 (UBL and CII only) diff --git a/pom-license.xml b/pom-license.xml index 7eddfff7..b6f90189 100644 --- a/pom-license.xml +++ b/pom-license.xml @@ -12,14 +12,14 @@ 2.0.6 centc434-validation-rules - 1.3.12 + 1.3.13 centc434-validation-rules EN16931 validation rules https://github.com/ConnectingEurope/eInvoicing-EN16931 2016 - EUPL V2 + EUPL V1.2 https://eupl.eu/1.2/en/ repo diff --git a/pom-preprocess.xml b/pom-preprocess.xml index 55f9b368..0f1bdeb6 100644 --- a/pom-preprocess.xml +++ b/pom-preprocess.xml @@ -12,15 +12,15 @@ 2.0.6 centc434-validation-rules - 1.3.12 + 1.3.13 centc434-validation-rules EN16931 - CEN/TC 434 validation rules https://github.com/CenPC434/validation 2016 - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 + EUPL V1.2 + https://eupl.eu/1.2/en/ repo @@ -71,7 +71,7 @@ false false false - Schematron version 1.3.12 - Last update: 2024-04-06 + Schematron version 1.3.13 - Last update: 2024-10-08 diff --git a/pom-validate.xml b/pom-validate.xml index 074b9a60..a0a13a2b 100644 --- a/pom-validate.xml +++ b/pom-validate.xml @@ -12,15 +12,15 @@ 2.0.6 centc434-validation-rules - 1.3.12 + 1.3.13 centc434-validation-rules EN16931 - CEN/TC 434 validation rules https://github.com/CenPC434/validation 2016 - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 + EUPL V1.2 + https://eupl.eu/1.2/en/ repo diff --git a/pom-xslt-preprocessed.xml b/pom-xslt-preprocessed.xml index 352366d0..e7f830b6 100644 --- a/pom-xslt-preprocessed.xml +++ b/pom-xslt-preprocessed.xml @@ -12,15 +12,15 @@ 2.0.6 centc434-validation-rules - 1.3.12 + 1.3.13 centc434-validation-rules EN16931 - CEN/TC 434 validation rules https://github.com/CenPC434/validation 2016 - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 + EUPL V1.2 + https://eupl.eu/1.2/en/ repo @@ -58,7 +58,7 @@ *.sch - Schematron version 1.3.12 - Last update: 2024-04-06 + Schematron version 1.3.13 - Last update: 2024-10-08 true diff --git a/pom-xslt.xml b/pom-xslt.xml index 7eb0b2b0..04d056ff 100644 --- a/pom-xslt.xml +++ b/pom-xslt.xml @@ -12,15 +12,15 @@ 2.0.6 centc434-validation-rules - 1.3.12 + 1.3.13 centc434-validation-rules EN16931 - CEN/TC 434 validation rules https://github.com/CenPC434/validation 2016 - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 + EUPL V1.2 + https://eupl.eu/1.2/en/ repo @@ -70,7 +70,7 @@ *.sch - Schematron version 1.3.12 - Last update: 2024-04-06 + Schematron version 1.3.13 - Last update: 2024-10-08 true diff --git a/run-tests-cii.cmd b/run-tests-cii.cmd index 77da6e3b..86607ee4 100644 --- a/run-tests-cii.cmd +++ b/run-tests-cii.cmd @@ -1,7 +1,7 @@ @echo off echo running CII tests -docker run --rm --pull -it -v %CD%:/src difi/vefa-validator build -x -t -p cii /src +docker run --rm --pull -it -v %CD%:/src phelger/vefa-validator build -x -t -p cii /src if errorlevel 1 goto error goto end diff --git a/run-tests-ubl.cmd b/run-tests-ubl.cmd index 7ffd158f..86bffe8c 100644 --- a/run-tests-ubl.cmd +++ b/run-tests-ubl.cmd @@ -1,7 +1,7 @@ @echo off echo running UBL tests -docker run --rm --pull -it -v %CD%:/src difi/vefa-validator build -x -t -p ubl /src +docker run --rm --pull -it -v %CD%:/src phelger/vefa-validator build -x -t -p ubl /src if errorlevel 1 goto error goto end diff --git a/update-xslt-and-validate.cmd b/update-xslt-and-validate.cmd index bb03495b..41e84c19 100644 --- a/update-xslt-and-validate.cmd +++ b/update-xslt-and-validate.cmd @@ -5,7 +5,7 @@ call mvn -f pom-preprocess.xml generate-resources if errorlevel 1 goto error rem convert to XSLT - takes forever -call mvn -f pom-xslt.xml process-resources +call mvn -f pom-xslt-preprocessed.xml process-resources if errorlevel 1 goto error rem Add license headers to all relevant files diff --git a/update-xslt-and-validate.sh b/update-xslt-and-validate.sh index 27b0a386..d7d2ae77 100644 --- a/update-xslt-and-validate.sh +++ b/update-xslt-and-validate.sh @@ -5,8 +5,8 @@ export PATH=/opt/apache-maven-3.6.2/bin:$PATH # preprocess first - catches errors quicker mvn -f pom-preprocess.xml generate-resources || exit 1 -# convert to XSLT - takes forever -mvn -f pom-xslt.xml process-resources || exit 1 +# convert to XSLT +mvn -f pom-xslt-preprocessed.xml process-resources || exit 1 # Add license headers to all relevant files mvn -f pom-license.xml license:format || exit 1 From f1059989bbbf7965f8e7d9825973ce35d2d32eb3 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 8 Oct 2024 17:31:55 +0200 Subject: [PATCH 2/5] Updated the scrripts --- .../EN16931-CII-validation-preprocessed.sch | 3 ++- cii/xslt/EN16931-CII-validation.xslt | 24 +++++++++---------- .../EN16931-UBL-validation-preprocessed.sch | 3 ++- ubl/xslt/EN16931-UBL-validation.xslt | 16 ++++++------- update-xslt-and-validate.cmd | 9 +++++++ update-xslt-and-validate.sh | 6 +++++ 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/cii/schematron/preprocessed/EN16931-CII-validation-preprocessed.sch b/cii/schematron/preprocessed/EN16931-CII-validation-preprocessed.sch index bf61312c..91a34f5c 100644 --- a/cii/schematron/preprocessed/EN16931-CII-validation-preprocessed.sch +++ b/cii/schematron/preprocessed/EN16931-CII-validation-preprocessed.sch @@ -4,7 +4,8 @@ Licensed under European Union Public Licence (EUPL) version 1.2. --> - + + EN16931 model bound to CII diff --git a/cii/xslt/EN16931-CII-validation.xslt b/cii/xslt/EN16931-CII-validation.xslt index 208a12d2..4c117071 100644 --- a/cii/xslt/EN16931-CII-validation.xslt +++ b/cii/xslt/EN16931-CII-validation.xslt @@ -4,7 +4,7 @@ Licensed under European Union Public Licence (EUPL) version 1.2. --> - + @@ -681,7 +681,7 @@ - + BR-CO-12 @@ -1929,7 +1929,7 @@ - + BR-CO-14 @@ -7001,8 +7001,8 @@ - - + + @@ -7906,9 +7906,9 @@ - + - + CII-SR-282 warning @@ -10621,7 +10621,7 @@ - CII-DT-001 + CII-DT-0010 fatal @@ -10636,7 +10636,7 @@ - CII-DT-002 + CII-DT-0020 fatal @@ -10651,7 +10651,7 @@ - CII-DT-003 + CII-DT-0030 fatal @@ -10666,7 +10666,7 @@ - CII-DT-004 + CII-DT-0040 fatal @@ -10837,7 +10837,7 @@ - + CII-DT-015 diff --git a/ubl/schematron/preprocessed/EN16931-UBL-validation-preprocessed.sch b/ubl/schematron/preprocessed/EN16931-UBL-validation-preprocessed.sch index d5665145..33a7bc7c 100644 --- a/ubl/schematron/preprocessed/EN16931-UBL-validation-preprocessed.sch +++ b/ubl/schematron/preprocessed/EN16931-UBL-validation-preprocessed.sch @@ -4,7 +4,8 @@ Licensed under European Union Public Licence (EUPL) version 1.2. --> - + + EN16931 model bound to UBL diff --git a/ubl/xslt/EN16931-UBL-validation.xslt b/ubl/xslt/EN16931-UBL-validation.xslt index 467ce4ed..fc243222 100644 --- a/ubl/xslt/EN16931-UBL-validation.xslt +++ b/ubl/xslt/EN16931-UBL-validation.xslt @@ -4,7 +4,7 @@ Licensed under European Union Public Licence (EUPL) version 1.2. --> - + @@ -231,8 +231,8 @@ - - + + @@ -341,7 +341,7 @@ - + BR-31 @@ -2196,8 +2196,8 @@ - - + + @@ -3679,8 +3679,8 @@ - - + + diff --git a/update-xslt-and-validate.cmd b/update-xslt-and-validate.cmd index 41e84c19..b51964c9 100644 --- a/update-xslt-and-validate.cmd +++ b/update-xslt-and-validate.cmd @@ -8,6 +8,15 @@ rem convert to XSLT - takes forever call mvn -f pom-xslt-preprocessed.xml process-resources if errorlevel 1 goto error +rem adopt filenames +del "cii\xslt\EN16931-CII-validation.xslt" +move "cii\xslt\EN16931-CII-validation-preprocessed.xslt" "cii\xslt\EN16931-CII-validation.xslt" +if errorlevel 1 goto error + +del "ubl\xslt\EN16931-UBL-validation.xslt" +move "ubl\xslt\EN16931-UBL-validation-preprocessed.xslt" "ubl\xslt\EN16931-UBL-validation.xslt" +if errorlevel 1 goto error + rem Add license headers to all relevant files call mvn -f pom-license.xml license:format if errorlevel 1 goto error diff --git a/update-xslt-and-validate.sh b/update-xslt-and-validate.sh index d7d2ae77..8143d86d 100644 --- a/update-xslt-and-validate.sh +++ b/update-xslt-and-validate.sh @@ -8,6 +8,12 @@ mvn -f pom-preprocess.xml generate-resources || exit 1 # convert to XSLT mvn -f pom-xslt-preprocessed.xml process-resources || exit 1 +# adopt filenames +rm cii\xslt/EN16931-CII-validation.xslt +mv cii/xslt/EN16931-CII-validation-preprocessed.xslt cii/xslt/EN16931-CII-validation.xslt +rm ubl/xslt/EN16931-UBL-validation.xslt +mv ubl/xslt/EN16931-UBL-validation-preprocessed.xslt ubl/xslt/EN16931-UBL-validation.xslt + # Add license headers to all relevant files mvn -f pom-license.xml license:format || exit 1 From 0467ce7305b06eaa2484e08d3bebbcee312d16e5 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 8 Oct 2024 17:34:23 +0200 Subject: [PATCH 3/5] Updated command --- run-tests-cii.cmd | 2 +- run-tests-ubl.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests-cii.cmd b/run-tests-cii.cmd index 86607ee4..7cf92517 100644 --- a/run-tests-cii.cmd +++ b/run-tests-cii.cmd @@ -1,7 +1,7 @@ @echo off echo running CII tests -docker run --rm --pull -it -v %CD%:/src phelger/vefa-validator build -x -t -p cii /src +docker run --rm --pull always -it -v %CD%:/src phelger/vefa-validator build -x -t -p cii /src if errorlevel 1 goto error goto end diff --git a/run-tests-ubl.cmd b/run-tests-ubl.cmd index 86bffe8c..98e98a07 100644 --- a/run-tests-ubl.cmd +++ b/run-tests-ubl.cmd @@ -1,7 +1,7 @@ @echo off echo running UBL tests -docker run --rm --pull -it -v %CD%:/src phelger/vefa-validator build -x -t -p ubl /src +docker run --rm --pull always -it -v %CD%:/src phelger/vefa-validator build -x -t -p ubl /src if errorlevel 1 goto error goto end From be8d6b0646f19b653e3ae4093ee48fa7ce3adca7 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 8 Oct 2024 17:34:32 +0200 Subject: [PATCH 4/5] Renamed file --- pom-xslt.xml => pom-xslt-old-and-slow.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pom-xslt.xml => pom-xslt-old-and-slow.xml (100%) diff --git a/pom-xslt.xml b/pom-xslt-old-and-slow.xml similarity index 100% rename from pom-xslt.xml rename to pom-xslt-old-and-slow.xml From 5f14da5f327f32af1b5dc83b13a9141b92e61243 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Tue, 8 Oct 2024 17:39:59 +0200 Subject: [PATCH 5/5] Updated scripts --- pom-license.xml | 3 +++ update-xslt-and-validate.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pom-license.xml b/pom-license.xml index b6f90189..4583a0f0 100644 --- a/pom-license.xml +++ b/pom-license.xml @@ -48,6 +48,9 @@ cii/schema/** edifact/examples/** edifact/schema/** + + target-cii/** + target-ubl/** diff --git a/update-xslt-and-validate.sh b/update-xslt-and-validate.sh index 8143d86d..5defdfd3 100644 --- a/update-xslt-and-validate.sh +++ b/update-xslt-and-validate.sh @@ -9,7 +9,7 @@ mvn -f pom-preprocess.xml generate-resources || exit 1 mvn -f pom-xslt-preprocessed.xml process-resources || exit 1 # adopt filenames -rm cii\xslt/EN16931-CII-validation.xslt +rm cii/xslt/EN16931-CII-validation.xslt mv cii/xslt/EN16931-CII-validation-preprocessed.xslt cii/xslt/EN16931-CII-validation.xslt rm ubl/xslt/EN16931-UBL-validation.xslt mv ubl/xslt/EN16931-UBL-validation-preprocessed.xslt ubl/xslt/EN16931-UBL-validation.xslt