Merge remote-tracking branch 'origin/master'

.gitignore

@@ -38,7 +38,7 @@ src/generated
 .settings
 .vscode
 *.code-workspace
-
+*.xpr
 # Testing stuff
 xrechnung
 

CHANGELOG.md

@@ -5,16 +5,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.4.1
+
+### Fixed
+
+- Allow more than 3 customLevel elements in scenarios (see xrechnung
+  configuration [ issue 49](https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/49))
+- Remove saxon signature from java8 uber-jar (see [67](https://github.com/itplr-kosit/validator/issues/67))
+
 ## 1.4.0
 
 ### Fixed
-- date conversion when using [ConfigurationBuilder#date(Date)](https://github.com/itplr-kosit/validator/blob/d7beb1040418ae5cbeb9427532fd87482f55756c/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java#L109)
+
+- date conversion when
+  using [ConfigurationBuilder#date(Date)](https://github.com/itplr-kosit/validator/blob/d7beb1040418ae5cbeb9427532fd87482f55756c/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java#L109)
 - [CLI] [#51](https://github.com/itplr-kosit/validator/issues/51) Suffix of report xml is missing
 - [#53](https://github.com/itplr-kosit/validator/issues/53) Fix copyright and licensing information
-- [#56](https://github.com/itplr-kosit/validator/issues/56) `namespace` element content needs trimming 
+- [#56](https://github.com/itplr-kosit/validator/issues/56) `namespace` element content needs trimming
-- [DAEMON] [#57](https://github.com/itplr-kosit/validator/issues/57) Reading large inputs correctly  
+- [DAEMON] [#57](https://github.com/itplr-kosit/validator/issues/57) Reading large inputs correctly
 
 ### Added
+
 - read saxon XdmNode with InputFactory
 - [CLI] custom output without the various log messages
 - [CLI] options to set the log level (`-X` = full debug output, `-l <level>` set a specific level)

pom.xml

@@ -21,7 +21,7 @@
     <name>KoSIT XML Prüftool Implementierung</name>
 
     <groupId>de.kosit</groupId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
 
     <artifactId>validationtool</artifactId>
     <description>KoSIT XML Validator against XSD and Schematron based on defined scenarios.</description>
@@ -273,11 +273,18 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>de.kosit.validationtool.cmd.CommandLineApplication</mainClass>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
-                                    <!-- Signatur von saxon entfernen - sonst läuft die standalone-anwendung nicht -->
-                                    <resource>META-INF/TE-050AC.SF</resource>
-                                </transformer>
                             </transformers>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>**/module-info.class</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                         </configuration>
                     </execution>
                 </executions>

src/main/model/xsd/scenarios.xsd

@@ -126,7 +126,7 @@
     <xs:complexType name="CreateReportType">
         <xs:sequence>
             <xs:element ref="s:resource" />
-            <xs:element maxOccurs="3" minOccurs="0" name="customLevel" type="s:CustomErrorLevel" />
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="customLevel" type="s:CustomErrorLevel" />
         </xs:sequence>
     </xs:complexType>