From da8fc9a4574814b8fd2f843001fc90e16b782fe3 Mon Sep 17 00:00:00 2001
From: jstaerk <jstaerk@usegroup.de>
Date: Wed, 28 Aug 2024 17:52:21 +0200
Subject: [PATCH] reverting to poms from 2.12

---
 Mustang-CLI/pom.xml | 37 +++++++++++++++++++++++++++++++++----
 library/pom.xml     | 30 ++++++++++++++++++++++++++----
 pom.xml             | 10 +++++++---
 validator/pom.xml   | 29 ++++++++++++++++++++++++++---
 4 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/Mustang-CLI/pom.xml b/Mustang-CLI/pom.xml
index 89fa7201..247cd494 100644
--- a/Mustang-CLI/pom.xml
+++ b/Mustang-CLI/pom.xml
@@ -1,18 +1,22 @@
 <?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">
+<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>2.13.0</version>
+        <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>
     <packaging>jar</packaging>
+    <version>2.12.0-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
@@ -20,7 +24,7 @@
         <dependency>
             <groupId>org.mustangproject</groupId>
             <artifactId>validator</artifactId>
-            <version>2.13.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
            -->
@@ -107,6 +111,18 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.mustangproject.commandline.main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <!-- http://stackoverflow.com/questions/574594/how-can-i-create-an-executable-jar-with-dependencies-using-maven
+                             mvn clean compile assembly:single -->
+                    <!-- or whatever version you use -->
                     <source>11</source>
                     <target>11</target>
                 </configuration>
@@ -117,7 +133,8 @@
                 <version>3.5.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>
@@ -133,12 +150,24 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>log4j:log4j</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                         <filter>
                             <artifact>commons-logging:commons-logging</artifact>
                             <includes>
                                 <include>**</include>
                             </includes>
                         </filter>
+                        <filter>
+                            <artifact>com.sun.xml.bind:jaxb-impl</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                     </filters>
                 </configuration>
                 <executions>
diff --git a/library/pom.xml b/library/pom.xml
index f4e24d68..76b7e8b7 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -1,13 +1,16 @@
 <?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">
+<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>2.13.0-SNAPSHOT</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mustangproject</groupId>
     <artifactId>library</artifactId>
+    <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
@@ -44,9 +47,11 @@
         <github.global.server>github</github.global.server>
         <additionalparam>-Xdoclint:none</additionalparam>
         <!-- Skip error check for javadoc -->
+        <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</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>
@@ -165,6 +170,12 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <!-- http://stackoverflow.com/questions/574594/how-can-i-create-an-executable-jar-with-dependencies-using-maven
+                        mvn clean compile assembly:single -->
+                    <!-- or whatever version you use -->
                     <source>11</source>
                     <target>11</target>
                 </configuration>
@@ -223,8 +234,10 @@
                 <version>3.5.3</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>
                             <artifact>*:*</artifact>
                             <excludes>
@@ -233,6 +246,12 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>log4j:log4j</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                         <filter>
                             <artifact>commons-logging:commons-logging</artifact>
                             <includes>
@@ -250,6 +269,9 @@
                         <configuration>
                             <artifactSet>
                                 <excludes>
+                                    <!--exclude>classworlds:classworlds</exclude> <exclude>junit:junit</exclude>
+                                        <exclude>jmock:*</exclude> <exclude>*:xml-apis</exclude> <exclude>org.apache.maven:lib:tests</exclude>
+                                        <exclude>log4j:log4j:jar:</exclude -->
                                 </excludes>
                             </artifactSet>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index b020447b..0c747e0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.mustangproject</groupId>
     <artifactId>core</artifactId>
-    <version>2.13.0-SNAPSHOT</version>
+    <version>2.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Mustang</name>
 
@@ -63,7 +63,8 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>3.0.0-M1</version>
                 <configuration>
-                    <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
+                    <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo
+                    </altDeploymentRepository>
                 </configuration>
             </plugin>
 
@@ -81,7 +82,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.3.1</version>
                 <configuration>
                     <runOrder>alphabetical</runOrder>
                 </configuration>
@@ -90,6 +90,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>3.2.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadoc</id>
@@ -115,6 +118,7 @@
         <github.global.server>github</github.global.server>
         <additionalparam>-Xdoclint:none</additionalparam>
         <!-- Skip error check for javadoc -->
+        <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.deploy.skip>true</maven.deploy.skip><!-- prevent this to be deployed to maven central as "core",
diff --git a/validator/pom.xml b/validator/pom.xml
index 946d9a48..ddb06bef 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -3,13 +3,15 @@
     <parent>
         <groupId>org.mustangproject</groupId>
         <artifactId>core</artifactId>
-        <version>2.13.0</version>
+        <version>2.12.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.mustangproject</groupId>
     <artifactId>validator</artifactId>
     <name>Library to validate e-invoices (ZUGFeRD, Factur-X and Xrechnung)</name>
 
     <packaging>jar</packaging>
+    <version>2.12.0-SNAPSHOT</version>
     <repositories>
         <repository>
             <!-- for jargs -->
@@ -25,15 +27,18 @@
     </repositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.deploy.skip>false</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
+        <maven.deploy.skip>false
+        </maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
+        <maven.compiler.compilerVersion>11</maven.compiler.compilerVersion>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
+
     </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>library</artifactId>
-            <version>${project.version}</version>
+            <version>2.12.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -129,6 +134,12 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <!-- http://stackoverflow.com/questions/574594/how-can-i-create-an-executable-jar-with-dependencies-using-maven
+                             mvn clean compile assembly:single -->
+                    <!-- or whatever version you use -->
                     <source>11</source>
                     <target>11</target>
                 </configuration>
@@ -152,12 +163,24 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>log4j:log4j</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                         <filter>
                             <artifact>commons-logging:commons-logging</artifact>
                             <includes>
                                 <include>**</include>
                             </includes>
                         </filter>
+                        <filter>
+                            <artifact>com.sun.xml.bind:jaxb-impl</artifact>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </filter>
                     </filters>
                 </configuration>
                 <executions>