louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1067 from phax/java17-base

Browse Source 
Set Java 17 as base + dependency updates + test fix
This commit is contained in:
Jochen Staerk
2026-05-07 13:22:43 +02:00
committed by GitHub
parent d8313dae20 51a216bb94
commit f6b6c0a36e
15 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/maven.yml vendored
View File

@@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3 # the log states the default ~/.m2/toolchains.xml is being created pointing to the JDK
- uses: actions/checkout@v6
- uses: actions/setup-java@v5 # the log states the default ~/.m2/toolchains.xml is being created pointing to the JDK
with:
distribution: 'adopt' # for latest JDKs use temurin https://blog.adoptopenjdk.net/2021/08/goodbye-adoptopenjdk-hello-adoptium/
java-version: '11'
java-version: '17'
cache: 'maven' #cache/restore any dependencies to improve the workflow execution time
- name: Build with Maven
run: mvn -B package --file pom.xml

8
Mustang-CLI/pom.xml
View File

@@ -13,7 +13,7 @@
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>${java.version}</maven.compiler.release>
</properties>
<dependencies>
<!-- compile dependencies -->
@@ -118,8 +118,8 @@
<!-- 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>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
@@ -209,7 +209,7 @@
<configuration>
<toolchains>
<jdk>
<version>11</version>
<version>${java.version}</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>

14
library/pom.xml
View File

@@ -44,7 +44,7 @@
<github.global.server>github</github.global.server>
<additionalparam>-Xdoclint:none</additionalparam>
<!-- Skip error check for javadoc -->
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
</properties>
<dependencies>
@@ -149,6 +149,12 @@
<version>${version.org.glassfish.jaxb}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${version.org.slf4j}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
@@ -169,8 +175,8 @@
<!-- 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>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
@@ -331,7 +337,7 @@
<configuration>
<toolchains>
<jdk>
<version>11</version>
<version>${java.version}</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>

2
library/src/main/java/org/mustangproject/CII/CIIToUBL.java
View File

@@ -3,7 +3,7 @@ package org.mustangproject.CII;
import java.io.File;
import java.io.Serializable;
import com.helger.commons.error.list.ErrorList;
import com.helger.diagnostics.error.list.ErrorList;
import com.helger.en16931.cii2ubl.CIIToUBL23Converter;
import com.helger.ubl23.UBL23Marshaller;

10
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -551,9 +551,13 @@ public class ZUGFeRDInvoiceImporter {
NodeList lineDueNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
BigDecimal duePayableAmount = null;
if (lineDueNodes.getLength() > 0) {
duePayableAmount = new BigDecimal(XMLTools.trimOrNull(lineDueNodes.item(0)));
if (zpp instanceof CalculatedInvoice) {
((CalculatedInvoice) zpp).setDuePayable(duePayableAmount);
String duePayableAmountStr=XMLTools.trimOrNull(lineDueNodes.item(0));
if (duePayableAmountStr!=null) {
// Always set it, because it is used in the calculation below
duePayableAmount = new BigDecimal(duePayableAmountStr);
if (zpp instanceof CalculatedInvoice) {
((CalculatedInvoice) zpp).setDuePayable(duePayableAmount);
}
}
}

2
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java
View File

@@ -20,7 +20,7 @@
*/
package org.mustangproject.ZUGFeRD;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.base.io.stream.StreamHelper;
import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.io.IOUtils;

4
library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java
View File

@@ -335,10 +335,8 @@ public class DXTest extends MustangReaderTestCase {
zf2p.setProfile(Profiles.getByName(EStandard.despatchadvice,"Pilot",1));
zf2p.generateXML(i);
String theXML = new String(zf2p.getXML(), StandardCharsets.UTF_8);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

4
library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java
View File

@@ -62,10 +62,8 @@ public class FXTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

3
library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
View File

@@ -30,8 +30,10 @@ import java.text.ParseException;
import java.util.Date;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.mustangproject.BankDetails;
import org.mustangproject.CII.CIIToUBL;
import org.mustangproject.Contact;
@@ -42,6 +44,7 @@ import org.mustangproject.TradeParty;
import javax.xml.xpath.XPathExpressionException;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class UBLTest extends ResourceCase {
final String TARGET_XML = "./target/testout-1Lieferschein.xml";

12
library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
View File

@@ -81,10 +81,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
@@ -134,10 +132,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
@@ -251,10 +247,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

6
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
View File

@@ -309,9 +309,7 @@ public class ZF2PushTest extends TestCase {
String number = "123";
String priceStr = "3.00";
BigDecimal price = new BigDecimal(priceStr);
try {
InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
try(InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf")) {
ZUGFeRDExporterFromA1 ze = new ZUGFeRDExporterFromA1();
ze.ignorePDFAErrors().load(SOURCE_PDF);
ze.setProfile(Profiles.getByName("Extended"));
@@ -359,7 +357,7 @@ public class ZF2PushTest extends TestCase {
/***
* you can activate intra community suppliy on item level
* you can activate intra community supply on item level
*/
public void testIntraCommunitySupplyItemExport() {

57
pom.xml
View File

@@ -28,7 +28,8 @@
<github.global.server>github</github.global.server>
<additionalparam>-Xdoclint:none</additionalparam>
<!-- Skip error check for javadoc -->
<maven.compiler.release>11</maven.compiler.release>
<java.version>17</java.version>
<maven.compiler.release>17</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip><!-- prevent this to be deployed to maven central as "core",
we only want submodules, see also https://stackoverflow.com/questions/7446599/how-to-deploy-only-the-sub-modules-using-maven-deploy-->
@@ -47,40 +48,40 @@
First the versions for plugins, then those for libraries.
-->
<version.org.apache.maven.plugins.maven-compiler-plugin>3.13.0</version.org.apache.maven.plugins.maven-compiler-plugin><!-- from 2.3.2, 3.13.0 -->
<version.org.apache.maven.plugins.maven-deploy-plugin>3.0.0-M1</version.org.apache.maven.plugins.maven-deploy-plugin><!-- from 3.0.0-M1 -->
<version.org.apache.maven.plugins.maven-gpg-plugin>1.6</version.org.apache.maven.plugins.maven-gpg-plugin><!-- from 1.6 -->
<version.org.apache.maven.plugins.maven-jar-plugin>3.4.2</version.org.apache.maven.plugins.maven-jar-plugin><!-- from 3.2.0, 3.4.2 -->
<version.org.apache.maven.plugins.maven-javadoc-plugin>3.0.1</version.org.apache.maven.plugins.maven-javadoc-plugin><!-- from 3.0.1 -->
<version.org.apache.maven.plugins.maven-release-plugin>2.5.3</version.org.apache.maven.plugins.maven-release-plugin><!-- from 2.5.3 -->
<version.org.apache.maven.plugins.maven-resources-plugin>3.1.0</version.org.apache.maven.plugins.maven-resources-plugin><!-- from 3.1.0 -->
<version.org.apache.maven.plugins.maven-shade-plugin>3.5.3</version.org.apache.maven.plugins.maven-shade-plugin><!-- from 2.4.3, 3.5.3 -->
<version.org.apache.maven.plugins.maven-source-plugin>3.3.1</version.org.apache.maven.plugins.maven-source-plugin><!-- from 3.2.1, 3.3.1 -->
<version.org.apache.maven.plugins.maven-surefire-plugin>3.5.3</version.org.apache.maven.plugins.maven-surefire-plugin>
<version.org.apache.maven.plugins.maven-toolchains-plugin>3.1.0</version.org.apache.maven.plugins.maven-toolchains-plugin><!-- from 3.1.0 -->
<version.org.apache.maven.scm>1.9.5</version.org.apache.maven.scm>
<version.org.apache.maven.plugins.maven-compiler-plugin>3.15.0</version.org.apache.maven.plugins.maven-compiler-plugin><!-- from 3.13.0 -->
<version.org.apache.maven.plugins.maven-deploy-plugin>3.1.4</version.org.apache.maven.plugins.maven-deploy-plugin><!-- from 3.0.0-M1 -->
<version.org.apache.maven.plugins.maven-gpg-plugin>3.2.8</version.org.apache.maven.plugins.maven-gpg-plugin><!-- from 1.6 -->
<version.org.apache.maven.plugins.maven-jar-plugin>3.5.0</version.org.apache.maven.plugins.maven-jar-plugin><!-- from 3.2.0, 3.4.2 -->
<version.org.apache.maven.plugins.maven-javadoc-plugin>3.12.0</version.org.apache.maven.plugins.maven-javadoc-plugin><!-- from 3.0.1 -->
<version.org.apache.maven.plugins.maven-release-plugin>3.3.1</version.org.apache.maven.plugins.maven-release-plugin><!-- from 2.5.3 -->
<version.org.apache.maven.plugins.maven-resources-plugin>3.5.0</version.org.apache.maven.plugins.maven-resources-plugin><!-- from 3.1.0 -->
<version.org.apache.maven.plugins.maven-shade-plugin>3.6.1</version.org.apache.maven.plugins.maven-shade-plugin><!-- from 2.4.3, 3.5.3 -->
<version.org.apache.maven.plugins.maven-source-plugin>3.4.0</version.org.apache.maven.plugins.maven-source-plugin><!-- from 3.2.1, 3.3.1 -->
<version.org.apache.maven.plugins.maven-surefire-plugin>3.5.5</version.org.apache.maven.plugins.maven-surefire-plugin><!-- from 3.5.3 -->
<version.org.apache.maven.plugins.maven-toolchains-plugin>3.2.0</version.org.apache.maven.plugins.maven-toolchains-plugin><!-- from 3.1.0 -->
<version.org.apache.maven.scm>2.2.1</version.org.apache.maven.scm><!-- from 1.9.5 -->
<version.org.codehaus.mojo>1.0.0</version.org.codehaus.mojo>
<version.com.helger.maven>8.0.0</version.com.helger.maven>
<version.com.helger.maven.schematron>9.1.1</version.com.helger.maven.schematron><!-- from 8.0.0 -->
<version.org.sonatype.plugins>1.7.0</version.org.sonatype.plugins>
<version.ch.qos.logback>1.5.18</version.ch.qos.logback><!-- from 1.5.16 -->
<version.com.fasterxml.jackson.core>2.17.3</version.com.fasterxml.jackson.core><!-- from 2.17.1 -->
<version.com.helger.en16931-cii2ubl>2.3.1</version.com.helger.en16931-cii2ubl><!-- from 2.3.0 -->
<version.com.helger.schematron>8.0.6</version.com.helger.schematron><!-- from 8.0.0 -->
<version.commons-cli>1.10.0</version.commons-cli><!-- from 1.8.0 -->
<version.commons-io>2.20.0</version.commons-io><!-- from 2.16.1 -->
<version.jakarta.xml.bind>4.0.2</version.jakarta.xml.bind>
<version.net.sf.saxon>12.8</version.net.sf.saxon><!-- from 12.4 -->
<version.org.apache.pdfbox>3.0.7</version.org.apache.pdfbox>
<version.ch.qos.logback>1.5.32</version.ch.qos.logback><!-- from 1.5.16, 1.5.18 -->
<version.com.fasterxml.jackson.core>2.21.1</version.com.fasterxml.jackson.core><!-- from 2.17.1, 2.17.3 -->
<version.com.helger.en16931-cii2ubl>3.1.7</version.com.helger.en16931-cii2ubl><!-- from 2.3.0, 2.3.1 -->
<version.com.helger.schematron>9.1.1</version.com.helger.schematron><!-- from 8.0.0, 8.0.6 -->
<version.commons-cli>1.11.0</version.commons-cli><!-- from 1.8.0, 1.10.0 -->
<version.commons-io>2.21.0</version.commons-io><!-- from 2.16.1, 2.20.0 -->
<version.jakarta.xml.bind>4.0.5</version.jakarta.xml.bind><!-- from 4.0.2 -->
<version.net.sf.saxon>12.9</version.net.sf.saxon><!-- from 12.4, 12.8 -->
<version.org.apache.pdfbox>3.0.7</version.org.apache.pdfbox><!-- from 3.0.6 -->
<version.org.apache.xmlgraphics>2.11</version.org.apache.xmlgraphics><!-- from 2.10 -->
<version.org.codehaus.janino>3.1.12</version.org.codehaus.janino><!-- from 3.1.7 -->
<version.org.dom4j>2.1.5</version.org.dom4j><!-- from 2.1.4 -->
<version.org.glassfish.jaxb>4.0.5</version.org.glassfish.jaxb>
<version.org.dom4j>2.2.0</version.org.dom4j><!-- from 2.1.4, 2.1.5 -->
<version.org.glassfish.jaxb>4.0.7</version.org.glassfish.jaxb><!-- from 4.0.5 -->
<version.org.junit>5.13.4</version.org.junit><!-- from 5.10.2 -->
<version.org.skyscreamer>2.0-rc1</version.org.skyscreamer>
<version.org.slf4j>2.0.17</version.org.slf4j><!-- from 2.0.9, 2.0.12 -->
<version.org.verapdf>1.26.5</version.org.verapdf><!-- from 1.26.2 -->
<version.org.xmlunit>2.10.3</version.org.xmlunit><!-- from 2.10.0 -->
<version.org.verapdf>1.28.2</version.org.verapdf><!-- from 1.26.2, 1.26.5 -->
<version.org.xmlunit>2.11.0</version.org.xmlunit><!-- from 2.10.0, 2.10.3 -->
</properties>
<build>
@@ -244,7 +245,7 @@
<configuration>
<toolchains>
<jdk>
<version>11</version>
<version>17</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>

10
validator/pom.xml
View File

@@ -26,7 +26,7 @@
<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.compiler.release>11</maven.compiler.release>
<maven.compiler.release>${java.version}</maven.compiler.release>
</properties>
<dependencies>
<!-- compile dependencies -->
@@ -141,8 +141,8 @@
<!-- 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>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<!-- /ZUV -->
@@ -273,7 +273,7 @@
<configuration>
<toolchains>
<jdk>
<version>11</version>
<version>${java.version}</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>
@@ -293,7 +293,7 @@
<plugin>
<groupId>com.helger.maven</groupId>
<artifactId>ph-schematron-maven-plugin</artifactId>
<version>${version.com.helger.maven}</version>
<version>${version.com.helger.maven.schematron}</version>
<configuration>
<schematronDirectory>${basedir}/src/main/resources/schematron</schematronDirectory>
<xsltDirectory>${basedir}/src/main/resources/xslt</xsltDirectory>

6
validator/src/main/java/org/mustangproject/validator/PDFValidator.java
View File

@@ -113,7 +113,7 @@ public class PDFValidator extends Validator {
ItemDetails itemDetails = ItemDetails.fromValues(pdfFilename);
inputStream.mark(Integer.MAX_VALUE);
processorResult = processor.process(itemDetails, inputStream);
pdfReport = processorResult.getValidationResult().toString().replaceAll(
pdfReport = processorResult.getValidationResults().get(0).toString().replaceAll(
"<\\?xml version=\"1\\.0\" encoding=\"utf-8\"\\?>",
""
);
@@ -330,11 +330,11 @@ public class PDFValidator extends Validator {
//end
final long endTime = Calendar.getInstance().getTimeInMillis();
if (!processorResult.getValidationResult().isCompliant()) {
if (!processorResult.getValidationResults().get (0).isCompliant()) {
context.setInvalid();
}
PDFAFlavour pdfaFlavourFromValidationResult = processorResult.getValidationResult().getPDFAFlavour();
PDFAFlavour pdfaFlavourFromValidationResult = processorResult.getValidationResults().get (0).getPDFAFlavour();
if (Arrays.stream(PDF_A_3_FLAVOURS)
.noneMatch(pdfaFlavourFromValidationResult::equals)) {
context.addResultItem(

4
validator/src/main/java/org/mustangproject/validator/ZUGFeRDValidator.java
View File

@@ -24,15 +24,15 @@ import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
import org.mustangproject.util.ByteArraySearcher;
import org.mustangproject.XMLTools;
import org.mustangproject.util.ByteArraySearcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.base.io.stream.StreamHelper;
import jakarta.xml.bind.DatatypeConverter;