Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use upstream #644

Open
wants to merge 86 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
8345e04
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
46fb646
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
4f28c09
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
f6a6e9c
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
733b3bc
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
26c0b80
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
1a8ad9d
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
96f0de6
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
ba37854
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
88b1730
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
d8bb3ce
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
4154bc5
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
2054940
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
8476bd7
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
be0cc8e
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
0259ae7
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
9002394
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
f2e7480
Delete validator/src/main/resources/schema directory
Adrian-Devries Jan 3, 2025
bbfcca9
Delete validator/src/main/resources/schematron directory
Adrian-Devries Jan 3, 2025
c752cb7
Delete validator/src/main/resources/xslt directory
Adrian-Devries Jan 3, 2025
a0f6bb0
Delete validator/src/main/resources/ZUGFeRDSchematronStylesheetXSLT1.xsl
Adrian-Devries Jan 3, 2025
81b24ab
Delete validator/src/main/resources/ZUGFeRDSchematronStylesheetXSLT2.xsl
Adrian-Devries Jan 3, 2025
c58a9b6
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
fcb28df
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
715b1d2
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
7edfdf3
Delete library/src/main/resources/FreeSans.ttf
Adrian-Devries Jan 3, 2025
b6dc238
Delete library/src/main/resources/xrechnung-viewer.css
Adrian-Devries Jan 3, 2025
0cd7337
Delete library/src/main/resources/xrechnung-viewer.js
Adrian-Devries Jan 3, 2025
a117083
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 3, 2025
aa29ee5
Delete library/src/main/resources/stylesheets/l10n directory
Adrian-Devries Jan 3, 2025
708b55f
Delete library/src/main/resources/stylesheets/xr-pdf/lib directory
Adrian-Devries Jan 3, 2025
b90f388
Delete library/src/main/resources/stylesheets/1001.xsl
Adrian-Devries Jan 3, 2025
3b0642c
Delete library/src/main/resources/stylesheets/1153.xsl
Adrian-Devries Jan 3, 2025
5e9cd3d
Delete library/src/main/resources/stylesheets/2005.xsl
Adrian-Devries Jan 3, 2025
ea5ce09
Delete library/src/main/resources/stylesheets/3166.xsl
Adrian-Devries Jan 3, 2025
eba7bfb
Delete library/src/main/resources/stylesheets/4217.xsl
Adrian-Devries Jan 3, 2025
1910f47
Delete library/src/main/resources/stylesheets/4451.xsl
Adrian-Devries Jan 3, 2025
48f9691
Delete library/src/main/resources/stylesheets/4461.xsl
Adrian-Devries Jan 3, 2025
45d1e65
Delete library/src/main/resources/stylesheets/5189.xsl
Adrian-Devries Jan 3, 2025
338a2e0
Delete library/src/main/resources/stylesheets/5305.xsl
Adrian-Devries Jan 3, 2025
817cc2a
Delete library/src/main/resources/stylesheets/6523.xsl
Adrian-Devries Jan 3, 2025
b8ced1e
Delete library/src/main/resources/stylesheets/7143.xsl
Adrian-Devries Jan 3, 2025
28b80cc
Delete library/src/main/resources/stylesheets/7161.xsl
Adrian-Devries Jan 3, 2025
9985cc8
Delete library/src/main/resources/stylesheets/EAS.xsl
Adrian-Devries Jan 3, 2025
a6235a8
Delete library/src/main/resources/stylesheets/UNECE-RE-20.xsl
Adrian-Devries Jan 3, 2025
a0f9e97
Delete library/src/main/resources/stylesheets/UNECE-RE-21.xsl
Adrian-Devries Jan 3, 2025
1c59edd
Delete library/src/main/resources/stylesheets/VATEX.xsl
Adrian-Devries Jan 3, 2025
e54200a
Delete library/src/main/resources/stylesheets/ZUGFeRD_1p0_c1p0_s1p0.xslt
Adrian-Devries Jan 3, 2025
387af91
Delete library/src/main/resources/stylesheets/cii-xr.xsl
Adrian-Devries Jan 3, 2025
2c055eb
Delete library/src/main/resources/stylesheets/common-xr.xsl
Adrian-Devries Jan 3, 2025
203aa1a
Delete library/src/main/resources/stylesheets/functions.xsl
Adrian-Devries Jan 3, 2025
7a84b9c
Delete library/src/main/resources/stylesheets/ubl-creditnote-xr.xsl
Adrian-Devries Jan 3, 2025
7d08f64
Delete library/src/main/resources/stylesheets/ubl-invoice-xr.xsl
Adrian-Devries Jan 3, 2025
e4273b5
Delete library/src/main/resources/stylesheets/xr-content.xsl
Adrian-Devries Jan 3, 2025
ceab4bc
Delete library/src/main/resources/stylesheets/xr-mapping.xsl
Adrian-Devries Jan 3, 2025
6738e79
Delete library/src/main/resources/stylesheets/xr-pdf.xsl
Adrian-Devries Jan 3, 2025
0fb6166
Delete library/src/main/resources/stylesheets/xrechnung-html.de.ids.xsl
Adrian-Devries Jan 3, 2025
cfba03b
Delete library/src/main/resources/stylesheets/xrechnung-html.xsl
Adrian-Devries Jan 3, 2025
68c9cf2
Delete validator/src/main/resources/zugferd2p0_extended.sch
Adrian-Devries Jan 3, 2025
ad87e55
Delete validator/src/main/resources/zugferd2p0_en16931.sch
Adrian-Devries Jan 3, 2025
0712e63
Delete validator/src/main/resources/zugferd2p0_basicwl_minimum.sch
Adrian-Devries Jan 3, 2025
d820334
Delete validator/src/main/resources/iso_svrl_for_xslt1.xsl
Adrian-Devries Jan 3, 2025
c8ea87d
Delete validator/src/main/resources/iso_schematron_skeleton_for_xslt1…
Adrian-Devries Jan 3, 2025
a113449
Delete validator/src/main/resources/iso_schematron_message.xsl
Adrian-Devries Jan 3, 2025
307644f
Delete validator/src/main/resources/iso_dsdl_include.xsl
Adrian-Devries Jan 3, 2025
73b5437
Delete validator/src/main/resources/iso_abstract_expand.xsl
Adrian-Devries Jan 3, 2025
ab6a698
Delete validator/src/main/resources/ZUGFeRD_1p0.sch
Adrian-Devries Jan 3, 2025
da7747e
Add files via upload
Adrian-Devries Jan 4, 2025
2626434
Add files via upload
Adrian-Devries Jan 4, 2025
26802fd
Add files via upload
Adrian-Devries Jan 4, 2025
17be733
Add files via upload
Adrian-Devries Jan 4, 2025
28c17ea
Add files via upload
Adrian-Devries Jan 4, 2025
cd9285a
Add files via upload
Adrian-Devries Jan 4, 2025
a7879d3
Add files via upload
Adrian-Devries Jan 4, 2025
5e3cab6
Add files via upload
Adrian-Devries Jan 4, 2025
774d1ad
Delete library/src/main/java/org/mustangproject/Exceptions/Arithmetri…
Adrian-Devries Jan 4, 2025
95a882b
Add files via upload
Adrian-Devries Jan 4, 2025
41dd1c5
Add files via upload
Adrian-Devries Jan 4, 2025
aabb671
Add files via upload
Adrian-Devries Jan 4, 2025
0a83721
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 4, 2025
eb56922
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 4, 2025
6052293
Apply use upstream rule and keep tabsize rule
Adrian-Devries Jan 4, 2025
44c1b27
Update some dependencies
Adrian-Devries Jan 6, 2025
5e33a0c
Fix typo
Adrian-Devries Jan 6, 2025
658605a
Fix typo
Adrian-Devries Jan 6, 2025
2509098
Apply changes from #645 and from #648
Adrian-Devries Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
210 changes: 73 additions & 137 deletions Mustang-CLI/pom.xml
Original file line number Diff line number Diff line change
@@ -1,164 +1,132 @@
<?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">
<?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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.mustangproject</groupId>
<artifactId>core</artifactId>
<version>2.15.3-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.15.3-SNAPSHOT</version>
<name>e-invoices commandline tool, allowing to create(embed), split and validate Factur-X/ZUGFeRD files. Validation should also work for XRechnung/CII.</name>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
<developers>
<developer>
<name>Jochen Stärk</name>
<email>[email protected]</email>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
</developer>
</developers>
<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>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
<groupId>org.mustangproject</groupId>
<artifactId>validator</artifactId>
<version>2.15.3-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
-->
<groupId>${project.groupId}</groupId>
<artifactId>library</artifactId>
<version>${project.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
<dependency><!-- apache commons cli to parse command line -->
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.8.0</version>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>validator</artifactId>
<version>${project.version}</version>
</dependency>


<!-- logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.13</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.5.13</version>
</dependency>
<dependency>
<!-- This library is needed so that logback stderr output is sent to, well, stderr, otherwise it lands in stdout -->
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.12</version>
</dependency>
<!-- end of logging -->

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version>
<scope>test</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.10.2</version>
<scope>test</scope>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
<!-- for directory validation: -->
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.10.0</version>
<artifactId>xmlunit-assertj</artifactId>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj</artifactId>
<version>2.10.0</version>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>

<!-- /directory validation: -->

<!-- test dependencies -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>


</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<!-- mvn help:effective-pom will otherwise tell it just defaults
to 2.3.2 - which does not release in the maven repo, and neither shows any
error message :-( -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<runOrder>alphabetical</runOrder>
</configuration>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<!-- allow getImplementationVersion for the pom.xml -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>

</archive>
<usedDependencies>
<dependency>ch.qos.logback:logback-classic</dependency>
<dependency>ch.qos.logback:logback-core</dependency>
<dependency>org.codehaus.janino:janino</dependency>
<dependency>org.slf4j:slf4j-simple</dependency>
</usedDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<mainClass>org.mustangproject.commandline.main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.3</version>
<configuration>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.mustangproject.commandline.Main</mainClass>
<mainClass>${project.groupId}.commandline.Main</mainClass>
</transformer>
</transformers>
<minimizeJar>false</minimizeJar>
Expand Down Expand Up @@ -201,18 +169,20 @@
</goals>
<configuration>
<artifactSet>
<excludes />
<excludes/>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile> <!-- enforce building binaries with Java 1.8 for Maven Central, otherwise using them e.g. as jar will
throw a version exception, triggered automatically on mvn release:release (hopefully) and requires an according
~/.m2/toolchains.xml file, @see doc/development_documentation.md -->
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
Expand All @@ -225,43 +195,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<goals>
<goal>toolchain</goal>
</goals>
</execution>
</executions>
<configuration>
<toolchains>
<jdk>
<version>11</version>
<vendor>adopt</vendor>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
<developers>
<developer>
<name>Jochen Stärk</name>
<email>[email protected]</email>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
</developer>
</developers>
</project>
Loading