From 53ccb09c33173898b1883fd1c6b86e1d7cdbab82 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Mon, 23 Sep 2024 18:32:54 +0200 Subject: [PATCH] rollback of #479 to old pom version --- Mustang-CLI/pom.xml | 225 +++++++++++++++--- library/pom.xml | 279 +++++++++++++++++++--- pom.xml | 548 +++++++++++--------------------------------- validator/pom.xml | 227 ++++++++++++++++-- 4 files changed, 786 insertions(+), 493 deletions(-) diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml index c5795214..cd729e1a 100644 --- a/Mustang-CLI/pom.xml +++ b/Mustang-CLI/pom.xml @@ -1,34 +1,38 @@ - 4.0.0 org.mustangproject core 2.14.0-SNAPSHOT - + 4.0.0 + org.mustangproject Mustang-CLI - jar - 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. - - + + jar + 2.14.0-SNAPSHOT + UTF-8 + 11 + 11 + 11 - - ${project.groupId} + org.mustangproject validator - ${project.version} + 2.14.0-SNAPSHOT + - - + + commons-cli commons-cli + 1.8.0 @@ -40,40 +44,205 @@ org.junit.jupiter junit-jupiter-api + 5.10.2 + test - - - org.xmlunit - xmlunit-core - compile - - - - org.xmlunit - xmlunit-assertj - compile - - org.junit.vintage junit-vintage-engine + 5.10.2 + test + + + org.xmlunit + xmlunit-core + 2.10.0 + + + org.xmlunit + xmlunit-assertj + 2.10.0 + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + alphabetical + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.2 + + + + true + true + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + + true + org.mustangproject.commandline.main + + + + jar-with-dependencies + + + + 11 + 11 + + org.apache.maven.plugins maven-shade-plugin + 3.5.3 org.mustangproject.commandline.Main + false + + + *:* + + LICENSE + NOTICE + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + log4j:log4j + + ** + + + + commons-logging:commons-logging + + ** + + + + com.sun.xml.bind:jaxb-impl + + ** + + + + + + package + + shade + + + + + + + + - + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 11 + adopt + + + + + + + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + Jochen Stärk + jstaerk@usegroup.de + + architect + developer + + + diff --git a/library/pom.xml b/library/pom.xml index 3644353c..feca7184 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -1,113 +1,188 @@ - - 4.0.0 org.mustangproject core 2.14.0-SNAPSHOT + 4.0.0 + org.mustangproject library + 2.14.0-SNAPSHOT jar - Mustang Library to r/w e-invoices - - - FOSS Java library to read, write and validate european electronic invoices and orders in the UN/CEFACT + Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII) + 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. - + http://www.mustangproject.org/ + + scm:git:https://github.com/ZUGFeRD/mustangproject.git + scm:git:https://github.com/ZUGFeRD/mustangproject.git + https://github.com/ZUGFeRD/mustangproject + core-2.3.2 + + + + sonatype-oss-public + https://oss.sonatype.org/content/groups/public/ + + true + + + true + + + + + + internal.repo + Temporary Staging Repository + file://${project.build.directory}/mvn-repo + + - + UTF-8 + github + -Xdoclint:none + + 11 + 11 + 11 + true + + org.slf4j slf4j-api + 2.0.9 - + net.sf.saxon Saxon-HE - - + 12.4 + com.fasterxml.jackson.core jackson-databind + 2.17.1 - + org.apache.xmlgraphics fop + 2.9 + + + xml-apis + xml-apis + + jakarta.xml.bind jakarta.xml.bind-api + 4.0.2 - org.eclipse.angus angus-activation + 2.0.2 org.apache.pdfbox preflight + 3.0.2 - org.apache.pdfbox pdfbox + 3.0.2 - org.dom4j dom4j + 2.1.4 - - - com.helger - en16931-cii2ubl - - - - org.glassfish.jaxb - jaxb-runtime - - org.junit.jupiter junit-jupiter-api + 5.10.2 + test - org.junit.vintage junit-vintage-engine + 5.10.2 + test + + + + + com.helger + en16931-cii2ubl + 2.2.4 + + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 org.xmlunit xmlunit-core + 2.10.0 + test org.xmlunit xmlunit-assertj + 2.10.0 + test - org.slf4j slf4j-simple + 2.0.9 + test - - + + org.apache.maven.plugins + maven-surefire-plugin + + alphabetical + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + jar-with-dependencies + + + + 11 + 11 + + org.apache.maven.plugins maven-jar-plugin + 3.2.0 **/logback.xml @@ -139,8 +214,150 @@ - + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.3 + + true + false + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + log4j:log4j + + ** + + + + commons-logging:commons-logging + + ** + + + + + + + package + + shade + + + + + + + + + + + + + org.codehaus.mojo + templating-maven-plugin + 1.0.0 + + + filtering-java-templates + + filter-sources + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 11 + adopt + + + + + + + + + + + User List + https://groups.google.com/forum/?hl=de#!forum/mustangproject + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + Jochen Stärk + jstaerk@usegroup.de + + architect + developer + + + + Alexander Schmidt + schmidt.alexander@mail.de + + developer + + + diff --git a/pom.xml b/pom.xml index c6b73a81..fb1a86cb 100644 --- a/pom.xml +++ b/pom.xml @@ -2,66 +2,135 @@ 4.0.0 org.mustangproject - 2.14.0-SNAPSHOT - core + 2.14.0-SNAPSHOT pom Mustang - - The Mustang project is a java library to read and write ZUGFeRD - meta data inside your invoice PDFs - - - http://www.mustangproject.org/ - library validator Mustang-CLI - + + Mustangproject is a java library and commandline tool to read, validate, write and convert EN16931 e-invoices, e.g. Factur-X and XRechnung (read and writing CII and reading also UBL). + + http://www.mustangproject.org/ + + scm:git:git://github.com/dexecutor/dependent-tasks-executor.git + scm:git:git@github.com:dexecutor/dexecutor.git + https://github.com/dexecutor/dependent-tasks-executor + core-2.3.2 + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + true + false + forked-path + -Dgpg.passphrase=${gpg.passphrase} + + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.9.5 + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.1 + + + org.mustangproject.ZUGFeRD.model.* + + + + + maven-deploy-plugin + 3.0.0-M1 + + internal.repo::default::file://${project.build.directory}/mvn-repo + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + alphabetical + + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + UTF-8 + + + + attach-javadoc + + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + UTF-8 github -Xdoclint:none + + 11 11 11 - - true - - 2.0.13 - 12.5 - 2.17.1 - 2.9 - 4.0.2 - 2.0.2 - 3.0.3 - 2.1.4 - 2.2.4 - 4.0.5 - 5.11.0 - 2.10.0 - - 1.9.0 - 1.26.1 - 8.0.0 - - 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 + true - + + + + User List + https://groups.google.com/forum/?hl=de#!forum/mustangproject + + Apache-2.0 @@ -70,7 +139,6 @@ A business-friendly OSS license - Jochen Stärk @@ -88,383 +156,25 @@ - - - - User List - https://groups.google.com/forum/?hl=de#!forum/mustangproject - - - - - scm:git:https://github.com/ZUGFeRD/mustangproject.git - scm:git:https://github.com/ZUGFeRD/mustangproject.git - https://github.com/ZUGFeRD/mustangproject - - - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${mvn.maven-compiler-plugin.version} - - - compile - - compile - - - ${maven.compiler.source} - - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${mvn.maven-resources-plugin.version} - - - - org.apache.maven.plugins - maven-release-plugin - ${mvn.maven-release-plugin.version} - - true - release - deploy - false - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - ${mvn.dep.maven-scm-provider-gitexe.version} - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${mvn.maven-javadoc-plugin.version} - - ${skip.javadoc} - org.mustangproject.ZUGFeRD.model.* - none - false - false - - - - attach-javadocs - - jar - - - - - - - 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 - - - - - - - test-jar - - - - - - - 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.apache.maven.plugins - maven-source-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - - - - - - org.slf4j - slf4j-api - ${dep.slf4j.version} - - - - jakarta.xml.bind - jakarta.xml.bind-api - ${dep.jakarta.xml-bind.version} - - - - org.glassfish.jaxb - jaxb-runtime - ${dep.jaxb-runtime.version} - - - - commons-cli - commons-cli - ${dep.commons-cli.version} - - - - 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 - - - - - - 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 + release-sign-artifacts performRelease true - - false - org.apache.maven.plugins maven-gpg-plugin - ${mvn.maven-gpg-plugin.version} + 1.6 sign-artifacts @@ -475,6 +185,26 @@ + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 11 + adopt + + + + diff --git a/validator/pom.xml b/validator/pom.xml index fa3e8565..940d63b3 100644 --- a/validator/pom.xml +++ b/validator/pom.xml @@ -1,27 +1,44 @@ - 4.0.0 org.mustangproject core 2.14.0-SNAPSHOT - + 4.0.0 + org.mustangproject validator + Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung) + jar - E-Invoices Validator - - - Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung - - + 2.14.0-SNAPSHOT + + + + sonatype-oss-public + https://oss.sonatype.org/content/groups/public/ + + true + + + true + + + + UTF-8 + false + + 11 + 11 + 11 + ${project.groupId} library - ${project.version} + 2.14.0-SNAPSHOT org.dom4j @@ -42,60 +59,170 @@ jakarta.xml.bind jakarta.xml.bind-api + 4.0.2 + + org.verapdf validation-model-jakarta + 1.26.1 - + com.helger.schematron ph-schematron-xslt + 8.0.0 - org.xmlunit xmlunit-core + 2.10.0 + test - org.xmlunit xmlunit-assertj + 2.10.0 + test - org.junit.jupiter junit-jupiter-api + 5.10.2 + test - org.junit.vintage junit-vintage-engine + 5.10.2 + test - org.slf4j slf4j-simple + 2.0.9 + test - + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + + org.apache.maven.plugins - maven-shade-plugin + maven-surefire-plugin + + alphabetical + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + **/logback.xml + + + + true + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + jar-with-dependencies + + + + 11 + 11 + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + true + false + + + *:* + + LICENSE + NOTICE + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + log4j:log4j + + ** + + + + commons-logging:commons-logging + + ** + + + + com.sun.xml.bind:jaxb-impl + + ** + + + + + + + package + + shade + + + + + + + + - maven-resources-plugin + 3.1.0 copy-zf-schematron-xml-dependencies + compile copy-resources - compile ${basedir}/src/main/resources/xslt/ZF_230/ @@ -113,11 +240,62 @@ + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + Jochen Stärk + jstaerk@usegroup.de + + architect + developer + + + - - + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.1.0 + + + + toolchain + + + + + + + 11 + adopt + + + + + + + + generateXSLTFromSchematron false @@ -127,7 +305,7 @@ com.helger.maven ph-schematron-maven-plugin - ${dep.ph-schematron-xslt.version} + 8.0.0 ${basedir}/src/main/resources/schematron ${basedir}/src/main/resources/xslt @@ -144,5 +322,4 @@ -