Merge branch 'master' into POM-Cleanup

This commit is contained in:
David M
2024-09-14 14:30:39 +02:00
35 changed files with 3536 additions and 166 deletions

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.mustangproject</groupId>
<artifactId>core</artifactId>
<version>2.13.1-SNAPSHOT</version>
<version>2.14.0-SNAPSHOT</version>
</parent>
<artifactId>Mustang-CLI</artifactId>

View File

@@ -722,9 +722,6 @@ public class Main {
((ZUGFeRDExporterFromPDFA) ze).ignorePDFAErrors();
}
}
for (FileAttachment attachment : attachments) {
((ZUGFeRDExporterFromA3) ze).attachFile(attachment.getFilename(), attachment.getData(), attachment.getMimetype(), attachment.getRelation());
}
ze.load(pdfName);
ze.setProducer("Mustang-cli")
@@ -737,6 +734,10 @@ public class Main {
ze.setXML(Files.readAllBytes(Paths.get(xmlName)));
for (FileAttachment attachment : attachments) {
ze.attachFile(attachment.getFilename(), attachment.getData(), attachment.getMimetype(), attachment.getRelation());
}
ze.export(outName);
System.out.println("Written to " + outName);