Merge branch 'master' of github.com:ZUGFeRD/mustangproject

# Conflicts:
#	Mustang-CLI/pom.xml
#	library/pom.xml
#	validator/pom.xml

History.md

@@ -1,3 +1,8 @@
+- #420
+- Enhance Charges/Allowances with reasonCode. #432
+- Fix build warnings from editing and building. #415
+- ZUGFeRDVisualizer.toPDF(): generate PDF/A-3b. #400
+
 2.12.0
 =======
 2024-07-20

Mustang-CLI/pom.xml

@@ -6,16 +6,13 @@
         <version>2.13.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.13.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>
@@ -110,18 +107,6 @@
                 <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>
@@ -148,24 +133,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>
                                 <include>**</include>
                             </includes>
                         </filter>
-                        <filter>
-                            <artifact>com.sun.xml.bind:jaxb-impl</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
                     </filters>
                 </configuration>
                 <executions>

doc/development_documentation.md

@@ -127,14 +127,10 @@ The whole settings.xml then looks e.g. like this
       <offline/>
       <pluginGroups/>
       <servers>
-        <server> 
-      	<id>github</id> 
-      	<password>TOKEN</password> 
-        </server> 
     <server> 
       <id>ossrh</id> 
-      <username>jstaerk</username> 
+      <username>SONATYPE TOKEN USER</username> 
-      <password>JIRA-PASSWORD</password> 
+      <password>SONATYPE TOKEN PASSWORD</password> 
     </server> 
 
       </servers>

library/pom.xml

@@ -7,9 +7,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.mustangproject</groupId>
     <artifactId>library</artifactId>
-    <version>2.13.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
@@ -46,11 +44,9 @@
         <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>true</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
-        </maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
 
     </properties>
     <dependencies>
@@ -169,12 +165,6 @@
                 <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>
@@ -233,10 +223,8 @@
                 <version>3.5.3</version>
                 <configuration>
                     <shadedArtifactAttached>true</shadedArtifactAttached>
-                    <minimizeJar>false
+                    <minimizeJar>false</minimizeJar><!-- no longer java 11 compatible if set to true because it removes e.g. javax/xml/bind/annotation/XmlSchema-->
-                    </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>
@@ -245,12 +233,6 @@
                                 <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>
@@ -268,9 +250,6 @@
                         <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>

library/src/main/java/org/mustangproject/Charge.java

@@ -26,6 +26,10 @@ public class Charge implements IZUGFeRDAllowanceCharge {
 	 * a simple human readable description
 	 */
 	protected String reason;
+	/**
+	 * Code from list UNTDID 5189
+	 */
+	protected String reasonCode;
 	/**
 	 * the category ID why this charge has been applied
 	 */
@@ -94,6 +98,22 @@ public class Charge implements IZUGFeRDAllowanceCharge {
 	}
 
 
+	@Override
+	public String getReasonCode() {
+		return reasonCode;
+	}
+
+	/***
+	 * Reason code for the charge
+	 * @param reasonCode from list UNTDID 5189
+	 * @return fluid setter
+	 */
+	public Charge setReasonCode(String reasonCode) {
+		this.reasonCode = reasonCode;
+		return this;
+	}
+
+	
 	@Override
 	public BigDecimal getTotalAmount(IAbsoluteValueProvider currentItem) {
 		if (totalAmount!=null) {
@@ -137,7 +157,7 @@ public class Charge implements IZUGFeRDAllowanceCharge {
 
 
 	/***
-	 * machine readable reason for this allowance/charge
+	 * the category ID why this has been applied
 	 * @param categoryCode usually S
 	 * @return fluid setter
 	 */

library/src/main/java/org/mustangproject/Item.java

@@ -60,6 +60,7 @@ public class Item implements IZUGFeRDExportableItem {
 		String vatPercent = null;
 		String lineTotal = "0";
 		String unitCode = "0";
+		String referencedLineID = null;
 
 		ArrayList<ReferencedDocument> rdocs = null;
 
@@ -142,6 +143,16 @@ public class Item implements IZUGFeRDExportableItem {
 
 					}
 
+					if ((tradeLineChilds.item(tradeLineChildIndex).getLocalName() != null) && tradeLineChilds.item(tradeLineChildIndex).getLocalName().equals("BuyerOrderReferencedDocument")) {
+						NodeList docChilds = tradeLineChilds.item(tradeLineChildIndex).getChildNodes();
+						for (int docIndex = 0; docIndex < docChilds.getLength(); docIndex++) {
+							String localName = docChilds.item(docIndex).getLocalName();
+							if ((localName != null) && (localName.equals("LineID"))) {
+								referencedLineID = docChilds.item(docIndex).getTextContent();
+							}
+						}
+					}
+
 					if ((tradeLineChilds.item(tradeLineChildIndex).getLocalName() != null) && tradeLineChilds
 						.item(tradeLineChildIndex).getLocalName().equals("NetPriceProductTradePrice")) {
 						NodeList netChilds = tradeLineChilds.item(tradeLineChildIndex).getChildNodes();
@@ -263,6 +274,7 @@ public class Item implements IZUGFeRDExportableItem {
 				addReferencedDocument(rdoc);
 			}
 		}
+		addReferencedLineID( referencedLineID );
 	}
 
 

library/src/main/java/org/mustangproject/Product.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.mustangproject.ZUGFeRD.IZUGFeRDExportableProduct;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 /***
  * describes a product, good or service used in an invoice item line
@@ -15,6 +16,8 @@ public class Product implements IZUGFeRDExportableProduct {
 	protected boolean isReverseCharge = false;
 	protected boolean isIntraCommunitySupply = false;
 	protected SchemedID globalId = null;
+	protected String countryOfOrigin = null;
+	protected HashMap<String, String> attributes = null;
 
 	/***
 	 * default constructor
@@ -63,6 +66,7 @@ public class Product implements IZUGFeRDExportableProduct {
 	}
 
 
+	@Override
 	public String getSellerAssignedID() {
 		return sellerAssignedID;
 	}
@@ -77,6 +81,7 @@ public class Product implements IZUGFeRDExportableProduct {
 		return this;
 	}
 
+	@Override
 	public String getBuyerAssignedID() {
 		return buyerAssignedID;
 	}
@@ -183,4 +188,32 @@ public class Product implements IZUGFeRDExportableProduct {
 		this.VATPercent = VATPercent;
 		return this;
 	}
+
+	@Override
+	public String getCountryOfOrigin() {
+	    return this.countryOfOrigin;
+	}
+
+	public Product setCountryOfOrigin(String countryOfOrigin) {
+	    this.countryOfOrigin = countryOfOrigin;
+	    return this;
+	}
+
+	@Override
+	public HashMap<String, String> getAttributes() {
+	    return this.attributes;
+	}
+
+	public Product setAttributes(HashMap<String, String> attributes) {
+	    this.attributes = attributes;
+	    return this;
+	}
+
+	public Product addAttribute(String name, String value ) {
+	    if ( this.attributes == null ) {
+		this.attributes = new HashMap<>();
+	    }
+	    this.attributes.put(name, value);
+	    return this;
+	}
 }

library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceCharge.java

@@ -44,6 +44,12 @@ public interface IZUGFeRDAllowanceCharge {
 	 */
 	String getReason();
 
+	/***
+	 * get the code for the allowance/charge
+	 * @return the code
+	 */
+	String getReasonCode();
+
 	/***
 	 * get the applicable tax percentage for the allowance/charge
 	 * @return the percentage

library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableProduct.java

@@ -21,6 +21,7 @@
 package org.mustangproject.ZUGFeRD;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 import org.mustangproject.ZUGFeRD.model.TaxCategoryCodeTypeConstants;
 
@@ -156,4 +157,12 @@ public interface IZUGFeRDExportableProduct {
 		}
 		return null;
 	}
+
+	default String getCountryOfOrigin() {
+	    return null;
+	}
+
+	default HashMap<String, String> getAttributes() {
+	    return null;
+	}
 }

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java

@@ -34,6 +34,7 @@ import java.util.Base64;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -243,10 +244,16 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			// only in extended profile
 			reason = "<ram:Reason>" + XMLTools.encodeXML(allowance.getReason()) + "</ram:Reason>";
 		}
+		String reasonCode = "";
+		if ((allowance.getReasonCode() != null) && (profile == Profiles.getByName("XRechnung"))) {
+			// only in XRechnung profile
+			reasonCode = "<ram:ReasonCode>" + allowance.getReasonCode() + "</ram:ReasonCode>";
+		}
 		final String allowanceChargeStr = "<ram:AppliedTradeAllowanceCharge><ram:ChargeIndicator><udt:Indicator>" +
 			chargeIndicator + "</udt:Indicator></ram:ChargeIndicator>" + percentage +
 			"<ram:ActualAmount>" + priceFormat(allowance.getTotalAmount(item)) + "</ram:ActualAmount>" +
 			reason +
+			reasonCode +
 			"</ram:AppliedTradeAllowanceCharge>";
 		return allowanceChargeStr;
 	}
@@ -268,10 +275,21 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 			chargeIndicator = "true";
 		}
 
+		String reason = "";
+		if ((allowance.getReason() != null) && (profile == Profiles.getByName("Extended"))) {
+			// only in extended profile
+			reason = "<ram:Reason>" + XMLTools.encodeXML(allowance.getReason()) + "</ram:Reason>";
+		}
+		String reasonCode = "";
+		if ((allowance.getReasonCode() != null) && (profile == Profiles.getByName("XRechnung"))) {
+			// only in XRechnung profile
+			reasonCode = "<ram:ReasonCode>" + allowance.getReasonCode() + "</ram:ReasonCode>";
+		}
 		final String itemTotalAllowanceChargeStr = "<ram:SpecifiedTradeAllowanceCharge><ram:ChargeIndicator><udt:Indicator>" +
 			chargeIndicator + "</udt:Indicator></ram:ChargeIndicator>" + percentage +
 			"<ram:ActualAmount>" + currencyFormat(allowance.getTotalAmount(item)) + "</ram:ActualAmount>" +
-			"<ram:Reason>" + XMLTools.encodeXML(allowance.getReason()) + "</ram:Reason>" +
+			reason +
+			reasonCode +
 			"</ram:SpecifiedTradeAllowanceCharge>";
 		return itemTotalAllowanceChargeStr;
 	}
@@ -397,6 +415,19 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 						XMLTools.encodeXML(currentItem.getProduct().getDescription()) +
 						"</ram:Description>";
 				}
+				if (currentItem.getProduct().getAttributes() != null) {
+					for ( Entry<String, String> entry : currentItem.getProduct().getAttributes().entrySet() ) {
+						xml += "<ram:ApplicableProductCharacteristic>" +
+							"<ram:Description>" + XMLTools.encodeXML(entry.getKey()) + "</ram:Description>" +
+							"<ram:Value>" + XMLTools.encodeXML(entry.getValue()) + "</ram:Value>" +
+							"</ram:ApplicableProductCharacteristic>";
+					}
+				}
+				if (currentItem.getProduct().getCountryOfOrigin() != null) {
+					xml += "<ram:OriginTradeCountry><ram:ID>" +
+					XMLTools.encodeXML(currentItem.getProduct().getCountryOfOrigin()) +
+					"</ram:ID></ram:OriginTradeCountry>";
+				}
 				xml += "</ram:SpecifiedTradeProduct>"
 
 					+ "<ram:SpecifiedLineTradeAgreement>";
@@ -631,7 +662,29 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		}
 
 		if ((trans.getZFCharges() != null) && (trans.getZFCharges().length > 0)) {
-
+			if (profile == Profiles.getByName("XRechnung")) {
+				for(IZUGFeRDAllowanceCharge charge : trans.getZFCharges()) {
+					xml += "<ram:SpecifiedTradeAllowanceCharge>" +
+						"<ram:ChargeIndicator>" +
+						"<udt:Indicator>true</udt:Indicator>" +
+						"</ram:ChargeIndicator>" +
+						"<ram:ActualAmount>" + currencyFormat(charge.getTotalAmount(calc)) + "</ram:ActualAmount>";
+					if (charge.getReason() != null) {
+						xml += "<ram:Reason>" + XMLTools.encodeXML(charge.getReason()) + "</ram:Reason>";
+					}
+					if (charge.getReasonCode() != null) {
+						xml += "<ram:ReasonCode>" + charge.getReasonCode() + "</ram:ReasonCode>";
+					}
+					xml += "<ram:CategoryTradeTax>" +
+						"<ram:TypeCode>VAT</ram:TypeCode>" +
+						"<ram:CategoryCode>" + charge.getCategoryCode() + "</ram:CategoryCode>";
+					if (charge.getTaxPercent() != null) {
+						xml += "<ram:RateApplicablePercent>" + vatFormat(charge.getTaxPercent()) + "</ram:RateApplicablePercent>";
+					}
+					xml += "</ram:CategoryTradeTax>" +
+						"</ram:SpecifiedTradeAllowanceCharge>";
+				}
+			} else {
 				for (final BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
 					if (calc.getChargesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) {
 						xml += "<ram:SpecifiedTradeAllowanceCharge>" +
@@ -649,8 +702,32 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					}
 				}
 			}
+		}
 
 		if ((trans.getZFAllowances() != null) && (trans.getZFAllowances().length > 0)) {
+			if (profile == Profiles.getByName("XRechnung")) {
+				for(IZUGFeRDAllowanceCharge allowance : trans.getZFAllowances()) {
+					xml += "<ram:SpecifiedTradeAllowanceCharge>" +
+						"<ram:ChargeIndicator>" +
+						"<udt:Indicator>false</udt:Indicator>" +
+						"</ram:ChargeIndicator>" +
+						"<ram:ActualAmount>" + currencyFormat(allowance.getTotalAmount(calc)) + "</ram:ActualAmount>";
+					if (allowance.getReason() != null) {
+						xml += "<ram:Reason>" + XMLTools.encodeXML(allowance.getReason()) + "</ram:Reason>";
+					}
+					if (allowance.getReasonCode() != null) {
+						xml += "<ram:ReasonCode>" + allowance.getReasonCode() + "</ram:ReasonCode>";
+					}
+					xml += "<ram:CategoryTradeTax>" +
+						"<ram:TypeCode>VAT</ram:TypeCode>" +
+						"<ram:CategoryCode>" + allowance.getCategoryCode() + "</ram:CategoryCode>";
+					if (allowance.getTaxPercent() != null) {
+						xml += "<ram:RateApplicablePercent>" + vatFormat(allowance.getTaxPercent()) + "</ram:RateApplicablePercent>";
+					}
+					xml += "</ram:CategoryTradeTax>" +
+						"</ram:SpecifiedTradeAllowanceCharge>";
+				}
+			} else {
 				for (final BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
 					if (calc.getAllowancesForPercent(currentTaxPercent).compareTo(BigDecimal.ZERO) != 0) {
 						xml += "<ram:SpecifiedTradeAllowanceCharge>" +
@@ -668,6 +745,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					}
 				}
 			}
+		}
 
 
 		if ((trans.getPaymentTerms() == null) && (getProfile() != Profiles.getByName("Minimum")) && ((paymentTermsDescription != null) || (trans.getTradeSettlement() != null) || (hasDueDate))) {

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java

@@ -357,6 +357,7 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
 				boolean isCharge = true;
 				String chargeAmount = null;
 				String reason = null;
+				String reasonCode = null;
 				String taxPercent = null;
 				for (int chargeChildIndex = 0; chargeChildIndex < chargeNodeChilds.getLength(); chargeChildIndex++) {
 					String chargeChildName = chargeNodeChilds.item(chargeChildIndex).getLocalName();
@@ -377,6 +378,8 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
 							chargeAmount = chargeNodeChilds.item(chargeChildIndex).getTextContent();
 						} else if (chargeChildName.equals("Reason")) {
 							reason = chargeNodeChilds.item(chargeChildIndex).getTextContent();
+						} else if (chargeChildName.equals("ReasonCode")) {
+							reasonCode = chargeNodeChilds.item(chargeChildIndex).getTextContent();
 						} else if (chargeChildName.equals("CategoryTradeTax")) {
 							NodeList taxChilds = chargeNodeChilds.item(chargeChildIndex).getChildNodes();
 							for (int taxChildIndex = 0; taxChildIndex < taxChilds.getLength(); taxChildIndex++) {
@@ -395,16 +398,21 @@ public class ZUGFeRDInvoiceImporter extends ZUGFeRDImporter {
 					if (reason != null) {
 						c.setReason(reason);
 					}
+					if (reasonCode != null) {
+						c.setReasonCode(reasonCode);
+					}
 					if (taxPercent != null) {
 						c.setTaxPercent(new BigDecimal(taxPercent));
 					}
-
 					zpp.addCharge(c);
 				} else {
 					Allowance a = new Allowance(new BigDecimal(chargeAmount));
 					if (reason != null) {
 						a.setReason(reason);
 					}
+					if (reasonCode != null) {
+						a.setReasonCode(reasonCode);
+					}
 					if (taxPercent != null) {
 						a.setTaxPercent(new BigDecimal(taxPercent));
 					}

library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java

@@ -321,7 +321,7 @@ public class ZUGFeRDVisualizer {
 
 		FOUserAgent userAgent = fopFactory.newFOUserAgent();
 
-		userAgent.getRendererOptions().put("pdf-a-mode", "PDF/A-1b");
+		userAgent.getRendererOptions().put("pdf-a-mode", "PDF/A-3b");
 
 // Step 2: Set up output stream.
 // Note: Using BufferedOutputStream for performance reasons (helpful with FileOutputStreams).

library/src/test/java/org/mustangproject/ZUGFeRD/IZUGFeRDAllowanceChargeImpl.java

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 public class IZUGFeRDAllowanceChargeImpl implements IZUGFeRDAllowanceCharge {
 	private BigDecimal totalAmount;
 	private String reason;
+	private String reasonCode;
 	private BigDecimal taxPercent;
 	boolean isCharge=true;
 
@@ -36,6 +37,11 @@ public class IZUGFeRDAllowanceChargeImpl implements IZUGFeRDAllowanceCharge {
 		return reason;
 	}
 
+	@Override
+	public String getReasonCode() {
+		return reasonCode;
+	}
+
 	@Override
 	public BigDecimal getTaxPercent() {
 		return taxPercent;
@@ -61,6 +67,11 @@ public class IZUGFeRDAllowanceChargeImpl implements IZUGFeRDAllowanceCharge {
 		return this;
 	}
 
+	public IZUGFeRDAllowanceChargeImpl setReasonCode(String reasonCode) {
+		this.reasonCode = reasonCode;
+		return this;
+	}
+
 	public IZUGFeRDAllowanceChargeImpl setTaxPercent(BigDecimal taxPercent) {
 		this.taxPercent = taxPercent;
 		return this;

pom.xml

@@ -63,8 +63,7 @@
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>3.0.0-M1</version>
                 <configuration>
-                    <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo
+                    <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
-                    </altDeploymentRepository>
                 </configuration>
             </plugin>
 
@@ -82,6 +81,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.3.1</version>
                 <configuration>
                     <runOrder>alphabetical</runOrder>
                 </configuration>
@@ -90,9 +90,6 @@
                 <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>
@@ -118,7 +115,6 @@
         <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",

validator/pom.xml

@@ -6,12 +6,10 @@
         <version>2.13.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.13.0-SNAPSHOT</version>
     <repositories>
         <repository>
             <!-- for jargs -->
@@ -27,18 +25,15 @@
     </repositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.deploy.skip>false
+        <maven.deploy.skip>false</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
-        </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>2.13.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
@@ -134,12 +129,6 @@
                 <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>
@@ -163,24 +152,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>
                                 <include>**</include>
                             </includes>
                         </filter>
-                        <filter>
-                            <artifact>com.sun.xml.bind:jaxb-impl</artifact>
-                            <includes>
-                                <include>**</include>
-                            </includes>
-                        </filter>
                     </filters>
                 </configuration>
                 <executions>