From 0ad5b1c092d0757a17bb95385e18fb253cbe4fb8 Mon Sep 17 00:00:00 2001 From: David M Date: Sat, 14 Sep 2024 14:30:53 +0200 Subject: [PATCH] More cleanup --- Mustang-CLI/pom.xml | 9 +- library/pom.xml | 23 +-- pom.xml | 457 ++++++++++++++++++++++++++------------------ validator/pom.xml | 17 +- 4 files changed, 284 insertions(+), 222 deletions(-) diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml index 5147b159..fcdbd58b 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -12,7 +12,7 @@ E-Invoice commandline tool - E-invoices commandline tool, allowing to create(embed), split and validate Factur-X/ZUGFeRD files. Validation + E-invoices commandline tool, allowing to create(embed), split and validate Factur-X/ZUGFeRD files. Validation should also work for XRechnung/CII. @@ -26,12 +26,9 @@ ${project.version} - - commons-cli commons-cli - ${dep.commons-cli.version} @@ -40,9 +37,9 @@ - org.xmlunit + org.xmlunit xmlunit-core - compile + compile diff --git a/library/pom.xml b/library/pom.xml index 663003d3..a2155be0 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -13,7 +13,7 @@ Mustang Library to r/w e-invoices - FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT + FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT Cross Industry Invoice based formats Factur-X/ZUGFeRD, XRechnung and Order-X in your invoice PDFs. @@ -26,75 +26,54 @@ slf4j-api - net.sf.saxon Saxon-HE - ${dep.saxon-he.version} - com.fasterxml.jackson.core jackson-databind - ${dep.jackson.version} - org.apache.xmlgraphics fop - ${dep.apache.fop.version} - - - xml-apis - xml-apis - - jakarta.xml.bind jakarta.xml.bind-api - ${dep.jakarta.xml-bind.version} org.eclipse.angus angus-activation - ${dep.angus.version} org.apache.pdfbox preflight - ${dep.pdfbox.version} org.apache.pdfbox pdfbox - ${dep.pdfbox.version} org.dom4j dom4j - ${dep.dom4j.version} - com.helger en16931-cii2ubl - ${dep.en16931-cii2ubl.version} - org.glassfish.jaxb jaxb-runtime - ${dep.jaxb-runtime.version} diff --git a/pom.xml b/pom.xml index d1d680f8..95c61128 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Mustang - The Mustang project is a java library to read and write ZUGFeRD + The Mustang project is a java library to read and write ZUGFeRD meta data inside your invoice PDFs @@ -28,21 +28,35 @@ 11 2.0.13 - 12.4 + 12.5 2.17.1 2.9 4.0.2 2.0.2 - 3.0.2 + 3.0.3 2.1.4 2.2.4 4.0.5 - 5.10.2 + 5.11.0 2.10.0 1.9.0 1.26.1 - 8.0.0 + 8.0.3 + + 3.13.0 + 3.3.1 + 3.1.1 + 3.8.0 + 3.1.2 + 1.7.0 + 3.3.1 + 3.3.1 + 3.4.2 + 3.5.3 + 3.0.0 + 3.2.4 + 2.1.0 @@ -99,10 +113,10 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 + + org.apache.maven.plugins + maven-compiler-plugin + ${mvn.maven-compiler-plugin.version} compile @@ -114,18 +128,18 @@ - + - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - + + org.apache.maven.plugins + maven-resources-plugin + ${mvn.maven-resources-plugin.version} + + org.apache.maven.plugins maven-release-plugin - 3.1.1 + ${mvn.maven-release-plugin.version} true false @@ -136,75 +150,72 @@ org.apache.maven.scm maven-scm-provider-gitexe - 2.1.0 + ${mvn.dep.maven-scm-provider-gitexe.version} - org.apache.maven.plugins - maven-javadoc-plugin - 3.8.0 - - org.mustangproject.ZUGFeRD.model.* - - - - - maven-deploy-plugin - 3.1.2 - - internal.repo::default::file://${project.build.directory}/mvn-repo - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.3.1 - - alphabetical - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.4.2 + org.apache.maven.plugins + maven-javadoc-plugin + ${mvn.maven-javadoc-plugin.version} - - - true - true - - - + org.mustangproject.ZUGFeRD.model.* + + + + + maven-deploy-plugin + ${mvn.maven-deploy-plugin.version} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${mvn.nexus-staging-maven-plugin.version} + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${mvn.maven-surefire-plugin.version} + + alphabetical + + + + + org.apache.maven.plugins + maven-source-plugin + ${mvn.maven-source-plugin.version} + + + attach-sources + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${mvn.maven-jar-plugin.version} + + + + true + true + + + @@ -212,126 +223,204 @@ - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.3 - - false - - - *:* - - LICENSE - NOTICE - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - commons-logging:commons-logging - - ** - - - - - - - - shade - - package - - - - - - - - + - - org.codehaus.mojo - templating-maven-plugin - 3.0.0 - - - filtering-java-templates - - filter-sources - - - - + + org.apache.maven.plugins + maven-shade-plugin + ${mvn.maven-shade-plugin.version} + + false + + + *:* + + LICENSE + NOTICE + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + commons-logging:commons-logging + + ** + + + + + + + + shade + + package + + + + + + + + + + + org.codehaus.mojo + templating-maven-plugin + ${mvn.templating-maven-plugin.version} + + + filtering-java-templates + + filter-sources + + + + - - org.codehaus.mojo - templating-maven-plugin - + + org.codehaus.mojo + templating-maven-plugin + - - - org.slf4j - slf4j-api - ${dep.slf4j.version} - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${dep.jakarta.xml-bind.version} - + + + org.slf4j + slf4j-api + ${dep.slf4j.version} + - - org.junit.jupiter - junit-jupiter-api - ${dep.junit5.version} - test - + + jakarta.xml.bind + jakarta.xml.bind-api + ${dep.jakarta.xml-bind.version} + - - org.junit.vintage - junit-vintage-engine - ${dep.junit5.version} - test - - - - org.xmlunit - xmlunit-core - ${dep.xmlunit.version} - test - + + commons-cli + commons-cli + ${dep.commons-cli.version} + - - org.xmlunit - xmlunit-assertj - ${dep.xmlunit.version} - test - + + net.sf.saxon + Saxon-HE + ${dep.saxon-he.version} + - - org.slf4j - slf4j-simple - ${dep.slf4j.version} - test - + + com.fasterxml.jackson.core + jackson-databind + ${dep.jackson.version} + - + + org.apache.xmlgraphics + fop + ${dep.apache.fop.version} + + + xml-apis + xml-apis + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + ${dep.jakarta.xml-bind.version} + + + + org.eclipse.angus + angus-activation + ${dep.angus.version} + + + + org.apache.pdfbox + preflight + ${dep.pdfbox.version} + + + + org.apache.pdfbox + pdfbox + ${dep.pdfbox.version} + + + + org.dom4j + dom4j + ${dep.dom4j.version} + + + + com.helger + en16931-cii2ubl + ${dep.en16931-cii2ubl.version} + + + + org.verapdf + validation-model-jakarta + ${dep.verapdf.validation-model-jakarta.version} + + + + com.helger.schematron + ph-schematron-xslt + ${dep.ph-schematron-xslt.version} + + + + org.junit.jupiter + junit-jupiter-api + ${dep.junit5.version} + test + + + + org.junit.vintage + junit-vintage-engine + ${dep.junit5.version} + test + + + + org.xmlunit + xmlunit-core + ${dep.xmlunit.version} + test + + + + org.xmlunit + xmlunit-assertj + ${dep.xmlunit.version} + test + + + + org.slf4j + slf4j-simple + ${dep.slf4j.version} + test + + + - + release-sign-artifacts @@ -345,7 +434,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + ${mvn.maven-gpg-plugin.version} sign-artifacts diff --git a/validator/pom.xml b/validator/pom.xml index 8f2bdcf4..2ac3e8be 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -11,11 +11,11 @@ jar E-Invoices Validator - - - Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung - - + + + Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung + + @@ -33,14 +33,11 @@ org.verapdf validation-model-jakarta - ${dep.verapdf.validation-model-jakarta.version} - com.helger.schematron ph-schematron-xslt - ${dep.ph-schematron-xslt.version} @@ -120,8 +117,8 @@ + required if there actually is a change in the schematron, + invoke manually with commandline -P generateXSLTFromSchematron on demand --> generateXSLTFromSchematron false