corrected version

2024-06-27 08:46:35 +02:00
parent d22a8a0b5c
commit cbd8f71ca0
5 changed files with 584 additions and 585 deletions
--- a/History.md
+++ b/History.md
@@ -1,8 +1,12 @@
+2.12.0
+=======

 - support pdf export/visualization to PDF, thanks to Heavenfighter #387 allow embedd fonts from jar-file for pdf creation #388
 - Fix #389: ClassCastException: ZUGFeRDExporterFromA3
 - jakarta support #372
 - Upgrade to PDFBox 3 #373
+- #397
+
 2.11.0
 =======
 2024-05-22
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-</parent>
+        <version>2.12.0-SNAPSHOT</version>
+    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
    <artifactId>Mustang-CLI</artifactId>
-   <name>e-invoices commandline tool, allowing to create(embed), split and validate Factur-X/ZUGFeRD files. Validation should also work for XRechnung/CII. </name>
+    <name>e-invoices commandline tool, allowing to create(embed), split and validate Factur-X/ZUGFeRD files. Validation
+        should also work for XRechnung/CII.
+    </name>
    <packaging>jar</packaging>
-   <version>3.0.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.compilerVersion>8</maven.compiler.compilerVersion>
@@ -21,7 +24,7 @@
        <dependency>
            <groupId>org.mustangproject</groupId>
            <artifactId>validator</artifactId>
-         <version>3.0.0-SNAPSHOT</version>
+            <version>2.12.0-SNAPSHOT</version>
            <!-- prototypes of new mustangproject versions can be installed by referring to them and installed to the local repo from a jar file with
           mvn install:install-file -Dfile=mustang-1.5.4-SNAPSHOT.jar -DgroupId=org.mustangproject.ZUGFeRD -DartifactId=mustang -Dversion=1.5.4 -Dpackaging=jar -DgeneratePom=true
           -->
@@ -50,7 +53,7 @@
            <version>5.10.2</version>
            <scope>test</scope>
        </dependency>
-<!-- for directory validation: -->
+        <!-- for directory validation: -->
        <dependency>
            <groupId>org.xmlunit</groupId>
            <artifactId>xmlunit-core</artifactId>
@@ -62,7 +65,14 @@
            <version>2.10.0</version>
        </dependency>

-<!-- /directory validation: -->
+        <!-- /directory validation: -->
+
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>4.0.2</version>
+        </dependency>
+

    </dependencies>
    <build>
@@ -97,26 +107,6 @@
                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                        </manifest>
-                   <manifestSections>
-                       <manifestSection>
-                           <name>FreeSans.ttf</name>
-                           <manifestEntries>
-                               <Content-Type>font/ttf</Content-Type>
-                           </manifestEntries>
-                       </manifestSection>
-                       <manifestSection>
-                           <name>FreeSerif.ttf</name>
-                           <manifestEntries>
-                               <Content-Type>application/x-font</Content-Type>
-                           </manifestEntries>
-                       </manifestSection>
-                       <manifestSection>
-                           <name>Times-Bold.ttf</name>
-                           <manifestEntries>
-                               <Content-Type>application/x-font</Content-Type>
-                           </manifestEntries>
-                       </manifestSection>
-                   </manifestSections>

                    </archive>
                </configuration>
@@ -148,7 +138,8 @@
                <version>2.4.3</version>
                <configuration>
                    <transformers>
-                  <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                        <transformer
+                                implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                            <mainClass>org.mustangproject.commandline.Main</mainClass>
                        </transformer>
                    </transformers>
@@ -192,7 +183,7 @@
                        </goals>
                        <configuration>
                            <artifactSet>
-                        <excludes />
+                                <excludes/>
                            </artifactSet>
                        </configuration>
                    </execution>
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-</parent>
+        <version>2.12.0-SNAPSHOT</version>
+    </parent>

    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
    <artifactId>library</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
    <packaging>jar</packaging>
    <name>Library to write, read and validate e-invoices (Factur-X, ZUGFeRD, Order-X, XRechnung/CII)</name>
-	<description>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.
+    <description>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.
    </description>
    <url>http://www.mustangproject.org/</url>
    <scm>
@@ -48,7 +50,8 @@
        <maven.compiler.compilerVersion>8</maven.compiler.compilerVersion>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
-		<maven.deploy.skip>true</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
+        <maven.deploy.skip>true
+        </maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->

    </properties>
    <dependencies>
@@ -220,7 +223,8 @@
                <version>3.2.1</version>
                <configuration>
                    <shadedArtifactAttached>true</shadedArtifactAttached>
-					<minimizeJar>false</minimizeJar><!-- no longer java 11 compatible if set to true because it removes e.g. javax/xml/bind/annotation/XmlSchema-->
+                    <minimizeJar>false
+                    </minimizeJar><!-- no longer java 11 compatible if set to true because it removes e.g. javax/xml/bind/annotation/XmlSchema-->
                    <filters>

                        <filter>
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
    <artifactId>core</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>Mustang</name>

--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>org.mustangproject</groupId>
        <artifactId>core</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>2.12.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.mustangproject</groupId>
@@ -11,7 +11,7 @@
    <name>Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung)</name>

    <packaging>jar</packaging>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
    <repositories>
        <repository>
            <!-- for jargs -->
@@ -38,7 +38,7 @@
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>library</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>2.12.0-SNAPSHOT</version>
        </dependency>
        <dependency>
            <groupId>ch.qos.logback</groupId>