diff --git a/.gitignore b/.gitignore
index 23b183e..1f05b8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,6 @@ xrechnung
 .DS_Store
 andre*-simple.xml
 somePrefix*.xml
-zz
 
 # 2.0 stuff
 api/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 802455f..79f360f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,14 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## 1.6.2 - 2026-02-17
-
-### Changed
-
-- (BUILD) [GitHub #173]( https://github.com/itplr-kosit/validator/issues/173) The JAR files now contain details on the used third-party component licenses. Thanks to @cech12
-- (BUILD) [GitHub #169](https://github.com/itplr-kosit/validator/issues/169) The `.zip` file created from `maven-assembly-plugin` now contains the correct xml-resolver dependencies. Thanks to @landrix for pointing that out
-- (BUILD) [#179](https://projekte.kosit.org/kosit/validator/-/issues/179) Updated all dependencies to the latest suitable versions
-
 ## 1.6.1 - 2026-02-05
 
 ### Changed
diff --git a/NOTICE b/NOTICE
index 669ba21..a1ed12f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,29 +1,5 @@
 KoSIT XML Validator
-Copyright 2017-2026 Koordinierungsstelle für IT-Standards (KoSIT)
+Copyright 2017-2025 Koordinierungsstelle für IT-Standards (KoSIT)
 
 This product includes software developed by
 Koordinierungsstelle für IT-Standards (<https://xeinkauf.de/>).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under Apache 2.0
-
-This product includes software developed at
-Fusesource (http://fusesource.github.io/jansi/).
-Licensed under Apache 2.0
-
-This product includes software developed at
-Remko Popma (https://picocli.info/).
-Licensed under Apache 2.0
-
-This product includes software developed at
-Saxonica (https://github.com/Saxonica/Saxon-HE).
-Licensed under MPL 2.0
-
-This product includes software developed at
-Eclipse Foundation (https://github.com/eclipse-ee4j/jaxb-ri).
-Licensed under EDL 1.0
-
-This product includes software developed at
-QOS.ch (https://www.slf4j.org/).
-Licensed under MIT
diff --git a/pom.xml b/pom.xml
index 8a3e450..b1ea07c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.kosit</groupId>
     <artifactId>validator</artifactId>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.1</version>
 
     <description>KoSIT XML Validator against XSD and Schematron based on defined scenarios.</description>
     <developers>
@@ -38,18 +38,17 @@
     </developers>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.assertj>3.27.7</version.assertj>
-        <version.commons-io>2.21.0</version.commons-io>
-        <version.commons-lang>3.20.0</version.commons-lang>
+        <version.assertj>3.27.3</version.assertj>
+        <version.commons-io>2.20.0</version.commons-io>
+        <version.commons-lang>3.18.0</version.commons-lang>
         <version.jacoco>0.8.13</version.jacoco>
-        <version.jaxb-api>4.0.4</version.jaxb-api>
-        <version.jaxb-impl>4.0.6</version.jaxb-impl>
+        <version.jaxb-api>4.0.2</version.jaxb-api>
+        <version.jaxb-impl>4.0.5</version.jaxb-impl>
         <version.lombok>1.18.42</version.lombok>
-        <version.mockito>5.21.0</version.mockito>
+        <version.mockito>4.11.0</version.mockito>
         <version.owasp-dependency-check>12.1.8</version.owasp-dependency-check>
-        <!-- 6.0.0 requires Java 17+ -->
-        <version.rest-assured>5.5.7</version.rest-assured>
-        <version.saxon-he>12.9</version.saxon-he>
+        <version.rest-assured>5.5.5</version.rest-assured>
+        <version.saxon-he>12.8</version.saxon-he>
         <version.slf4j>2.0.17</version.slf4j>
         <version.jaxb-maven-plugin>4.0.11</version.jaxb-maven-plugin>
     </properties>
@@ -206,33 +205,6 @@
                 </configuration>
             </plugin>
 
-
-            <plugin>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>3.4.0</version>
-              <executions>
-                <execution>
-                  <id>copy-license-notice</id>
-                  <phase>process-resources</phase>
-                  <goals>
-                    <goal>copy-resources</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
-                    <resources>
-                      <resource>
-                        <directory>${project.basedir}</directory>
-                        <includes>
-                          <include>NOTICE</include>
-                        </includes>
-                      </resource>
-                    </resources>
-                    <overwrite>true</overwrite>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -317,39 +289,14 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>de.kosit.validationtool.cmd.CommandLineApplication</mainClass>
                                 </transformer>
-                                
-                                <!--
-                                  Some open source producers (including the Apache Software Foundation) include a copy of their 
-                                  license in the META-INF directory. These are conventionally named either LICENSE,LICENSE.txt 
-                                  or LICENSE.md. When merging these dependencies, adding these resources may cause confusion.
-                                  The ApacheLicenseResourceTransformer ensures that duplicate licenses (named according to this
-                                  convention) are not merged.
-                                  Technically it simply avoids adding them into the final JAR.
-                                  We don't need the detailed licensed in the shaded JAR.
-                                -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
-                                
-                                <!--
-                                  Some licenses (including the Apache License, Version 2) require that notices are preserved by 
-                                  downstream distributors. ApacheNoticeResourceTransformer automates the assembly of an
-                                  appropriate NOTICE.
-                                  Technically it merges all NOTICE files together
-                                -->
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-                                    <addHeader>false</addHeader>
-                                </transformer>
                             </transformers>
                             <filters>
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
-                                        <!-- E.g. MANIFEST.MF -->
-                                        <exclude>META-INF/*.MF</exclude>
-                                        <!-- Required for JAR signing artefacts -->
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
-                                        <!-- We're breaking the Java module system -->
                                         <exclude>**/module-info.class</exclude>
                                     </excludes>
                                 </filter>
@@ -744,7 +691,7 @@
     <scm>
         <connection>scm:git:https://github.com/itplr-kosit/validator.git</connection>
         <developerConnection>scm:git:https://projekte.kosit.org/kosit/validator.git</developerConnection>
-        <tag>release/1.6.x</tag>
+        <tag>v1.6.1</tag>
         <url>https://github.com/itplr-kosit/validator</url>
     </scm>
 
diff --git a/src/assembly/assembly-dist.xml b/src/assembly/assembly-dist.xml
index 5d27120..d091b08 100644
--- a/src/assembly/assembly-dist.xml
+++ b/src/assembly/assembly-dist.xml
@@ -32,6 +32,7 @@
             <outputDirectory>libs</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
             <scope>runtime</scope>
+            <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
         </dependencySet>
     </dependencySets>
 
diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java
index ca839dd..08ef4b1 100644
--- a/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java
+++ b/src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java
@@ -22,12 +22,18 @@ public class StringTrimAdapter extends XmlAdapter<String, String> {
 
     @Override
     public String unmarshal(final String v) {
-        return trim(v);
+        if (v == null) {
+            return null;
+        }
+        return v.trim();
     }
 
     @Override
     public String marshal(final String v) {
-        return trim(v);
+        if (v == null) {
+            return null;
+        }
+        return v.trim();
     }
 
     public static String trim(final String v) {
diff --git a/src/main/model/binding/global.xjb b/src/main/model/binding/global.xjb
index ae2d603..cd2a512 100644
--- a/src/main/model/binding/global.xjb
+++ b/src/main/model/binding/global.xjb
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-  ~ Copyright 2017-2026  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -64,4 +64,4 @@
         </jaxb:schemaBindings>
     </jaxb:bindings>
 
-</jaxb:bindings>
+</jaxb:bindings>
\ No newline at end of file
diff --git a/src/main/resources/LICENSE.validator b/src/main/resources/LICENSE.validator
deleted file mode 100644
index d9a10c0..0000000
--- a/src/main/resources/LICENSE.validator
+++ /dev/null
@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/src/main/resources/app-info.properties b/src/main/resources/app-info.properties
index fa6be89..d8e3ace 100644
--- a/src/main/resources/app-info.properties
+++ b/src/main/resources/app-info.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2026  Koordinierungsstelle für IT-Standards (KoSIT)
+# Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties
index 66281f8..cd77b47 100644
--- a/src/main/resources/simplelogger.properties
+++ b/src/main/resources/simplelogger.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2017-2026  Koordinierungsstelle für IT-Standards (KoSIT)
+# Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,3 +32,21 @@ org.slf4j.simpleLogger.showLogName=false
 # Defaults to false.
 org.slf4j.simpleLogger.showShortLogName=false
 org.slf4j.simpleLogger.levelInBrackets=true
+#
+# Licensed to the Koordinierungsstelle f�r IT-Standards (KoSIT) under
+# one or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  KoSIT licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
diff --git a/src/main/resources/transform/identity.xsl b/src/main/resources/transform/identity.xsl
index 4ddc79e..fc4ff01 100644
--- a/src/main/resources/transform/identity.xsl
+++ b/src/main/resources/transform/identity.xsl
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2017-2026  Koordinierungsstelle für IT-Standards (KoSIT)
+  ~ Copyright 2017-2022  Koordinierungsstelle für IT-Standards (KoSIT)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,6 +13,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
     <xsl:template match="element()">
         <xsl:copy>
@@ -24,4 +24,5 @@
     <xsl:template match="attribute()|text()|comment()|processing-instruction()">
         <xsl:copy/>
     </xsl:template>
-</xsl:stylesheet>
+
+</xsl:stylesheet>
\ No newline at end of file