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

Revert "Merge pull request #1067 from phax/java17-base"

Browse Source 
This reverts commit f6b6c0a36e, reversing
changes made to d8313dae20.
This commit is contained in:
Jochen Stärk
2026-05-07 13:24:02 +02:00
parent f6b6c0a36e
commit 42df52275d
15 changed files with 73 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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>${java.version}</maven.compiler.release>
<maven.compiler.release>11</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip><!-- do deploy to maven central, parent project does not and inherits -->
</properties>
<dependencies>
@@ -149,12 +149,6 @@
<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>
@@ -175,8 +169,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>${java.version}</source>
<target>${java.version}</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
<plugin>
@@ -337,7 +331,7 @@
<configuration>
<toolchains>
<jdk>
<version>${java.version}</version>
<version>11</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.diagnostics.error.list.ErrorList;
import com.helger.commons.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,13 +551,9 @@ public class ZUGFeRDInvoiceImporter {
NodeList lineDueNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
BigDecimal duePayableAmount = null;
if (lineDueNodes.getLength() > 0) {
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);
}
duePayableAmount = new BigDecimal(XMLTools.trimOrNull(lineDueNodes.item(0)));
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.base.io.stream.StreamHelper;
import com.helger.commons.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,8 +335,10 @@ 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,8 +62,10 @@ 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,10 +30,8 @@ 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;
@@ -44,7 +42,6 @@ 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,8 +81,10 @@ 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();
}
@@ -132,8 +134,10 @@ 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();
}
@@ -247,8 +251,10 @@ 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,7 +309,9 @@ 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"));
@@ -357,7 +359,7 @@ public class ZF2PushTest extends TestCase {
/***
* you can activate intra community supply on item level
* you can activate intra community suppliy on item level
*/
public void testIntraCommunitySupplyItemExport() {