From 53b7282fde6b1219c00c920793c6643acf3c40e0 Mon Sep 17 00:00:00 2001
From: Philip Helger <philip@helger.com>
Date: Mon, 26 Aug 2024 13:30:00 +0200
Subject: [PATCH] Moved setters from AS4XServletHandler to AS4RequestHandler;
 #265

---
 phase4-bdew-client/findbugs-exclude.xml       |   5 +-
 phase4-bdew-client/pom.xml                    |   5 +-
 phase4-bdew-client/src/etc/javadoc.css        |   5 +-
 .../AbstractBDEWDecryptParameterModifier.java |   5 +-
 .../phase4/bdew/Phase4BDEWException.java      |   5 +-
 .../bdew/Phase4BDEWHttpClientSettings.java    |   5 +-
 .../helger/phase4/bdew/Phase4BDEWSender.java  |   5 +-
 .../bdew/MainPhase4BDEWSenderExample.java     |   5 +-
 .../Phase4BDEWHttpClientSettingsTest.java     |   5 +-
 .../java/com/helger/phase4/bdew/SPITest.java  |   5 +-
 .../phase4/bdew/crypto/BrainpoolFuncTest.java |   5 +-
 .../phase4/bdew/crypto/SecP256R1FuncTest.java |   5 +-
 .../external/examples/base-example.xml        |  18 +
 .../test/resources/simplelogger.properties    |   5 +-
 phase4-cef-client/findbugs-exclude.xml        |   2 +-
 phase4-cef-client/pom.xml                     |   2 +-
 phase4-cef-client/src/etc/javadoc.css         |   2 +-
 .../helger/phase4/cef/Phase4CEFException.java |   2 +-
 .../cef/Phase4CEFHttpClientSettings.java      |   2 +-
 .../helger/phase4/cef/Phase4CEFSender.java    |   2 +-
 .../MainCEFeInvoicingConnectivityTest.java    |   2 +-
 .../phase4/cef/MainPhase4CEFSenderToop.java   |   2 +-
 .../cef/Phase4CEFHttpClientSettingsTest.java  |   2 +-
 .../java/com/helger/phase4/cef/SPITest.java   |   2 +-
 .../src/test/resources/application.properties |   2 +-
 .../external/examples/base-example.xml        |  18 +
 .../test/resources/simplelogger.properties    |   2 +-
 .../findbugs-exclude.xml                      |   2 +-
 phase4-dbnalliance-client/pom.xml             |   2 +-
 phase4-dbnalliance-client/src/etc/javadoc.css |   2 +-
 .../Phase4DBNAllianceException.java           |   2 +-
 .../Phase4DBNAllianceHttpClientSettings.java  |   2 +-
 .../dbnalliance/Phase4DBNAllianceSender.java  |   2 +-
 .../MainPhase4DBNAllianceSenderExample.java   |   2 +-
 ...ase4DBNAllianceHttpClientSettingsTest.java |   2 +-
 .../helger/phase4/dbnalliance/SPITest.java    |   2 +-
 .../external/examples/base-example.xml        |  18 +
 .../test/resources/simplelogger.properties    |   2 +-
 phase4-dynamic-discovery/findbugs-exclude.xml |   2 +-
 phase4-dynamic-discovery/pom.xml              |   2 +-
 phase4-dynamic-discovery/src/etc/javadoc.css  |   2 +-
 .../AS4EndpointDetailProviderBDXR.java        |   2 +-
 .../AS4EndpointDetailProviderBDXR2.java       |   2 +-
 .../AS4EndpointDetailProviderConstant.java    |   2 +-
 .../AS4EndpointDetailProviderPeppol.java      |   2 +-
 .../IAS4EndpointDetailProvider.java           |   2 +-
 .../dynamicdiscovery/Phase4SMPException.java  |   2 +-
 .../phase4/dynamicdiscovery/SPITest.java      |   2 +-
 phase4-entsog-client/findbugs-exclude.xml     |   5 +-
 phase4-entsog-client/pom.xml                  |   5 +-
 phase4-entsog-client/src/etc/javadoc.css      |   5 +-
 .../phase4/entsog/Phase4ENTSOGException.java  |   5 +-
 .../Phase4ENTSOGHttpClientSettings.java       |   5 +-
 .../phase4/entsog/Phase4ENTSOGSender.java     |   5 +-
 .../com/helger/phase4/entsog/AS4TestRule.java |   5 +-
 .../helger/phase4/entsog/Issue118Test.java    |   5 +-
 .../Phase4ENTSOGHttpClientSettingsTest.java   |   5 +-
 .../com/helger/phase4/entsog/SPITest.java     |   5 +-
 phase4-euctp-client/findbugs-exclude.xml      |   5 +-
 phase4-euctp-client/pom.xml                   |   5 +-
 phase4-euctp-client/src/etc/javadoc.css       |   5 +-
 .../AbstractEuCtpUserMessageBuilder.java      |  16 +
 .../phase4/euctp/EuCtpPullRequestBuilder.java |  16 +
 .../phase4/euctp/Phase4EuCtpException.java    |   5 +-
 .../euctp/Phase4EuCtpHttpClientSettings.java  |   5 +-
 .../phase4/euctp/Phase4EuCtpSender.java       |   5 +-
 .../euctp/MainPhase4EuCtpSenderExample.java   |   5 +-
 .../Phase4EuCtpHttpClientSettingsTest.java    |   5 +-
 .../test/resources/simplelogger.properties    |   5 +-
 phase4-eudamed-client/findbugs-exclude.xml    |   2 +-
 phase4-eudamed-client/pom.xml                 |   2 +-
 phase4-eudamed-client/src/etc/javadoc.css     |   2 +-
 .../eudamed/Phase4EudamedException.java       |   2 +-
 .../Phase4EudamedHttpClientSettings.java      |   2 +-
 .../phase4/eudamed/Phase4EudamedSender.java   |   2 +-
 .../Phase4EudamedHttpClientSettingsTest.java  |   2 +-
 .../com/helger/phase4/eudamed/SPITest.java    |   2 +-
 .../test/resources/simplelogger.properties    |   2 +-
 .../com/helger/phase4/dump/AS4DumpReader.java |  42 +--
 .../phase4/incoming/AS4RequestHandler.java    | 182 ++++++++--
 .../sender/EAS4UserMessageSendResult.java     |  16 +
 .../phase4/servlet/AS4XServletHandler.java    | 328 +-----------------
 .../IAS4ServletRequestHandlerCustomizer.java  |  62 ++++
 .../external/schemas/ebbp-signals-2.0.4.xsd   |  18 +
 .../schemas/ebms-header-3_0-200704.xsd        |  18 +
 .../resources/external/schemas/soap11.xsd     |  38 +-
 .../resources/external/schemas/soap12.xsd     |  26 +-
 .../external/attachment/ShortXML.xml          |   2 +-
 .../external/soap11test/BundledMessage.xml    |   2 +-
 .../external/soap11test/EmptyMessaging.xml    |   2 +-
 .../external/soap11test/ErrorMessage.xml      |   2 +-
 .../soap11test/MessageInfoIDMissing.xml       |   2 +-
 .../MessageInfoImaginaryTimestamp.xml         |   2 +-
 .../soap11test/MessageInfoMissing.xml         |   2 +-
 .../external/soap11test/NoMessaging.xml       |   2 +-
 .../external/soap11test/PullRequest.xml       |   2 +-
 .../external/soap11test/ReceiptMessage.xml    |   2 +-
 .../soap11test/UserMessage-no-soap.xml        |   2 +-
 .../external/soap11test/UserMessage.xml       |   2 +-
 .../soap11test/UserMessageResponse.xml        |   2 +-
 .../external/soap12test/PullRequest12.xml     |   2 +-
 .../external/soap12test/UserMessage12.xml     |   2 +-
 .../UserMessageWithCompressedPayload12.xml    |   2 +-
 .../external/soap12test/test-2023-03-15.xml   |  18 +
 .../external/examples/AU Invoice.xml          |  18 +
 .../external/examples/Allowance-example.xml   |  18 +
 .../examples/DespatchAdvice_Example.xml       |  18 +
 .../examples/InvoiceResponse_Example.xml      |  18 +
 .../examples/Singapore invoice valid 1.xml    |  18 +
 .../external/examples/Vat-category-S.xml      |  18 +
 .../external/examples/at-gov-peppol-ubl.xml   |  31 +-
 .../external/examples/at-oebb-peppol-ubl.xml  |  31 +-
 .../examples/base-creditnote-correction.xml   |  18 +
 .../external/examples/base-example.xml        |  18 +
 .../examples/base-negative-inv-correction.xml |  18 +
 .../resources/external/examples/base-sbdh.xml |  18 +
 .../external/examples/cii/cii-en-qvalia.xml   |  18 +
 .../external/examples/cii/cii-en.xml          |  18 +
 .../examples/example-ubl-en-qvalia.xml        |  18 +
 .../test/resources/external/examples/mini.xml |  18 +
 .../end-user-statistics-reporting-empty.xml   |  18 +
 .../transaction-statistics-minimal.xml        |  18 +
 .../external/examples/test-order.xml          |  18 +
 .../external/examples/ubl-creditnote-en.xml   |  18 +
 .../external/examples/ubl-invoice-en.xml      |  18 +
 .../external/examples/vat-category-O.xml      |  18 +
 .../external/examples/vat-category-Z.xml      |  18 +
 .../examples/xrechnung-1.2-cii-example1.xml   |  18 +
 .../examples/xrechnung-2.0.0-ubl-inv.xml      |  18 +
 .../examples/xrechnung-2.3.1-ubl-inv.xml      |  18 +
 .../zre/Verifizierungs_Rechnung_PEPPOL.xml    |  18 +
 .../findbugs-exclude.xml                      |   2 +-
 phase4-peppol-server-webapp/pom.xml           |   2 +-
 .../src/etc/javadoc.css                       |   2 +-
 .../servlet/Phase4PeppolWebAppListener.java   |   2 +-
 .../StoringPeppolIncomingSBDHandlerSPI.java   |   2 +-
 .../StoringServletMessageProcessorSPI.java    |   2 +-
 .../peppol/server/storage/StorageHelper.java  |   2 +-
 .../src/main/resources/application.properties |   2 +-
 .../src/main/resources/log4j2.xml             |   2 +-
 .../src/main/webapp/WEB-INF/web.xml           |   2 +-
 .../src/main/webapp/index.html                |   2 +-
 .../helger/phase4/peppol/server/SPITest.java  |   2 +-
 .../standalone/JettyStopPHASE4PEPPOL.java     |   2 +-
 .../standalone/RunInJettyPHASE4PEPPOL.java    |   2 +-
 phase4-profile-bdew/pom.xml                   |   4 +-
 phase4-profile-bdew/src/etc/javadoc.css       |   4 +-
 .../bdew/AS4BDEWProfileRegistarSPI.java       |   4 +-
 .../bdew/BDEWCompatibilityValidator.java      |   4 +-
 .../helger/phase4/profile/bdew/BDEWPMode.java |   4 +-
 .../bdew/BDEWCompatibilityValidatorTest.java  |   4 +-
 .../phase4/profile/bdew/BDEWPModeTest.java    |   4 +-
 .../helger/phase4/profile/bdew/SPITest.java   |   4 +-
 .../findbugs-exclude.xml                      |   2 +-
 phase4-profile-dbnalliance/pom.xml            |   2 +-
 .../src/etc/javadoc.css                       |   2 +-
 .../AS4DBNAllianceProfileRegistarSPI.java     |   2 +-
 .../DBNAllianceCompatibilityValidator.java    |   2 +-
 .../profile/dbnalliance/DBNAlliancePMode.java |   2 +-
 ...DBNAllianceCompatibilityValidatorTest.java |   2 +-
 .../dbnalliance/DBNAlliancePModeTest.java     |   2 +-
 .../phase4/profile/dbnalliance/SPITest.java   |   2 +-
 phase4-profile-eespa/findbugs-exclude.xml     |   3 +-
 phase4-profile-eespa/pom.xml                  |   3 +-
 phase4-profile-eespa/src/etc/javadoc.css      |   3 +-
 .../eespa/AS4EESPAProfileRegistarSPI.java     |   3 +-
 .../eespa/EESPACompatibilityValidator.java    |   3 +-
 .../phase4/profile/eespa/EESPAPMode.java      |   3 +-
 .../EESPACompatibilityValidatorTest.java      |   3 +-
 .../phase4/profile/eespa/EESPAPModeTest.java  |   3 +-
 .../helger/phase4/profile/eespa/SPITest.java  |   3 +-
 phase4-profile-entsog/findbugs-exclude.xml    |   5 +-
 phase4-profile-entsog/pom.xml                 |   5 +-
 phase4-profile-entsog/src/etc/javadoc.css     |   5 +-
 .../entsog/AS4ENTSOGProfileRegistarSPI.java   |   5 +-
 .../entsog/ENTSOGCompatibilityValidator.java  |   5 +-
 .../phase4/profile/entsog/ENTSOGPMode.java    |   5 +-
 .../ENTSOGCompatibilityValidatorTest.java     |   5 +-
 .../profile/entsog/ENTSOGPModeTest.java       |   5 +-
 .../helger/phase4/profile/entsog/SPITest.java |   5 +-
 phase4-profile-euctp/findbugs-exclude.xml     |   2 +-
 phase4-profile-euctp/pom.xml                  |   2 +-
 phase4-profile-euctp/src/etc/javadoc.css      |   2 +-
 .../euctp/AS4EuCtpProfileRegistarSPI.java     |   2 +-
 .../phase4/profile/euctp/EEuCtpAction.java    |  16 +
 .../phase4/profile/euctp/EEuCtpService.java   |  16 +
 .../euctp/EuCtpCompatibilityValidator.java    |   2 +-
 .../phase4/profile/euctp/EuCtpPMode.java      |   2 +-
 .../EuCtpCompatibilityValidatorTest.java      |   2 +-
 .../phase4/profile/euctp/EuCtpPModeTest.java  |   2 +-
 .../helger/phase4/profile/euctp/SPITest.java  |   2 +-
 phase4-profile-peppol/findbugs-exclude.xml    |   2 +-
 phase4-profile-peppol/pom.xml                 |   2 +-
 phase4-profile-peppol/src/etc/javadoc.css     |   2 +-
 .../peppol/AS4PeppolProfileRegistarSPI.java   |   2 +-
 .../peppol/HttpClientUrlDownloader.java       |   2 +-
 .../profile/peppol/PeppolCRLDownloader.java   |   2 +-
 .../peppol/PeppolCompatibilityValidator.java  |   2 +-
 .../phase4/profile/peppol/PeppolPMode.java    |   2 +-
 .../Phase4PeppolHttpClientSettings.java       |   2 +-
 .../peppol/PeppolCRLDownloaderTest.java       |   2 +-
 .../PeppolCompatibilityValidatorTest.java     |   2 +-
 .../profile/peppol/PeppolPModeTest.java       |   2 +-
 .../Phase4PeppolHttpClientSettingsTest.java   |   2 +-
 .../helger/phase4/profile/peppol/SPITest.java |   2 +-
 phase4-spring-boot-demo/findbugs-exclude.xml  |   2 +-
 phase4-spring-boot-demo/pom.xml               |   2 +-
 phase4-spring-boot-demo/src/etc/javadoc.css   |   2 +-
 .../Phase4SpringbootApplication.java          |   2 +-
 .../ESBDHHandlerServiceSelector.java          |   2 +-
 ...omPeppolIncomingSBDHandlerServiceImpl.java |   2 +-
 .../service/ISBDHandlerService.java           |   2 +-
 .../service/SDBHandlerServiceLocator.java     |   2 +-
 .../springboot/servlet/ServletConfig.java     | 127 +++----
 .../CustomPeppolIncomingSBDHandlerSPI.java    |   2 +-
 .../CustomPeppolIncomingViaInterfaceSPI.java  |   2 +-
 .../src/main/resources/application.properties |   2 +-
 .../src/main/resources/log4j2.xml             |   2 +-
 .../Phase4SpringbootApplicationTests.java     |   2 +-
 .../com/helger/phase4/springboot/SPITest.java |   2 +-
 220 files changed, 1189 insertions(+), 814 deletions(-)
 create mode 100644 phase4-lib/src/main/java/com/helger/phase4/servlet/IAS4ServletRequestHandlerCustomizer.java

diff --git a/phase4-bdew-client/findbugs-exclude.xml b/phase4-bdew-client/findbugs-exclude.xml
index 8fcaffd24..dda771176 100644
--- a/phase4-bdew-client/findbugs-exclude.xml
+++ b/phase4-bdew-client/findbugs-exclude.xml
@@ -1,9 +1,6 @@
 <!--
 
-    Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-    gregor[dot]scholtysik[at]soptim[dot]de
-
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/pom.xml b/phase4-bdew-client/pom.xml
index 26228cfdf..d49067158 100644
--- a/phase4-bdew-client/pom.xml
+++ b/phase4-bdew-client/pom.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-    gregor[dot]scholtysik[at]soptim[dot]de
-
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/etc/javadoc.css b/phase4-bdew-client/src/etc/javadoc.css
index a5861c203..dffbd1ec1 100644
--- a/phase4-bdew-client/src/etc/javadoc.css
+++ b/phase4-bdew-client/src/etc/javadoc.css
@@ -1,8 +1,5 @@
 /**
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/AbstractBDEWDecryptParameterModifier.java b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/AbstractBDEWDecryptParameterModifier.java
index 2cf956528..8ed43f213 100644
--- a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/AbstractBDEWDecryptParameterModifier.java
+++ b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/AbstractBDEWDecryptParameterModifier.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWException.java b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWException.java
index 299480cc3..724b9b62c 100644
--- a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWException.java
+++ b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWException.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettings.java b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettings.java
index f6d07ac33..52538ec0b 100644
--- a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettings.java
+++ b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettings.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java
index 74ddd31e6..cab0e90a7 100644
--- a/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java
+++ b/phase4-bdew-client/src/main/java/com/helger/phase4/bdew/Phase4BDEWSender.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java
index 831e548fd..0440d126e 100644
--- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java
+++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/MainPhase4BDEWSenderExample.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettingsTest.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettingsTest.java
index add785636..0a1375b99 100644
--- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettingsTest.java
+++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/Phase4BDEWHttpClientSettingsTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/SPITest.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/SPITest.java
index 63c28a710..09fff1a4c 100644
--- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/SPITest.java
+++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/SPITest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/BrainpoolFuncTest.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/BrainpoolFuncTest.java
index 1d243aa1f..0c2107832 100644
--- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/BrainpoolFuncTest.java
+++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/BrainpoolFuncTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/SecP256R1FuncTest.java b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/SecP256R1FuncTest.java
index fb6e7aa7c..5697a9ba5 100644
--- a/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/SecP256R1FuncTest.java
+++ b/phase4-bdew-client/src/test/java/com/helger/phase4/bdew/crypto/SecP256R1FuncTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-bdew-client/src/test/resources/external/examples/base-example.xml b/phase4-bdew-client/src/test/resources/external/examples/base-example.xml
index eff931c97..c8244869f 100644
--- a/phase4-bdew-client/src/test/resources/external/examples/base-example.xml
+++ b/phase4-bdew-client/src/test/resources/external/examples/base-example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-bdew-client/src/test/resources/simplelogger.properties b/phase4-bdew-client/src/test/resources/simplelogger.properties
index 0b13b0684..d077cfcfc 100644
--- a/phase4-bdew-client/src/test/resources/simplelogger.properties
+++ b/phase4-bdew-client/src/test/resources/simplelogger.properties
@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-# gregor[dot]scholtysik[at]soptim[dot]de
-#
-# Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/findbugs-exclude.xml b/phase4-cef-client/findbugs-exclude.xml
index 12106628e..dda771176 100644
--- a/phase4-cef-client/findbugs-exclude.xml
+++ b/phase4-cef-client/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/pom.xml b/phase4-cef-client/pom.xml
index 66402fe81..e3b58c4f5 100644
--- a/phase4-cef-client/pom.xml
+++ b/phase4-cef-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/etc/javadoc.css b/phase4-cef-client/src/etc/javadoc.css
index 368f2b687..dffbd1ec1 100644
--- a/phase4-cef-client/src/etc/javadoc.css
+++ b/phase4-cef-client/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFException.java b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFException.java
index 890d018b6..fddade21b 100644
--- a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFException.java
+++ b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFHttpClientSettings.java b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFHttpClientSettings.java
index 548a85a85..6e5fa1a36 100644
--- a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFHttpClientSettings.java
+++ b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFHttpClientSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFSender.java b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFSender.java
index 8dbff3d63..9928bd1ab 100644
--- a/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFSender.java
+++ b/phase4-cef-client/src/main/java/com/helger/phase4/cef/Phase4CEFSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java
index 3be1afee4..1affe7cd1 100644
--- a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java
+++ b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainCEFeInvoicingConnectivityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainPhase4CEFSenderToop.java b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainPhase4CEFSenderToop.java
index 410345134..1b3e80309 100644
--- a/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainPhase4CEFSenderToop.java
+++ b/phase4-cef-client/src/test/java/com/helger/phase4/cef/MainPhase4CEFSenderToop.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/java/com/helger/phase4/cef/Phase4CEFHttpClientSettingsTest.java b/phase4-cef-client/src/test/java/com/helger/phase4/cef/Phase4CEFHttpClientSettingsTest.java
index 5efa6495b..ccd300896 100644
--- a/phase4-cef-client/src/test/java/com/helger/phase4/cef/Phase4CEFHttpClientSettingsTest.java
+++ b/phase4-cef-client/src/test/java/com/helger/phase4/cef/Phase4CEFHttpClientSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/java/com/helger/phase4/cef/SPITest.java b/phase4-cef-client/src/test/java/com/helger/phase4/cef/SPITest.java
index d6164130a..4a52b0c93 100644
--- a/phase4-cef-client/src/test/java/com/helger/phase4/cef/SPITest.java
+++ b/phase4-cef-client/src/test/java/com/helger/phase4/cef/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/resources/application.properties b/phase4-cef-client/src/test/resources/application.properties
index 3c520b820..8737a9318 100644
--- a/phase4-cef-client/src/test/resources/application.properties
+++ b/phase4-cef-client/src/test/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-cef-client/src/test/resources/external/examples/base-example.xml b/phase4-cef-client/src/test/resources/external/examples/base-example.xml
index bc5930214..e27fd6f3c 100644
--- a/phase4-cef-client/src/test/resources/external/examples/base-example.xml
+++ b/phase4-cef-client/src/test/resources/external/examples/base-example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-cef-client/src/test/resources/simplelogger.properties b/phase4-cef-client/src/test/resources/simplelogger.properties
index 622ca1606..f98dff4da 100644
--- a/phase4-cef-client/src/test/resources/simplelogger.properties
+++ b/phase4-cef-client/src/test/resources/simplelogger.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/findbugs-exclude.xml b/phase4-dbnalliance-client/findbugs-exclude.xml
index 7ad6e83e3..dda771176 100644
--- a/phase4-dbnalliance-client/findbugs-exclude.xml
+++ b/phase4-dbnalliance-client/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/pom.xml b/phase4-dbnalliance-client/pom.xml
index f0ed53cc7..97ca51614 100644
--- a/phase4-dbnalliance-client/pom.xml
+++ b/phase4-dbnalliance-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/etc/javadoc.css b/phase4-dbnalliance-client/src/etc/javadoc.css
index dd2b6c7df..dffbd1ec1 100644
--- a/phase4-dbnalliance-client/src/etc/javadoc.css
+++ b/phase4-dbnalliance-client/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceException.java b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceException.java
index fb5805c1a..bc8a4a6f4 100644
--- a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceException.java
+++ b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettings.java b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettings.java
index 7e5d714ae..1f3c86da5 100644
--- a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettings.java
+++ b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceSender.java b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceSender.java
index cc0c3cc3a..c2e20c68c 100644
--- a/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceSender.java
+++ b/phase4-dbnalliance-client/src/main/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java
index 72d9619ca..b98c7190c 100644
--- a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java
+++ b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/MainPhase4DBNAllianceSenderExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettingsTest.java b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettingsTest.java
index 5fff487ca..5fc7555a5 100644
--- a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettingsTest.java
+++ b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/Phase4DBNAllianceHttpClientSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/SPITest.java b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/SPITest.java
index 73400ea96..ab89a15e5 100644
--- a/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/SPITest.java
+++ b/phase4-dbnalliance-client/src/test/java/com/helger/phase4/dbnalliance/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dbnalliance-client/src/test/resources/external/examples/base-example.xml b/phase4-dbnalliance-client/src/test/resources/external/examples/base-example.xml
index eff931c97..c8244869f 100644
--- a/phase4-dbnalliance-client/src/test/resources/external/examples/base-example.xml
+++ b/phase4-dbnalliance-client/src/test/resources/external/examples/base-example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-dbnalliance-client/src/test/resources/simplelogger.properties b/phase4-dbnalliance-client/src/test/resources/simplelogger.properties
index 253a2e91d..d077cfcfc 100644
--- a/phase4-dbnalliance-client/src/test/resources/simplelogger.properties
+++ b/phase4-dbnalliance-client/src/test/resources/simplelogger.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/findbugs-exclude.xml b/phase4-dynamic-discovery/findbugs-exclude.xml
index 12106628e..dda771176 100644
--- a/phase4-dynamic-discovery/findbugs-exclude.xml
+++ b/phase4-dynamic-discovery/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/pom.xml b/phase4-dynamic-discovery/pom.xml
index d09dcb418..d8bfb03db 100644
--- a/phase4-dynamic-discovery/pom.xml
+++ b/phase4-dynamic-discovery/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/etc/javadoc.css b/phase4-dynamic-discovery/src/etc/javadoc.css
index 368f2b687..dffbd1ec1 100644
--- a/phase4-dynamic-discovery/src/etc/javadoc.css
+++ b/phase4-dynamic-discovery/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR.java
index aa8efd1c8..b37cb2f78 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR2.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR2.java
index 3d71621cd..201557414 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR2.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderBDXR2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderConstant.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderConstant.java
index bd648be14..e0c89886a 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderConstant.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
index a919babc5..d0d0437b0 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/IAS4EndpointDetailProvider.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/IAS4EndpointDetailProvider.java
index df183c0a2..79c721edb 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/IAS4EndpointDetailProvider.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/IAS4EndpointDetailProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/Phase4SMPException.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/Phase4SMPException.java
index e962dcd10..e8165a279 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/Phase4SMPException.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/Phase4SMPException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-dynamic-discovery/src/test/java/com/helger/phase4/dynamicdiscovery/SPITest.java b/phase4-dynamic-discovery/src/test/java/com/helger/phase4/dynamicdiscovery/SPITest.java
index c2415abca..98a6a6905 100644
--- a/phase4-dynamic-discovery/src/test/java/com/helger/phase4/dynamicdiscovery/SPITest.java
+++ b/phase4-dynamic-discovery/src/test/java/com/helger/phase4/dynamicdiscovery/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/findbugs-exclude.xml b/phase4-entsog-client/findbugs-exclude.xml
index 1764d8407..dda771176 100644
--- a/phase4-entsog-client/findbugs-exclude.xml
+++ b/phase4-entsog-client/findbugs-exclude.xml
@@ -1,9 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2024 Pavel Rotek
-    pavel[dot]rotek[at]gmail[dot]com
-
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/pom.xml b/phase4-entsog-client/pom.xml
index e53b2d51c..b45ac2555 100644
--- a/phase4-entsog-client/pom.xml
+++ b/phase4-entsog-client/pom.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2015-2024 Pavel Rotek
-    pavel[dot]rotek[at]gmail[dot]com
-
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/etc/javadoc.css b/phase4-entsog-client/src/etc/javadoc.css
index bd5a59023..dffbd1ec1 100644
--- a/phase4-entsog-client/src/etc/javadoc.css
+++ b/phase4-entsog-client/src/etc/javadoc.css
@@ -1,8 +1,5 @@
 /**
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGException.java b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGException.java
index 3de1c6af0..6fcad9f34 100644
--- a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGException.java
+++ b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGException.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettings.java b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettings.java
index 64bcea1e9..223b0e367 100644
--- a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettings.java
+++ b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettings.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGSender.java b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGSender.java
index 20920c07a..b3aa09493 100644
--- a/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGSender.java
+++ b/phase4-entsog-client/src/main/java/com/helger/phase4/entsog/Phase4ENTSOGSender.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/AS4TestRule.java b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/AS4TestRule.java
index cd1e72486..8ac071657 100644
--- a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/AS4TestRule.java
+++ b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/AS4TestRule.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Issue118Test.java b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Issue118Test.java
index 1fdf4628b..bf7689643 100644
--- a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Issue118Test.java
+++ b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Issue118Test.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettingsTest.java b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettingsTest.java
index 25f4cffb1..ff052b27a 100644
--- a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettingsTest.java
+++ b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/Phase4ENTSOGHttpClientSettingsTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/SPITest.java b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/SPITest.java
index 1b8e66395..da1d514b6 100644
--- a/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/SPITest.java
+++ b/phase4-entsog-client/src/test/java/com/helger/phase4/entsog/SPITest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2024 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/findbugs-exclude.xml b/phase4-euctp-client/findbugs-exclude.xml
index 8fcaffd24..dda771176 100644
--- a/phase4-euctp-client/findbugs-exclude.xml
+++ b/phase4-euctp-client/findbugs-exclude.xml
@@ -1,9 +1,6 @@
 <!--
 
-    Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-    gregor[dot]scholtysik[at]soptim[dot]de
-
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/pom.xml b/phase4-euctp-client/pom.xml
index 79a156a1e..69d982c3b 100644
--- a/phase4-euctp-client/pom.xml
+++ b/phase4-euctp-client/pom.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-    gregor[dot]scholtysik[at]soptim[dot]de
-
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/etc/javadoc.css b/phase4-euctp-client/src/etc/javadoc.css
index a5861c203..dffbd1ec1 100644
--- a/phase4-euctp-client/src/etc/javadoc.css
+++ b/phase4-euctp-client/src/etc/javadoc.css
@@ -1,8 +1,5 @@
 /**
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java
index 6dd860cb2..e2935c8d5 100644
--- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java
+++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/AbstractEuCtpUserMessageBuilder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
 package com.helger.phase4.euctp;
 
 import java.security.GeneralSecurityException;
diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java
index ca5ff83fe..7217d86a9 100644
--- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java
+++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/EuCtpPullRequestBuilder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
 package com.helger.phase4.euctp;
 
 import java.security.GeneralSecurityException;
diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpException.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpException.java
index 263db5145..c862d78ce 100644
--- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpException.java
+++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpException.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettings.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettings.java
index a6a45c511..74b2b8bb0 100644
--- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettings.java
+++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettings.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java
index 57d184440..a205c648b 100644
--- a/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java
+++ b/phase4-euctp-client/src/main/java/com/helger/phase4/euctp/Phase4EuCtpSender.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java
index f530a6889..83cd945be 100644
--- a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java
+++ b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/MainPhase4EuCtpSenderExample.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettingsTest.java b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettingsTest.java
index 6948e9d31..0881574e6 100644
--- a/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettingsTest.java
+++ b/phase4-euctp-client/src/test/java/com/helger/phase4/euctp/Phase4EuCtpHttpClientSettingsTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
- *
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-euctp-client/src/test/resources/simplelogger.properties b/phase4-euctp-client/src/test/resources/simplelogger.properties
index a576e1689..f98dff4da 100644
--- a/phase4-euctp-client/src/test/resources/simplelogger.properties
+++ b/phase4-euctp-client/src/test/resources/simplelogger.properties
@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-# gregor[dot]scholtysik[at]soptim[dot]de
-#
-# Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/findbugs-exclude.xml b/phase4-eudamed-client/findbugs-exclude.xml
index 3a4f51f82..dda771176 100644
--- a/phase4-eudamed-client/findbugs-exclude.xml
+++ b/phase4-eudamed-client/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/pom.xml b/phase4-eudamed-client/pom.xml
index 83c98aadc..35d75d4da 100644
--- a/phase4-eudamed-client/pom.xml
+++ b/phase4-eudamed-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/etc/javadoc.css b/phase4-eudamed-client/src/etc/javadoc.css
index 667d49afc..dffbd1ec1 100644
--- a/phase4-eudamed-client/src/etc/javadoc.css
+++ b/phase4-eudamed-client/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedException.java b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedException.java
index c9e4dc085..ec80cfa70 100644
--- a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedException.java
+++ b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettings.java b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettings.java
index 51c561bab..7c176907f 100644
--- a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettings.java
+++ b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedSender.java b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedSender.java
index d44e902ec..0ce5a4453 100644
--- a/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedSender.java
+++ b/phase4-eudamed-client/src/main/java/com/helger/phase4/eudamed/Phase4EudamedSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettingsTest.java b/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettingsTest.java
index 509d0cd67..472993fe1 100644
--- a/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettingsTest.java
+++ b/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/Phase4EudamedHttpClientSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/SPITest.java b/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/SPITest.java
index 7ef93aa2f..ed43aa1cf 100644
--- a/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/SPITest.java
+++ b/phase4-eudamed-client/src/test/java/com/helger/phase4/eudamed/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-eudamed-client/src/test/resources/simplelogger.properties b/phase4-eudamed-client/src/test/resources/simplelogger.properties
index 9fbf7cbbd..f98dff4da 100644
--- a/phase4-eudamed-client/src/test/resources/simplelogger.properties
+++ b/phase4-eudamed-client/src/test/resources/simplelogger.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java b/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java
index b85c7b2cd..63648abae 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/dump/AS4DumpReader.java
@@ -218,13 +218,15 @@ public static void decryptAS4In (@Nonnull final byte [] aAS4InData,
     }
 
     try (final WebScoped w = new WebScoped ();
-         final AS4RequestHandler rh = new AS4RequestHandler (aCryptoFactorySign,
-                                                             aCryptoFactoryCrypt,
-                                                             DefaultPModeResolver.DEFAULT_PMODE_RESOLVER,
-                                                             IAS4IncomingAttachmentFactory.DEFAULT_INSTANCE,
-                                                             AS4IncomingSecurityConfiguration.createDefaultInstance (),
-                                                             AS4IncomingMessageMetadata.createForRequest ()))
+         final AS4RequestHandler aHandler = new AS4RequestHandler (AS4IncomingMessageMetadata.createForRequest ()))
     {
+      // Set default values in handler
+      aHandler.setCryptoFactorySign (aCryptoFactorySign);
+      aHandler.setCryptoFactoryCrypt (aCryptoFactoryCrypt);
+      aHandler.setPModeResolver (DefaultPModeResolver.DEFAULT_PMODE_RESOLVER);
+      aHandler.setIncomingAttachmentFactory (IAS4IncomingAttachmentFactory.DEFAULT_INSTANCE);
+      aHandler.setIncomingSecurityConfiguration (AS4IncomingSecurityConfiguration.createDefaultInstance ());
+
       final IAS4IncomingMessageProcessorSPI aSPI = new IAS4IncomingMessageProcessorSPI ()
       {
         public AS4MessageProcessorResult processAS4UserMessage (@Nonnull final IAS4IncomingMessageMetadata aMessageMetadata,
@@ -286,23 +288,23 @@ public void processAS4ResponseMessage (@Nonnull final IAS4IncomingMessageMetadat
                                                final boolean bResponsePayloadIsAvailable)
         {}
       };
-      rh.setProcessorSupplier ( () -> new CommonsArrayList <> (aSPI));
-      rh.handleRequest (new NonBlockingByteArrayInputStream (aAS4InData, nHttpEnd, aAS4InData.length - nHttpEnd),
-                        hm,
-                        new IAS4ResponseAbstraction ()
-                        {
-                          public void setStatus (final int nStatusCode)
-                          {}
+      aHandler.setProcessorSupplier ( () -> new CommonsArrayList <> (aSPI));
+      aHandler.handleRequest (new NonBlockingByteArrayInputStream (aAS4InData, nHttpEnd, aAS4InData.length - nHttpEnd),
+                              hm,
+                              new IAS4ResponseAbstraction ()
+                              {
+                                public void setStatus (final int nStatusCode)
+                                {}
 
-                          public void setMimeType (final IMimeType aMimeType)
-                          {}
+                                public void setMimeType (final IMimeType aMimeType)
+                                {}
 
-                          public void setContent (final HttpHeaderMap aHeaderMap, final IHasInputStream aHasIS)
-                          {}
+                                public void setContent (final HttpHeaderMap aHeaderMap, final IHasInputStream aHasIS)
+                                {}
 
-                          public void setContent (final byte [] aResultBytes, final Charset aCharset)
-                          {}
-                        });
+                                public void setContent (final byte [] aResultBytes, final Charset aCharset)
+                                {}
+                              });
     }
     finally
     {
diff --git a/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4RequestHandler.java b/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4RequestHandler.java
index 3a5ff644a..7f7c83104 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4RequestHandler.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/incoming/AS4RequestHandler.java
@@ -361,11 +361,11 @@ public boolean hasAsyncResponseURL ()
   private static final Logger LOGGER = LoggerFactory.getLogger (AS4RequestHandler.class);
 
   private final AS4ResourceHelper m_aResHelper;
-  private final IAS4CryptoFactory m_aCryptoFactorySign;
-  private final IAS4CryptoFactory m_aCryptoFactoryCrypt;
-  private final IPModeResolver m_aPModeResolver;
-  private final IAS4IncomingAttachmentFactory m_aIncomingAttachmentFactory;
-  private final IAS4IncomingSecurityConfiguration m_aIncomingSecurityConfig;
+  private IAS4CryptoFactory m_aCryptoFactorySign;
+  private IAS4CryptoFactory m_aCryptoFactoryCrypt;
+  private IPModeResolver m_aPModeResolver;
+  private IAS4IncomingAttachmentFactory m_aIncomingAttachmentFactory;
+  private IAS4IncomingSecurityConfiguration m_aIncomingSecurityConfig;
   private IAS4IncomingProfileSelector m_aIncomingProfileSelector = AS4IncomingProfileSelectorFromGlobal.INSTANCE;
   private final IAS4IncomingMessageMetadata m_aMessageMetadata;
   private Locale m_aLocale = Locale.US;
@@ -379,26 +379,11 @@ public boolean hasAsyncResponseURL ()
   private IAS4RequestHandlerErrorConsumer m_aErrorConsumer;
 
   @ChangePhase4V3 ("See https://github.com/phax/phase4/discussions/265")
-  public AS4RequestHandler (@Nonnull final IAS4CryptoFactory aCryptoFactorySign,
-                            @Nonnull final IAS4CryptoFactory aCryptoFactoryCrypt,
-                            @Nonnull final IPModeResolver aPModeResolver,
-                            @Nonnull final IAS4IncomingAttachmentFactory aIncomingAttachmentFactory,
-                            @Nonnull final IAS4IncomingSecurityConfiguration aIncomingSecurityConfig,
-                            @Nonnull final IAS4IncomingMessageMetadata aMessageMetadata)
+  public AS4RequestHandler (@Nonnull final IAS4IncomingMessageMetadata aMessageMetadata)
   {
-    ValueEnforcer.notNull (aCryptoFactorySign, "CryptoFactorySign");
-    ValueEnforcer.notNull (aCryptoFactoryCrypt, "CryptoFactoryCrypt");
-    ValueEnforcer.notNull (aPModeResolver, "PModeResolver");
-    ValueEnforcer.notNull (aIncomingAttachmentFactory, "IncomingAttachmentFactory");
-    ValueEnforcer.notNull (aIncomingSecurityConfig, "IncomingSecurityConfig");
     ValueEnforcer.notNull (aMessageMetadata, "MessageMetadata");
     // Create dynamically here, to avoid leaving too many streams open
     m_aResHelper = new AS4ResourceHelper ();
-    m_aCryptoFactorySign = aCryptoFactorySign;
-    m_aCryptoFactoryCrypt = aCryptoFactoryCrypt;
-    m_aPModeResolver = aPModeResolver;
-    m_aIncomingAttachmentFactory = aIncomingAttachmentFactory;
-    m_aIncomingSecurityConfig = aIncomingSecurityConfig;
     m_aMessageMetadata = aMessageMetadata;
   }
 
@@ -408,6 +393,161 @@ public void close ()
     m_aResHelper.close ();
   }
 
+  /**
+   * @return The supplier for the {@link IAS4CryptoFactory} for signing. May not
+   *         be <code>null</code>.
+   * @see #getCryptoFactoryCrypt()
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final IAS4CryptoFactory getCryptoFactorySign ()
+  {
+    return m_aCryptoFactorySign;
+  }
+
+  /**
+   * Set the crypto factory for signing. This is a sanity wrapper around
+   * {@link #setCryptoFactorySignSupplier(Supplier)}.
+   *
+   * @param aCryptoFactorySign
+   *        Crypto factory for signing to use. May not be <code>null</code>.
+   * @return this for chaining
+   * @see #setCryptoFactory(IAS4CryptoFactory)
+   * @see #setCryptoFactoryCrypt(IAS4CryptoFactory)
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setCryptoFactorySign (@Nonnull final IAS4CryptoFactory aCryptoFactorySign)
+  {
+    ValueEnforcer.notNull (aCryptoFactorySign, "CryptoFactorySign");
+    m_aCryptoFactorySign = aCryptoFactorySign;
+    return this;
+  }
+
+  /**
+   * @return The supplier for the {@link IAS4CryptoFactory} for crypting. May
+   *         not be <code>null</code>.
+   * @see #getCryptoFactorySign()
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final IAS4CryptoFactory getCryptoFactoryCrypt ()
+  {
+    return m_aCryptoFactoryCrypt;
+  }
+
+  /**
+   * Set the crypto factory crypting. This is a sanity wrapper around
+   * {@link #setCryptoFactoryCryptSupplier(Supplier)}.
+   *
+   * @param aCryptoFactoryCrypt
+   *        Crypto factory for crypting to use. May not be <code>null</code>.
+   * @return this for chaining
+   * @see #setCryptoFactory(IAS4CryptoFactory)
+   * @see #setCryptoFactorySign(IAS4CryptoFactory)
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setCryptoFactoryCrypt (@Nonnull final IAS4CryptoFactory aCryptoFactoryCrypt)
+  {
+    ValueEnforcer.notNull (aCryptoFactoryCrypt, "CryptoFactoryCrypt");
+    m_aCryptoFactoryCrypt = aCryptoFactoryCrypt;
+    return this;
+  }
+
+  /**
+   * Set the same crypto factory for signing and crypting. This is a sanity
+   * wrapper around {@link #setCryptoFactorySupplier(Supplier)}.
+   *
+   * @param aCryptoFactory
+   *        Crypto factory to use. May not be <code>null</code>.
+   * @return this for chaining
+   * @see #setCryptoFactoryCrypt(IAS4CryptoFactory)
+   * @see #setCryptoFactorySign(IAS4CryptoFactory)
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setCryptoFactory (@Nonnull final IAS4CryptoFactory aCryptoFactory)
+  {
+    ValueEnforcer.notNull (aCryptoFactory, "CryptoFactory");
+    return setCryptoFactorySign (aCryptoFactory).setCryptoFactoryCrypt (aCryptoFactory);
+  }
+
+  /**
+   * @return The {@link IPModeResolver} to be used. Never <code>null</code>.
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final IPModeResolver getPModeResolver ()
+  {
+    return m_aPModeResolver;
+  }
+
+  /**
+   * @param aPModeResolver
+   *        PMode resolved to be used. May not be <code>null</code>.
+   * @return this for chaining
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setPModeResolver (@Nonnull final IPModeResolver aPModeResolver)
+  {
+    ValueEnforcer.notNull (aPModeResolver, "PModeResolver");
+    m_aPModeResolver = aPModeResolver;
+    return this;
+  }
+
+  /**
+   * @return The {@link IAS4IncomingAttachmentFactory} to be used. Never
+   *         <code>null</code>.
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final IAS4IncomingAttachmentFactory getIncomingAttachmentFactory ()
+  {
+    return m_aIncomingAttachmentFactory;
+  }
+
+  /**
+   * @param aIAF
+   *        The attachment factory for incoming attachments. May not be
+   *        <code>null</code>.
+   * @return this for chaining
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setIncomingAttachmentFactory (@Nonnull final IAS4IncomingAttachmentFactory aIAF)
+  {
+    ValueEnforcer.notNull (aIAF, "IAF");
+    m_aIncomingAttachmentFactory = aIAF;
+    return this;
+  }
+
+  /**
+   * @return The {@link IAS4IncomingSecurityConfiguration} to be used. Never
+   *         <code>null</code>.
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final IAS4IncomingSecurityConfiguration getIncomingSecurityConfiguration ()
+  {
+    return m_aIncomingSecurityConfig;
+  }
+
+  /**
+   * @param aICS
+   *        The incoming security configuration. May not be <code>null</code>.
+   * @return this for chaining
+   * @since 3.0.0
+   */
+  @Nonnull
+  public final AS4RequestHandler setIncomingSecurityConfiguration (@Nonnull final IAS4IncomingSecurityConfiguration aICS)
+  {
+    ValueEnforcer.notNull (aICS, "ICS");
+    m_aIncomingSecurityConfig = aICS;
+    return this;
+  }
+
   /**
    * @return The locale for error messages. Never <code>null</code>.
    */
diff --git a/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java b/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java
index 6e4fbf9bb..6ff4bd7ae 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/sender/EAS4UserMessageSendResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
 package com.helger.phase4.sender;
 
 import javax.annotation.Nonnull;
diff --git a/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4XServletHandler.java b/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4XServletHandler.java
index 77faa0a13..0c27fbbd9 100644
--- a/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4XServletHandler.java
+++ b/phase4-lib/src/main/java/com/helger/phase4/servlet/AS4XServletHandler.java
@@ -17,7 +17,6 @@
 package com.helger.phase4.servlet;
 
 import java.security.cert.X509Certificate;
-import java.util.function.Supplier;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -25,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.helger.commons.ValueEnforcer;
 import com.helger.commons.annotation.OverrideOnDemand;
 import com.helger.commons.http.CHttp;
 import com.helger.commons.http.EHttpMethod;
@@ -33,18 +31,14 @@
 import com.helger.http.EHttpVersion;
 import com.helger.phase4.attachment.IAS4IncomingAttachmentFactory;
 import com.helger.phase4.crypto.AS4CryptoFactoryProperties;
-import com.helger.phase4.crypto.IAS4CryptoFactory;
 import com.helger.phase4.http.AS4HttpDebug;
 import com.helger.phase4.incoming.AS4IncomingMessageMetadata;
 import com.helger.phase4.incoming.AS4RequestHandler;
 import com.helger.phase4.incoming.IAS4ResponseAbstraction;
 import com.helger.phase4.incoming.crypto.AS4IncomingSecurityConfiguration;
-import com.helger.phase4.incoming.crypto.IAS4IncomingSecurityConfiguration;
 import com.helger.phase4.messaging.IAS4IncomingMessageMetadata;
 import com.helger.phase4.model.pmode.resolve.DefaultPModeResolver;
-import com.helger.phase4.model.pmode.resolve.IPModeResolver;
 import com.helger.phase4.util.Phase4Exception;
-import com.helger.phase4.v3.ChangePhase4V3;
 import com.helger.servlet.response.UnifiedResponse;
 import com.helger.web.scope.IRequestWebScope;
 import com.helger.web.scope.IRequestWebScopeWithoutResponse;
@@ -60,50 +54,9 @@
  */
 public class AS4XServletHandler implements IXServletSimpleHandler
 {
-  @ChangePhase4V3 ("Rename to IAS4ServletRequestHandlerCustomizer")
-  public interface IHandlerCustomizer
-  {
-    /**
-     * Called before the message is handled. <br>
-     * Note: was called "customize" until v0.9.4
-     *
-     * @param aRequestScope
-     *        Request scope. Never <code>null</code>.
-     * @param aUnifiedResponse
-     *        The response to be filled. Never <code>null</code>.
-     * @param aHandler
-     *        The main handler doing the hard work. Never <code>null</code>.
-     */
-    void customizeBeforeHandling (@Nonnull IRequestWebScopeWithoutResponse aRequestScope,
-                                  @Nonnull AS4UnifiedResponse aUnifiedResponse,
-                                  @Nonnull AS4RequestHandler aHandler);
-
-    /**
-     * Called after the message was handled, and no exception was thrown.
-     *
-     * @param aRequestScope
-     *        Request scope. Never <code>null</code>.
-     * @param aUnifiedResponse
-     *        The response to be filled. Never <code>null</code>.
-     * @param aHandler
-     *        The main handler doing the hard work. Never <code>null</code>.
-     * @since 0.9.5
-     */
-    @ChangePhase4V3 ("Remove default")
-    default void customizeAfterHandling (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
-                                         @Nonnull final AS4UnifiedResponse aUnifiedResponse,
-                                         @Nonnull final AS4RequestHandler aHandler)
-    {}
-  }
-
   private static final Logger LOGGER = LoggerFactory.getLogger (AS4XServletHandler.class);
 
-  private Supplier <? extends IAS4CryptoFactory> m_aCryptoFactorySignSupplier;
-  private Supplier <? extends IAS4CryptoFactory> m_aCryptoFactoryCryptSupplier;
-  private IPModeResolver m_aPModeResolver;
-  private IAS4IncomingAttachmentFactory m_aIAF;
-  private IAS4IncomingSecurityConfiguration m_aISC = AS4IncomingSecurityConfiguration.createDefaultInstance ();
-  private IHandlerCustomizer m_aRequestHandlerCustomizer;
+  private IAS4ServletRequestHandlerCustomizer m_aRequestHandlerCustomizer;
 
   /**
    * Default constructor.
@@ -111,222 +64,13 @@ default void customizeAfterHandling (@Nonnull final IRequestWebScopeWithoutRespo
    * @since 0.9.7
    */
   public AS4XServletHandler ()
-  {
-    setCryptoFactorySupplier (AS4CryptoFactoryProperties::getDefaultInstance);
-    setPModeResolver (DefaultPModeResolver.DEFAULT_PMODE_RESOLVER);
-    setIncomingAttachmentFactory (IAS4IncomingAttachmentFactory.DEFAULT_INSTANCE);
-  }
-
-  /**
-   * @return The supplier for the {@link IAS4CryptoFactory} for signing. May not
-   *         be <code>null</code>.
-   * @see #getCryptoFactoryCryptSupplier()
-   * @since 2.2.0
-   */
-  @Nonnull
-  public final Supplier <? extends IAS4CryptoFactory> getCryptoFactorySignSupplier ()
-  {
-    return m_aCryptoFactorySignSupplier;
-  }
-
-  /**
-   * @return The supplier for the {@link IAS4CryptoFactory} for crypting. May
-   *         not be <code>null</code>.
-   * @see #getCryptoFactorySignSupplier()
-   * @since 2.2.0
-   */
-  @Nonnull
-  public final Supplier <? extends IAS4CryptoFactory> getCryptoFactoryCryptSupplier ()
-  {
-    return m_aCryptoFactoryCryptSupplier;
-  }
-
-  /**
-   * Set the same crypto factory supplier for signing and crypting.
-   *
-   * @param aCryptoFactorySupplier
-   *        Crypto factory supplier. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactory(IAS4CryptoFactory)
-   * @see #setCryptoFactorySignSupplier(Supplier)
-   * @see #setCryptoFactorySign(IAS4CryptoFactory)
-   * @see #setCryptoFactoryCryptSupplier(Supplier)
-   * @see #setCryptoFactoryCrypt(IAS4CryptoFactory)
-   * @since 0.9.15
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactorySupplier (@Nonnull final Supplier <? extends IAS4CryptoFactory> aCryptoFactorySupplier)
-  {
-    ValueEnforcer.notNull (aCryptoFactorySupplier, "CryptoFactorySupplier");
-    return setCryptoFactorySignSupplier (aCryptoFactorySupplier).setCryptoFactoryCryptSupplier (aCryptoFactorySupplier);
-  }
-
-  /**
-   * Set the same crypto factory for signing and crypting. This is a sanity
-   * wrapper around {@link #setCryptoFactorySupplier(Supplier)}.
-   *
-   * @param aCryptoFactory
-   *        Crypto factory to use. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactorySupplier(Supplier)
-   * @see #setCryptoFactoryCrypt(IAS4CryptoFactory)
-   * @see #setCryptoFactorySign(IAS4CryptoFactory)
-   * @since 2.8.2
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactory (@Nonnull final IAS4CryptoFactory aCryptoFactory)
-  {
-    ValueEnforcer.notNull (aCryptoFactory, "CryptoFactory");
-    return setCryptoFactorySupplier ( () -> aCryptoFactory);
-  }
-
-  /**
-   * @param aCryptoFactorySignSupplier
-   *        Crypto factory supplier for signing. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactoryCryptSupplier(Supplier)
-   * @since 2.2.0
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactorySignSupplier (@Nonnull final Supplier <? extends IAS4CryptoFactory> aCryptoFactorySignSupplier)
-  {
-    ValueEnforcer.notNull (aCryptoFactorySignSupplier, "CryptoFactorySignSupplier");
-    m_aCryptoFactorySignSupplier = aCryptoFactorySignSupplier;
-    return this;
-  }
-
-  /**
-   * Set the crypto factory for signing. This is a sanity wrapper around
-   * {@link #setCryptoFactorySignSupplier(Supplier)}.
-   *
-   * @param aCryptoFactorySign
-   *        Crypto factory for signing to use. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactory(IAS4CryptoFactory)
-   * @see #setCryptoFactoryCrypt(IAS4CryptoFactory)
-   * @since 2.8.2
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactorySign (@Nonnull final IAS4CryptoFactory aCryptoFactorySign)
-  {
-    ValueEnforcer.notNull (aCryptoFactorySign, "CryptoFactorySign");
-    return setCryptoFactorySignSupplier ( () -> aCryptoFactorySign);
-  }
-
-  /**
-   * @param aCryptoFactoryCryptSupplier
-   *        Crypto factory supplier for signing. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactorySignSupplier(Supplier)
-   * @since 2.2.0
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactoryCryptSupplier (@Nonnull final Supplier <? extends IAS4CryptoFactory> aCryptoFactoryCryptSupplier)
-  {
-    ValueEnforcer.notNull (aCryptoFactoryCryptSupplier, "CryptoFactoryCryptSupplier");
-    m_aCryptoFactoryCryptSupplier = aCryptoFactoryCryptSupplier;
-    return this;
-  }
-
-  /**
-   * Set the crypto factory crypting. This is a sanity wrapper around
-   * {@link #setCryptoFactoryCryptSupplier(Supplier)}.
-   *
-   * @param aCryptoFactoryCrypt
-   *        Crypto factory for crypting to use. May not be <code>null</code>.
-   * @return this for chaining
-   * @see #setCryptoFactory(IAS4CryptoFactory)
-   * @see #setCryptoFactorySign(IAS4CryptoFactory)
-   * @since 2.8.2
-   */
-  @Nonnull
-  public final AS4XServletHandler setCryptoFactoryCrypt (@Nonnull final IAS4CryptoFactory aCryptoFactoryCrypt)
-  {
-    ValueEnforcer.notNull (aCryptoFactoryCrypt, "CryptoFactoryCrypt");
-    return setCryptoFactoryCryptSupplier ( () -> aCryptoFactoryCrypt);
-  }
-
-  /**
-   * @return The {@link IPModeResolver} to be used. Never <code>null</code>.
-   * @since 0.9.15
-   */
-  @Nonnull
-  public final IPModeResolver getPModeResolver ()
-  {
-    return m_aPModeResolver;
-  }
-
-  /**
-   * @param aPModeResolver
-   *        PMode resolved to be used. May not be <code>null</code>.
-   * @return this for chaining
-   * @since 0.9.15
-   */
-  @Nonnull
-  public final AS4XServletHandler setPModeResolver (@Nonnull final IPModeResolver aPModeResolver)
-  {
-    ValueEnforcer.notNull (aPModeResolver, "PModeResolver");
-    m_aPModeResolver = aPModeResolver;
-    return this;
-  }
-
-  /**
-   * @return The {@link IAS4IncomingAttachmentFactory} to be used. Never
-   *         <code>null</code>.
-   * @since 0.9.15
-   */
-  @Nonnull
-  public final IAS4IncomingAttachmentFactory getIncomingAttachmentFactory ()
-  {
-    return m_aIAF;
-  }
-
-  /**
-   * @param aIAF
-   *        The attachment factory for incoming attachments. May not be
-   *        <code>null</code>.
-   * @return this for chaining
-   * @since 0.9.15
-   */
-  @Nonnull
-  public final AS4XServletHandler setIncomingAttachmentFactory (@Nonnull final IAS4IncomingAttachmentFactory aIAF)
-  {
-    ValueEnforcer.notNull (aIAF, "IAF");
-    m_aIAF = aIAF;
-    return this;
-  }
-
-  /**
-   * @return The {@link IAS4IncomingSecurityConfiguration} to be used. Never
-   *         <code>null</code>.
-   * @since 2.1.3
-   */
-  @Nonnull
-  public final IAS4IncomingSecurityConfiguration getIncomingSecurityConfiguration ()
-  {
-    return m_aISC;
-  }
-
-  /**
-   * @param aICS
-   *        The incoming security configuration. May not be <code>null</code>.
-   * @return this for chaining
-   * @since 2.1.3
-   */
-  @Nonnull
-  public final AS4XServletHandler setIncomingSecurityConfiguration (@Nonnull final IAS4IncomingSecurityConfiguration aICS)
-  {
-    ValueEnforcer.notNull (aICS, "ICS");
-    m_aISC = aICS;
-    return this;
-  }
+  {}
 
   /**
    * @return The additional customizer. May be <code>null</code>.
    */
   @Nullable
-  @ChangePhase4V3 ("Rename to getRequestHandlerCustomizer")
-  public final IHandlerCustomizer getHandlerCustomizer ()
+  public final IAS4ServletRequestHandlerCustomizer getRequestHandlerCustomizer ()
   {
     return m_aRequestHandlerCustomizer;
   }
@@ -339,8 +83,7 @@ public final IHandlerCustomizer getHandlerCustomizer ()
    * @return this for chaining
    */
   @Nonnull
-  @ChangePhase4V3 ("Rename to setRequestHandlerCustomizer")
-  public final AS4XServletHandler setHandlerCustomizer (@Nullable final IHandlerCustomizer aHandlerCustomizer)
+  public final AS4XServletHandler setRequestHandlerCustomizer (@Nullable final IAS4ServletRequestHandlerCustomizer aHandlerCustomizer)
   {
     m_aRequestHandlerCustomizer = aHandlerCustomizer;
     return this;
@@ -404,24 +147,6 @@ protected AS4IncomingMessageMetadata createIncomingMessageMetadata (@Nonnull fin
    *        The request scope. May not be <code>null</code>.
    * @param aHttpResponse
    *        The HTTP response to be filled. May not be <code>null</code>.
-   * @param aCryptoFactorySign
-   *        The AS4 crypto factory to be used for signing. May not be
-   *        <code>null</code>. Defaults to
-   *        {@link #getCryptoFactorySupplier()}<code>.get()</code>
-   * @param aCryptoFactoryCrypt
-   *        The AS4 crypto factory to be used for crypting. May not be
-   *        <code>null</code>. Defaults to
-   *        {@link #getCryptoFactorySupplier()}<code>.get()</code>
-   * @param aPModeResolver
-   *        The PMode resolver to be used. May not be <code>null</code>.
-   *        Defaults to {@link #getPModeResolver()}.
-   * @param aIAF
-   *        The factory to parse incoming attachments. May not be
-   *        <code>null</code>. Defaults to
-   *        {@link #getIncomingAttachmentFactory()}.
-   * @param aISC
-   *        The security configuration to use for incoming data. May not be
-   *        <code>null</code>. Since v2.1.3.
    * @param aHandlerCustomizer
    *        An optional callback that can be used to modify the internal
    *        {@link AS4RequestHandler} before and after processing. May be
@@ -432,23 +157,19 @@ protected AS4IncomingMessageMetadata createIncomingMessageMetadata (@Nonnull fin
    */
   protected void handleRequest (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
                                 @Nonnull final AS4UnifiedResponse aHttpResponse,
-                                @Nonnull final IAS4CryptoFactory aCryptoFactorySign,
-                                @Nonnull final IAS4CryptoFactory aCryptoFactoryCrypt,
-                                @Nonnull final IPModeResolver aPModeResolver,
-                                @Nonnull final IAS4IncomingAttachmentFactory aIAF,
-                                @Nonnull final IAS4IncomingSecurityConfiguration aISC,
-                                @Nullable final IHandlerCustomizer aHandlerCustomizer) throws Exception
+                                @Nullable final IAS4ServletRequestHandlerCustomizer aHandlerCustomizer) throws Exception
   {
     // Start metadata
     final IAS4IncomingMessageMetadata aMessageMetadata = createIncomingMessageMetadata (aRequestScope);
 
-    try (final AS4RequestHandler aHandler = new AS4RequestHandler (aCryptoFactorySign,
-                                                                   aCryptoFactoryCrypt,
-                                                                   aPModeResolver,
-                                                                   aIAF,
-                                                                   aISC,
-                                                                   aMessageMetadata))
+    try (final AS4RequestHandler aHandler = new AS4RequestHandler (aMessageMetadata))
     {
+      // Set default values in handler
+      aHandler.setCryptoFactory (AS4CryptoFactoryProperties.getDefaultInstance ());
+      aHandler.setPModeResolver (DefaultPModeResolver.DEFAULT_PMODE_RESOLVER);
+      aHandler.setIncomingAttachmentFactory (IAS4IncomingAttachmentFactory.DEFAULT_INSTANCE);
+      aHandler.setIncomingSecurityConfiguration (AS4IncomingSecurityConfiguration.createDefaultInstance ());
+
       // Customize before handling
       if (aHandlerCustomizer != null)
       {
@@ -490,28 +211,11 @@ protected void handleRequest (@Nonnull final IRequestWebScopeWithoutResponse aRe
     }
   }
 
-  // Don't make this final, so that subclasses can call the other handleRequest
-  @ChangePhase4V3 ("Make final and require usage of 'IHandlerCustomizer' instead")
-  public void handleRequest (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
-                             @Nonnull final UnifiedResponse aUnifiedResponse) throws Exception
+  public final void handleRequest (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
+                                   @Nonnull final UnifiedResponse aUnifiedResponse) throws Exception
   {
-    // Resolved once per request
-    final IAS4CryptoFactory aCryptoFactorySign = m_aCryptoFactorySignSupplier.get ();
-    if (aCryptoFactorySign == null)
-      throw new IllegalStateException ("Failed to get an AS4 CryptoFactory for signing");
-
-    final IAS4CryptoFactory aCryptoFactoryCrypt = m_aCryptoFactoryCryptSupplier.get ();
-    if (aCryptoFactoryCrypt == null)
-      throw new IllegalStateException ("Failed to get an AS4 CryptoFactory for crypting");
-
     // Created above in #createUnifiedResponse
-    handleRequest (aRequestScope,
-                   (AS4UnifiedResponse) aUnifiedResponse,
-                   aCryptoFactorySign,
-                   aCryptoFactoryCrypt,
-                   m_aPModeResolver,
-                   m_aIAF,
-                   m_aISC,
-                   m_aRequestHandlerCustomizer);
+    final AS4UnifiedResponse aRealUnifiedResponse = (AS4UnifiedResponse) aUnifiedResponse;
+    handleRequest (aRequestScope, aRealUnifiedResponse, m_aRequestHandlerCustomizer);
   }
 }
diff --git a/phase4-lib/src/main/java/com/helger/phase4/servlet/IAS4ServletRequestHandlerCustomizer.java b/phase4-lib/src/main/java/com/helger/phase4/servlet/IAS4ServletRequestHandlerCustomizer.java
new file mode 100644
index 000000000..6bf668d22
--- /dev/null
+++ b/phase4-lib/src/main/java/com/helger/phase4/servlet/IAS4ServletRequestHandlerCustomizer.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
+package com.helger.phase4.servlet;
+
+import javax.annotation.Nonnull;
+
+import com.helger.phase4.incoming.AS4RequestHandler;
+import com.helger.web.scope.IRequestWebScopeWithoutResponse;
+
+/**
+ * This is a special callback handler that is meant to be used in combination
+ * with the Servlet handler to customize the incoming request handler.
+ *
+ * @author Philip Helger
+ * @since 3.0.0
+ */
+public interface IAS4ServletRequestHandlerCustomizer
+{
+  /**
+   * Called before the message is handled. <br>
+   * Note: was called "customize" until v0.9.4
+   *
+   * @param aRequestScope
+   *        Request scope. Never <code>null</code>.
+   * @param aUnifiedResponse
+   *        The response to be filled. Never <code>null</code>.
+   * @param aRequestHandler
+   *        The main handler doing the hard work. Never <code>null</code>.
+   */
+  void customizeBeforeHandling (@Nonnull IRequestWebScopeWithoutResponse aRequestScope,
+                                @Nonnull AS4UnifiedResponse aUnifiedResponse,
+                                @Nonnull AS4RequestHandler aRequestHandler);
+
+  /**
+   * Called after the message was handled, and no exception was thrown.
+   *
+   * @param aRequestScope
+   *        Request scope. Never <code>null</code>.
+   * @param aUnifiedResponse
+   *        The response to be filled. Never <code>null</code>.
+   * @param aRequestHandler
+   *        The main handler doing the hard work. Never <code>null</code>.
+   * @since 0.9.5
+   */
+  void customizeAfterHandling (@Nonnull IRequestWebScopeWithoutResponse aRequestScope,
+                               @Nonnull AS4UnifiedResponse aUnifiedResponse,
+                               @Nonnull AS4RequestHandler aRequestHandler);
+}
diff --git a/phase4-lib/src/main/resources/external/schemas/ebbp-signals-2.0.4.xsd b/phase4-lib/src/main/resources/external/schemas/ebbp-signals-2.0.4.xsd
index e85a50465..d61de54af 100644
--- a/phase4-lib/src/main/resources/external/schemas/ebbp-signals-2.0.4.xsd
+++ b/phase4-lib/src/main/resources/external/schemas/ebbp-signals-2.0.4.xsd
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!--Metadata: 
 Owner: ebxml-bp (OASIS ebXML Business Process TC)
 Product: ebxmlbp (aka ebBP)
diff --git a/phase4-lib/src/main/resources/external/schemas/ebms-header-3_0-200704.xsd b/phase4-lib/src/main/resources/external/schemas/ebms-header-3_0-200704.xsd
index 391d2d167..f2b388c90 100644
--- a/phase4-lib/src/main/resources/external/schemas/ebms-header-3_0-200704.xsd
+++ b/phase4-lib/src/main/resources/external/schemas/ebms-header-3_0-200704.xsd
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <xsd:schema xmlns="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:S11="http://schemas.xmlsoap.org/soap/envelope/" xmlns:S12="http://www.w3.org/2003/05/soap-envelope" xmlns:tns="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" targetNamespace="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xsd:annotation>
 		<xsd:appinfo>Schema for ebMS-3 XML Infoset</xsd:appinfo>
diff --git a/phase4-lib/src/main/resources/external/schemas/soap11.xsd b/phase4-lib/src/main/resources/external/schemas/soap11.xsd
index ba9918a26..f50a5ecba 100644
--- a/phase4-lib/src/main/resources/external/schemas/soap11.xsd
+++ b/phase4-lib/src/main/resources/external/schemas/soap11.xsd
@@ -1,34 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Schema for the SOAP/1.1 envelope
+<!--
 
-Portions © 2001 DevelopMentor. 
-© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
- 
-This document is governed by the W3C Software License [1] as described in the FAQ [2].
-[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
-By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
 
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+    Licensed 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
 
-1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
+            http://www.apache.org/licenses/LICENSE-2.0
 
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
-
-3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
-
-Original W3C files; http://www.w3.org/2001/06/soap-envelope
-Changes made: 
-     - reverted namespace to http://schemas.xmlsoap.org/soap/envelope/
-     - reverted mustUnderstand to only allow 0 and 1 as lexical values
-	 - made encodingStyle a global attribute 20020825
-	 - removed default value from mustUnderstand attribute declaration
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    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.
 
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.xmlsoap.org/soap/envelope/" targetNamespace="http://schemas.xmlsoap.org/soap/envelope/">
diff --git a/phase4-lib/src/main/resources/external/schemas/soap12.xsd b/phase4-lib/src/main/resources/external/schemas/soap12.xsd
index f3501d7be..c0e1fcd77 100644
--- a/phase4-lib/src/main/resources/external/schemas/soap12.xsd
+++ b/phase4-lib/src/main/resources/external/schemas/soap12.xsd
@@ -1,18 +1,20 @@
-<!-- Schema defined in the SOAP Version 1.2 Part 1 specification
-     Recommendation:
-     http://www.w3.org/TR/2003/REC-soap12-part1-20030624/
-     $Id: soap-envelope.xsd,v 1.2 2006/12/20 20:43:36 ylafon Exp $
+<!--
 
-     Copyright (C)2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
-     W3C viability, trademark, document use and software licensing rules
-     apply.
-     http://www.w3.org/Consortium/Legal/
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
 
-     This document is governed by the W3C Software License [1] as
-     described in the FAQ [2].
+    Licensed 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.
 
-     [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-     [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2003/05/soap-envelope" targetNamespace="http://www.w3.org/2003/05/soap-envelope" elementFormDefault="qualified">
 
diff --git a/phase4-lib/src/test/resources/external/attachment/ShortXML.xml b/phase4-lib/src/test/resources/external/attachment/ShortXML.xml
index f80d219a0..d7289b429 100644
--- a/phase4-lib/src/test/resources/external/attachment/ShortXML.xml
+++ b/phase4-lib/src/test/resources/external/attachment/ShortXML.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/BundledMessage.xml b/phase4-lib/src/test/resources/external/soap11test/BundledMessage.xml
index cff9ca174..fc7d36274 100644
--- a/phase4-lib/src/test/resources/external/soap11test/BundledMessage.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/BundledMessage.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/EmptyMessaging.xml b/phase4-lib/src/test/resources/external/soap11test/EmptyMessaging.xml
index 769f66640..24713fa9a 100644
--- a/phase4-lib/src/test/resources/external/soap11test/EmptyMessaging.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/EmptyMessaging.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/ErrorMessage.xml b/phase4-lib/src/test/resources/external/soap11test/ErrorMessage.xml
index 8567c5d8b..92fd88c42 100644
--- a/phase4-lib/src/test/resources/external/soap11test/ErrorMessage.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/ErrorMessage.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/MessageInfoIDMissing.xml b/phase4-lib/src/test/resources/external/soap11test/MessageInfoIDMissing.xml
index 2fcc1b902..3a5c48b7e 100644
--- a/phase4-lib/src/test/resources/external/soap11test/MessageInfoIDMissing.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/MessageInfoIDMissing.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/MessageInfoImaginaryTimestamp.xml b/phase4-lib/src/test/resources/external/soap11test/MessageInfoImaginaryTimestamp.xml
index 3d50ec174..0ad2039ca 100644
--- a/phase4-lib/src/test/resources/external/soap11test/MessageInfoImaginaryTimestamp.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/MessageInfoImaginaryTimestamp.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/MessageInfoMissing.xml b/phase4-lib/src/test/resources/external/soap11test/MessageInfoMissing.xml
index 30641623f..6077c3844 100644
--- a/phase4-lib/src/test/resources/external/soap11test/MessageInfoMissing.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/MessageInfoMissing.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/NoMessaging.xml b/phase4-lib/src/test/resources/external/soap11test/NoMessaging.xml
index c3fa27abe..3b55e51dc 100644
--- a/phase4-lib/src/test/resources/external/soap11test/NoMessaging.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/NoMessaging.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/PullRequest.xml b/phase4-lib/src/test/resources/external/soap11test/PullRequest.xml
index e12761c4c..3577e9c97 100644
--- a/phase4-lib/src/test/resources/external/soap11test/PullRequest.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/PullRequest.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/ReceiptMessage.xml b/phase4-lib/src/test/resources/external/soap11test/ReceiptMessage.xml
index 7d80264e2..f0d37e09f 100644
--- a/phase4-lib/src/test/resources/external/soap11test/ReceiptMessage.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/ReceiptMessage.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/UserMessage-no-soap.xml b/phase4-lib/src/test/resources/external/soap11test/UserMessage-no-soap.xml
index 2316ff45b..4e95a4079 100644
--- a/phase4-lib/src/test/resources/external/soap11test/UserMessage-no-soap.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/UserMessage-no-soap.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/UserMessage.xml b/phase4-lib/src/test/resources/external/soap11test/UserMessage.xml
index a76105b92..577b4fd33 100644
--- a/phase4-lib/src/test/resources/external/soap11test/UserMessage.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/UserMessage.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap11test/UserMessageResponse.xml b/phase4-lib/src/test/resources/external/soap11test/UserMessageResponse.xml
index 8945d74e1..19319512b 100644
--- a/phase4-lib/src/test/resources/external/soap11test/UserMessageResponse.xml
+++ b/phase4-lib/src/test/resources/external/soap11test/UserMessageResponse.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap12test/PullRequest12.xml b/phase4-lib/src/test/resources/external/soap12test/PullRequest12.xml
index 0fc64f674..72a248b24 100644
--- a/phase4-lib/src/test/resources/external/soap12test/PullRequest12.xml
+++ b/phase4-lib/src/test/resources/external/soap12test/PullRequest12.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap12test/UserMessage12.xml b/phase4-lib/src/test/resources/external/soap12test/UserMessage12.xml
index be8f19193..9a72d0aa6 100644
--- a/phase4-lib/src/test/resources/external/soap12test/UserMessage12.xml
+++ b/phase4-lib/src/test/resources/external/soap12test/UserMessage12.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap12test/UserMessageWithCompressedPayload12.xml b/phase4-lib/src/test/resources/external/soap12test/UserMessageWithCompressedPayload12.xml
index f87e42448..c2ae63b14 100644
--- a/phase4-lib/src/test/resources/external/soap12test/UserMessageWithCompressedPayload12.xml
+++ b/phase4-lib/src/test/resources/external/soap12test/UserMessageWithCompressedPayload12.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2015-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-lib/src/test/resources/external/soap12test/test-2023-03-15.xml b/phase4-lib/src/test/resources/external/soap12test/test-2023-03-15.xml
index 443f9f818..c3a33bb77 100644
--- a/phase4-lib/src/test/resources/external/soap12test/test-2023-03-15.xml
+++ b/phase4-lib/src/test/resources/external/soap12test/test-2023-03-15.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <env:Envelope xmlns:eb="http://docs.oasis-open.org/ebxml-msg/ebms/v3.0/ns/core/200704/"
   xmlns:ebbpsig="http://docs.oasis-open.org/ebxml-bp/ebbp-signals-2.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
   xmlns:env="http://www.w3.org/2003/05/soap-envelope">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/AU Invoice.xml b/phase4-peppol-client/src/test/resources/external/examples/AU Invoice.xml
index f48c689e8..f4102bf59 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/AU Invoice.xml	
+++ b/phase4-peppol-client/src/test/resources/external/examples/AU Invoice.xml	
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/Allowance-example.xml b/phase4-peppol-client/src/test/resources/external/examples/Allowance-example.xml
index 2632750ef..ba8d19899 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/Allowance-example.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/Allowance-example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/DespatchAdvice_Example.xml b/phase4-peppol-client/src/test/resources/external/examples/DespatchAdvice_Example.xml
index 605d89fdb..37555bd49 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/DespatchAdvice_Example.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/DespatchAdvice_Example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!--
                 Content:
                 This file contains a Full BIS3 PEPPOL UBL Despatch Adivce.
diff --git a/phase4-peppol-client/src/test/resources/external/examples/InvoiceResponse_Example.xml b/phase4-peppol-client/src/test/resources/external/examples/InvoiceResponse_Example.xml
index 90e5a5d1f..42d809341 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/InvoiceResponse_Example.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/InvoiceResponse_Example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!--
                 Content:
                 This file contains a Full BIS3 PEPPOL UBL Invoice Response.
diff --git a/phase4-peppol-client/src/test/resources/external/examples/Singapore invoice valid 1.xml b/phase4-peppol-client/src/test/resources/external/examples/Singapore invoice valid 1.xml
index a52d319b9..5ff176411 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/Singapore invoice valid 1.xml	
+++ b/phase4-peppol-client/src/test/resources/external/examples/Singapore invoice valid 1.xml	
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:ccts="urn:un:unece:uncefact:documentation:2" xmlns:ext="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2" xmlns:qdt="urn:oasis:names:specification:ubl:schema:xsd:QualifiedDatatypes-2" xmlns:udt="urn:un:unece:uncefact:data:specification:UnqualifiedDataTypesSchemaModule:2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 <!-- 
diff --git a/phase4-peppol-client/src/test/resources/external/examples/Vat-category-S.xml b/phase4-peppol-client/src/test/resources/external/examples/Vat-category-S.xml
index 122be5962..548ecbf65 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/Vat-category-S.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/Vat-category-S.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/at-gov-peppol-ubl.xml b/phase4-peppol-client/src/test/resources/external/examples/at-gov-peppol-ubl.xml
index fcd227ed4..3e1750a7e 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/at-gov-peppol-ubl.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/at-gov-peppol-ubl.xml
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-UBL Invoice example file.
 
-The MIT License (MIT)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
 
-Copyright (c) 2014 Bundesrechenzentrum GmbH, Wien
+    Licensed 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
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+            http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
- -->
+-->
 <Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
   xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
   xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/at-oebb-peppol-ubl.xml b/phase4-peppol-client/src/test/resources/external/examples/at-oebb-peppol-ubl.xml
index e3e5e23cf..6af3af25c 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/at-oebb-peppol-ubl.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/at-oebb-peppol-ubl.xml
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-UBL Invoice example file.
 
-The MIT License (MIT)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
 
-Copyright (c) 2014 Bundesrechenzentrum GmbH, Wien
+    Licensed 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
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+            http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+    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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
- -->
+-->
 <Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
   xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
   xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/base-creditnote-correction.xml b/phase4-peppol-client/src/test/resources/external/examples/base-creditnote-correction.xml
index ba9560739..57fd78998 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/base-creditnote-correction.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/base-creditnote-correction.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/base-example.xml b/phase4-peppol-client/src/test/resources/external/examples/base-example.xml
index eff931c97..c8244869f 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/base-example.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/base-example.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/base-negative-inv-correction.xml b/phase4-peppol-client/src/test/resources/external/examples/base-negative-inv-correction.xml
index ec7bb8304..62d132669 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/base-negative-inv-correction.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/base-negative-inv-correction.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/base-sbdh.xml b/phase4-peppol-client/src/test/resources/external/examples/base-sbdh.xml
index 0050252ec..bce8512ee 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/base-sbdh.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/base-sbdh.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 
 <StandardBusinessDocument xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://www.unece.org/cefact/namespaces/StandardBusinessDocumentHeader">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en-qvalia.xml b/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en-qvalia.xml
index 1380b72c2..a9e95431c 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en-qvalia.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en-qvalia.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!-- This file requires cii2ubl 1.4.2 -->
 <rsm:CrossIndustryInvoice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100 ../schema/D16B%20SCRDM%20(Subset)/uncoupled%20clm/CII/uncefact/data/standard/CrossIndustryInvoice_100pD16B.xsd"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en.xml b/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en.xml
index 407476402..d5aab9812 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/cii/cii-en.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!-- This file requires cii2ubl 1.4.2 -->
 <rsm:CrossIndustryInvoice xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100 ../schema/D16B%20SCRDM%20(Subset)/uncoupled%20clm/CII/uncefact/data/standard/CrossIndustryInvoice_100pD16B.xsd"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/example-ubl-en-qvalia.xml b/phase4-peppol-client/src/test/resources/external/examples/example-ubl-en-qvalia.xml
index a6d9b7854..2d03af570 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/example-ubl-en-qvalia.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/example-ubl-en-qvalia.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
   xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
   xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/mini.xml b/phase4-peppol-client/src/test/resources/external/examples/mini.xml
index f23f4c515..da7943a9e 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/mini.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/mini.xml
@@ -1 +1,19 @@
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <mini xmlns="urn:as2-as4-benchmark"/>
\ No newline at end of file
diff --git a/phase4-peppol-client/src/test/resources/external/examples/reporting/end-user-statistics-reporting-empty.xml b/phase4-peppol-client/src/test/resources/external/examples/reporting/end-user-statistics-reporting-empty.xml
index 98186d9cc..0aea4d56d 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/reporting/end-user-statistics-reporting-empty.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/reporting/end-user-statistics-reporting-empty.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <EndUserStatisticsReport xmlns="urn:fdc:peppol:end-user-statistics-report:1.1">
   <CustomizationID>urn:fdc:peppol.eu:edec:trns:end-user-statistics-report:1.1</CustomizationID>
   <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
diff --git a/phase4-peppol-client/src/test/resources/external/examples/reporting/transaction-statistics-minimal.xml b/phase4-peppol-client/src/test/resources/external/examples/reporting/transaction-statistics-minimal.xml
index bb22e4645..48fc2ca76 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/reporting/transaction-statistics-minimal.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/reporting/transaction-statistics-minimal.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <TransactionStatisticsReport xmlns="urn:fdc:peppol:transaction-statistics-report:1.0">
   <CustomizationID>urn:fdc:peppol.eu:edec:trns:transaction-statistics-reporting:1.0</CustomizationID>
   <ProfileID>urn:fdc:peppol.eu:edec:bis:reporting:1.0</ProfileID>
diff --git a/phase4-peppol-client/src/test/resources/external/examples/test-order.xml b/phase4-peppol-client/src/test/resources/external/examples/test-order.xml
index 288f7a350..ac8d4e0e8 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/test-order.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/test-order.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Order xmlns="urn:oasis:names:specification:ubl:schema:xsd:Order-2"
      xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
      xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/ubl-creditnote-en.xml b/phase4-peppol-client/src/test/resources/external/examples/ubl-creditnote-en.xml
index c587d89fb..c0bc7041c 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/ubl-creditnote-en.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/ubl-creditnote-en.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <CreditNote xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:CreditNote-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/ubl-invoice-en.xml b/phase4-peppol-client/src/test/resources/external/examples/ubl-invoice-en.xml
index 82d354f11..c6d8ff9f7 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/ubl-invoice-en.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/ubl-invoice-en.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
     xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
     xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/vat-category-O.xml b/phase4-peppol-client/src/test/resources/external/examples/vat-category-O.xml
index c04b37e50..2e0333289 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/vat-category-O.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/vat-category-O.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!-- PEPPOL BIS Billing, testfile showing the use of VAT category O (Outside scope of VAT) -->
 <Invoice  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/vat-category-Z.xml b/phase4-peppol-client/src/test/resources/external/examples/vat-category-Z.xml
index 08e29eb29..a8b2f5ca9 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/vat-category-Z.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/vat-category-Z.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <!-- PEPPOL BIS Billing, testfile showing the use of VAT category Z (Zero rated goods) -->
 <Invoice  xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
  xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-1.2-cii-example1.xml b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-1.2-cii-example1.xml
index a1a7cf848..4009a17ee 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-1.2-cii-example1.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-1.2-cii-example1.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <rsm:CrossIndustryInvoice xmlns:rsm="urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100"
                           xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100"
                           xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100">
diff --git a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.0.0-ubl-inv.xml b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.0.0-ubl-inv.xml
index 7316cfa36..05620435f 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.0.0-ubl-inv.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.0.0-ubl-inv.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <Invoice xmlns="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
   xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
   xmlns:cec="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2"
diff --git a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.3.1-ubl-inv.xml b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.3.1-ubl-inv.xml
index 4ee3e8db3..7542b4659 100644
--- a/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.3.1-ubl-inv.xml
+++ b/phase4-peppol-client/src/test/resources/external/examples/xrechnung-2.3.1-ubl-inv.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <ubl:Invoice xmlns:ubl="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2"
              xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2"
              xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2">
diff --git a/phase4-peppol-client/src/test/resources/external/zre/Verifizierungs_Rechnung_PEPPOL.xml b/phase4-peppol-client/src/test/resources/external/zre/Verifizierungs_Rechnung_PEPPOL.xml
index e4a423f35..d22086ad9 100644
--- a/phase4-peppol-client/src/test/resources/external/zre/Verifizierungs_Rechnung_PEPPOL.xml
+++ b/phase4-peppol-client/src/test/resources/external/zre/Verifizierungs_Rechnung_PEPPOL.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
+
+    Licensed 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.
+
+-->
 <ns0:Invoice xmlns:ns0="urn:oasis:names:specification:ubl:schema:xsd:Invoice-2" xmlns:cac="urn:oasis:names:specification:ubl:schema:xsd:CommonAggregateComponents-2" xmlns:cbc="urn:oasis:names:specification:ubl:schema:xsd:CommonBasicComponents-2" xmlns:cec="urn:oasis:names:specification:ubl:schema:xsd:CommonExtensionComponents-2">
   <cbc:CustomizationID>urn:cen.eu:en16931:2017#compliant#urn:xoev-de:kosit:standard:xrechnung_2.0</cbc:CustomizationID>
   <cbc:ID>ER_420713629</cbc:ID>
diff --git a/phase4-peppol-server-webapp/findbugs-exclude.xml b/phase4-peppol-server-webapp/findbugs-exclude.xml
index 12106628e..dda771176 100644
--- a/phase4-peppol-server-webapp/findbugs-exclude.xml
+++ b/phase4-peppol-server-webapp/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/pom.xml b/phase4-peppol-server-webapp/pom.xml
index a17f86abe..a6076264a 100644
--- a/phase4-peppol-server-webapp/pom.xml
+++ b/phase4-peppol-server-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/etc/javadoc.css b/phase4-peppol-server-webapp/src/etc/javadoc.css
index 368f2b687..dffbd1ec1 100644
--- a/phase4-peppol-server-webapp/src/etc/javadoc.css
+++ b/phase4-peppol-server-webapp/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/servlet/Phase4PeppolWebAppListener.java b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/servlet/Phase4PeppolWebAppListener.java
index 4b0201b52..6c7d7ad36 100644
--- a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/servlet/Phase4PeppolWebAppListener.java
+++ b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/servlet/Phase4PeppolWebAppListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringPeppolIncomingSBDHandlerSPI.java b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringPeppolIncomingSBDHandlerSPI.java
index 5e1557a63..793d3abe6 100644
--- a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringPeppolIncomingSBDHandlerSPI.java
+++ b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringPeppolIncomingSBDHandlerSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java
index b60ef497b..710604c50 100644
--- a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java
+++ b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/spi/StoringServletMessageProcessorSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/storage/StorageHelper.java b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/storage/StorageHelper.java
index 644f56d06..1fc627162 100644
--- a/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/storage/StorageHelper.java
+++ b/phase4-peppol-server-webapp/src/main/java/com/helger/phase4/peppol/server/storage/StorageHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/resources/application.properties b/phase4-peppol-server-webapp/src/main/resources/application.properties
index cedbf3af0..e60686be1 100644
--- a/phase4-peppol-server-webapp/src/main/resources/application.properties
+++ b/phase4-peppol-server-webapp/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/resources/log4j2.xml b/phase4-peppol-server-webapp/src/main/resources/log4j2.xml
index f62393c00..9a74102cb 100644
--- a/phase4-peppol-server-webapp/src/main/resources/log4j2.xml
+++ b/phase4-peppol-server-webapp/src/main/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/webapp/WEB-INF/web.xml b/phase4-peppol-server-webapp/src/main/webapp/WEB-INF/web.xml
index 7724fcd80..4d06cbbed 100644
--- a/phase4-peppol-server-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/phase4-peppol-server-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/main/webapp/index.html b/phase4-peppol-server-webapp/src/main/webapp/index.html
index 7edbd3305..e5a7b5de9 100644
--- a/phase4-peppol-server-webapp/src/main/webapp/index.html
+++ b/phase4-peppol-server-webapp/src/main/webapp/index.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/SPITest.java b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/SPITest.java
index 2c82f1421..02267f0a6 100644
--- a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/SPITest.java
+++ b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/JettyStopPHASE4PEPPOL.java b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/JettyStopPHASE4PEPPOL.java
index fe90a06e4..4db5572fb 100644
--- a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/JettyStopPHASE4PEPPOL.java
+++ b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/JettyStopPHASE4PEPPOL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/RunInJettyPHASE4PEPPOL.java b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/RunInJettyPHASE4PEPPOL.java
index b79bf13a8..73600384a 100644
--- a/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/RunInJettyPHASE4PEPPOL.java
+++ b/phase4-peppol-server-webapp/src/test/java/com/helger/phase4/peppol/server/standalone/RunInJettyPHASE4PEPPOL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-bdew/pom.xml b/phase4-profile-bdew/pom.xml
index 300642c8e..fe38edba5 100644
--- a/phase4-profile-bdew/pom.xml
+++ b/phase4-profile-bdew/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
-    gregor[dot]scholtysik[at]soptim[dot]de
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+    philip[at]helger[dot]com
 
     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/phase4-profile-bdew/src/etc/javadoc.css b/phase4-profile-bdew/src/etc/javadoc.css
index 20705959d..dffbd1ec1 100644
--- a/phase4-profile-bdew/src/etc/javadoc.css
+++ b/phase4-profile-bdew/src/etc/javadoc.css
@@ -1,6 +1,6 @@
 /**
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/AS4BDEWProfileRegistarSPI.java b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/AS4BDEWProfileRegistarSPI.java
index 47a3ae3e7..e69da9cf0 100644
--- a/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/AS4BDEWProfileRegistarSPI.java
+++ b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/AS4BDEWProfileRegistarSPI.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidator.java b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidator.java
index 7e0913c70..1117b4e30 100644
--- a/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidator.java
+++ b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidator.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWPMode.java b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWPMode.java
index 0f7417703..56dd1bffa 100644
--- a/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWPMode.java
+++ b/phase4-profile-bdew/src/main/java/com/helger/phase4/profile/bdew/BDEWPMode.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidatorTest.java b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidatorTest.java
index 033aef8fc..d879fc239 100644
--- a/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidatorTest.java
+++ b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWCompatibilityValidatorTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWPModeTest.java b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWPModeTest.java
index 289ba7f8a..93074c151 100644
--- a/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWPModeTest.java
+++ b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/BDEWPModeTest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/SPITest.java b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/SPITest.java
index c17fd16e8..f74b148a2 100644
--- a/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/SPITest.java
+++ b/phase4-profile-bdew/src/test/java/com/helger/phase4/profile/bdew/SPITest.java
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2023-2024 Gregor Scholtysik (www.soptim.de)
- * gregor[dot]scholtysik[at]soptim[dot]de
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
  *
  * 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/phase4-profile-dbnalliance/findbugs-exclude.xml b/phase4-profile-dbnalliance/findbugs-exclude.xml
index 072b36562..dda771176 100644
--- a/phase4-profile-dbnalliance/findbugs-exclude.xml
+++ b/phase4-profile-dbnalliance/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/pom.xml b/phase4-profile-dbnalliance/pom.xml
index e423d8ed7..3a28ceccf 100644
--- a/phase4-profile-dbnalliance/pom.xml
+++ b/phase4-profile-dbnalliance/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/etc/javadoc.css b/phase4-profile-dbnalliance/src/etc/javadoc.css
index 28f1470de..dffbd1ec1 100644
--- a/phase4-profile-dbnalliance/src/etc/javadoc.css
+++ b/phase4-profile-dbnalliance/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/AS4DBNAllianceProfileRegistarSPI.java b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/AS4DBNAllianceProfileRegistarSPI.java
index 9e6fc0503..f30e7663e 100644
--- a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/AS4DBNAllianceProfileRegistarSPI.java
+++ b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/AS4DBNAllianceProfileRegistarSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidator.java b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidator.java
index 21ba6a443..b3387c538 100644
--- a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidator.java
+++ b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePMode.java b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePMode.java
index 0770b3516..bff31ba2a 100644
--- a/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePMode.java
+++ b/phase4-profile-dbnalliance/src/main/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidatorTest.java b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidatorTest.java
index f1ebf2055..ad6911b20 100644
--- a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidatorTest.java
+++ b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAllianceCompatibilityValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePModeTest.java b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePModeTest.java
index e0045a7b2..782a945be 100644
--- a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePModeTest.java
+++ b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/DBNAlliancePModeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/SPITest.java b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/SPITest.java
index 1bf3e6bb5..5a31d52a8 100644
--- a/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/SPITest.java
+++ b/phase4-profile-dbnalliance/src/test/java/com/helger/phase4/profile/dbnalliance/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/findbugs-exclude.xml b/phase4-profile-eespa/findbugs-exclude.xml
index 0515ce36a..dda771176 100644
--- a/phase4-profile-eespa/findbugs-exclude.xml
+++ b/phase4-profile-eespa/findbugs-exclude.xml
@@ -1,7 +1,6 @@
 <!--
 
-    Copyright (C) 2020-2024 OpusCapita
-    Copyright (C) 2022 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/pom.xml b/phase4-profile-eespa/pom.xml
index bfe9f3db4..03b61f5f1 100644
--- a/phase4-profile-eespa/pom.xml
+++ b/phase4-profile-eespa/pom.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2020-2024 OpusCapita
-    Copyright (C) 2022 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/etc/javadoc.css b/phase4-profile-eespa/src/etc/javadoc.css
index 347fcfd5a..dffbd1ec1 100644
--- a/phase4-profile-eespa/src/etc/javadoc.css
+++ b/phase4-profile-eespa/src/etc/javadoc.css
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/AS4EESPAProfileRegistarSPI.java b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/AS4EESPAProfileRegistarSPI.java
index 26f871430..a263cc4b4 100644
--- a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/AS4EESPAProfileRegistarSPI.java
+++ b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/AS4EESPAProfileRegistarSPI.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidator.java b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidator.java
index c654f0df0..8fd6597ea 100644
--- a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidator.java
+++ b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidator.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPAPMode.java b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPAPMode.java
index 1491ce00e..22a0781ac 100644
--- a/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPAPMode.java
+++ b/phase4-profile-eespa/src/main/java/com/helger/phase4/profile/eespa/EESPAPMode.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidatorTest.java b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidatorTest.java
index 48e99b707..3d4411a41 100644
--- a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidatorTest.java
+++ b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPACompatibilityValidatorTest.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPAPModeTest.java b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPAPModeTest.java
index c816acb0a..1091ede7c 100644
--- a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPAPModeTest.java
+++ b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/EESPAPModeTest.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/SPITest.java b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/SPITest.java
index 90dc66ad4..2cb12e214 100644
--- a/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/SPITest.java
+++ b/phase4-profile-eespa/src/test/java/com/helger/phase4/profile/eespa/SPITest.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2020-2024 OpusCapita
- * Copyright (C) 2022 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/findbugs-exclude.xml b/phase4-profile-entsog/findbugs-exclude.xml
index d5c49f238..dda771176 100644
--- a/phase4-profile-entsog/findbugs-exclude.xml
+++ b/phase4-profile-entsog/findbugs-exclude.xml
@@ -1,9 +1,6 @@
 <!--
 
-    Copyright (C) 2015-2021 Pavel Rotek
-    pavel[dot]rotek[at]gmail[dot]com
-
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/pom.xml b/phase4-profile-entsog/pom.xml
index 7521335fe..c5d15701b 100644
--- a/phase4-profile-entsog/pom.xml
+++ b/phase4-profile-entsog/pom.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2015-2021 Pavel Rotek
-    pavel[dot]rotek[at]gmail[dot]com
-
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/etc/javadoc.css b/phase4-profile-entsog/src/etc/javadoc.css
index 64e571e58..dffbd1ec1 100644
--- a/phase4-profile-entsog/src/etc/javadoc.css
+++ b/phase4-profile-entsog/src/etc/javadoc.css
@@ -1,8 +1,5 @@
 /**
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/AS4ENTSOGProfileRegistarSPI.java b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/AS4ENTSOGProfileRegistarSPI.java
index cc4b351fc..5b8186d52 100644
--- a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/AS4ENTSOGProfileRegistarSPI.java
+++ b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/AS4ENTSOGProfileRegistarSPI.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidator.java b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidator.java
index 6646a6828..253a31ddc 100644
--- a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidator.java
+++ b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidator.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGPMode.java b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGPMode.java
index f8dae5080..285fbea25 100644
--- a/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGPMode.java
+++ b/phase4-profile-entsog/src/main/java/com/helger/phase4/profile/entsog/ENTSOGPMode.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidatorTest.java b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidatorTest.java
index 6a16a6355..b847ae90d 100644
--- a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidatorTest.java
+++ b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGCompatibilityValidatorTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGPModeTest.java b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGPModeTest.java
index 0750fc715..cff88eeec 100644
--- a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGPModeTest.java
+++ b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/ENTSOGPModeTest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/SPITest.java b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/SPITest.java
index 64e6fa2c3..e2e99860d 100644
--- a/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/SPITest.java
+++ b/phase4-profile-entsog/src/test/java/com/helger/phase4/profile/entsog/SPITest.java
@@ -1,8 +1,5 @@
 /*
- * Copyright (C) 2015-2021 Pavel Rotek
- * pavel[dot]rotek[at]gmail[dot]com
- *
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/findbugs-exclude.xml b/phase4-profile-euctp/findbugs-exclude.xml
index 68d3865ce..dda771176 100644
--- a/phase4-profile-euctp/findbugs-exclude.xml
+++ b/phase4-profile-euctp/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/pom.xml b/phase4-profile-euctp/pom.xml
index 092491d29..1575eff28 100644
--- a/phase4-profile-euctp/pom.xml
+++ b/phase4-profile-euctp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/etc/javadoc.css b/phase4-profile-euctp/src/etc/javadoc.css
index e20830d21..dffbd1ec1 100644
--- a/phase4-profile-euctp/src/etc/javadoc.css
+++ b/phase4-profile-euctp/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/AS4EuCtpProfileRegistarSPI.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/AS4EuCtpProfileRegistarSPI.java
index 8d09f35e7..d32cc2d19 100644
--- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/AS4EuCtpProfileRegistarSPI.java
+++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/AS4EuCtpProfileRegistarSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpAction.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpAction.java
index a20390026..8fb950a2e 100644
--- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpAction.java
+++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpAction.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
 package com.helger.phase4.profile.euctp;
 
 import javax.annotation.Nonnull;
diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpService.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpService.java
index 86f309ed6..225215387 100644
--- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpService.java
+++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EEuCtpService.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
+ * philip[at]helger[dot]com
+ *
+ * Licensed 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.
+ */
 package com.helger.phase4.profile.euctp;
 
 import javax.annotation.Nonnull;
diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidator.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidator.java
index e20d48820..a7d95e8af 100644
--- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidator.java
+++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java
index 75a8cc479..ce76eda0a 100644
--- a/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java
+++ b/phase4-profile-euctp/src/main/java/com/helger/phase4/profile/euctp/EuCtpPMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidatorTest.java b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidatorTest.java
index dfb1baaef..46bee2733 100644
--- a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidatorTest.java
+++ b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpCompatibilityValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpPModeTest.java b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpPModeTest.java
index e7761a85e..eff1a397d 100644
--- a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpPModeTest.java
+++ b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/EuCtpPModeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/SPITest.java b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/SPITest.java
index d9f61e143..320913520 100644
--- a/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/SPITest.java
+++ b/phase4-profile-euctp/src/test/java/com/helger/phase4/profile/euctp/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/findbugs-exclude.xml b/phase4-profile-peppol/findbugs-exclude.xml
index 68d3865ce..dda771176 100644
--- a/phase4-profile-peppol/findbugs-exclude.xml
+++ b/phase4-profile-peppol/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/pom.xml b/phase4-profile-peppol/pom.xml
index 7a0dbd537..5e267ad05 100644
--- a/phase4-profile-peppol/pom.xml
+++ b/phase4-profile-peppol/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/etc/javadoc.css b/phase4-profile-peppol/src/etc/javadoc.css
index e20830d21..dffbd1ec1 100644
--- a/phase4-profile-peppol/src/etc/javadoc.css
+++ b/phase4-profile-peppol/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/AS4PeppolProfileRegistarSPI.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/AS4PeppolProfileRegistarSPI.java
index 25c3b2b14..e15933add 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/AS4PeppolProfileRegistarSPI.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/AS4PeppolProfileRegistarSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/HttpClientUrlDownloader.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/HttpClientUrlDownloader.java
index 5fa813042..53fa47bfe 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/HttpClientUrlDownloader.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/HttpClientUrlDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCRLDownloader.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCRLDownloader.java
index 3bc41ac1d..2539a3db5 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCRLDownloader.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCRLDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidator.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidator.java
index 03ef30243..9928d76f9 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidator.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolPMode.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolPMode.java
index ceaafcf2c..88042c807 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolPMode.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/PeppolPMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettings.java b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettings.java
index 8fd944f4f..7ba92213f 100644
--- a/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettings.java
+++ b/phase4-profile-peppol/src/main/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCRLDownloaderTest.java b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCRLDownloaderTest.java
index e30033023..834934056 100644
--- a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCRLDownloaderTest.java
+++ b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCRLDownloaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidatorTest.java b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidatorTest.java
index 0a6a39490..0e147f0e6 100644
--- a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidatorTest.java
+++ b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolCompatibilityValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolPModeTest.java b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolPModeTest.java
index 8a296a608..653bbf109 100644
--- a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolPModeTest.java
+++ b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/PeppolPModeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettingsTest.java b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettingsTest.java
index b5f3026ad..5cfab989b 100644
--- a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettingsTest.java
+++ b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/Phase4PeppolHttpClientSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/SPITest.java b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/SPITest.java
index 9037f9105..3948bb28a 100644
--- a/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/SPITest.java
+++ b/phase4-profile-peppol/src/test/java/com/helger/phase4/profile/peppol/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/findbugs-exclude.xml b/phase4-spring-boot-demo/findbugs-exclude.xml
index 6e6c20846..dda771176 100644
--- a/phase4-spring-boot-demo/findbugs-exclude.xml
+++ b/phase4-spring-boot-demo/findbugs-exclude.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/pom.xml b/phase4-spring-boot-demo/pom.xml
index 3715e425b..f945df867 100644
--- a/phase4-spring-boot-demo/pom.xml
+++ b/phase4-spring-boot-demo/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/etc/javadoc.css b/phase4-spring-boot-demo/src/etc/javadoc.css
index 6c2993b7a..dffbd1ec1 100644
--- a/phase4-spring-boot-demo/src/etc/javadoc.css
+++ b/phase4-spring-boot-demo/src/etc/javadoc.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/Phase4SpringbootApplication.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/Phase4SpringbootApplication.java
index 4c179dd66..6c17e6bc7 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/Phase4SpringbootApplication.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/Phase4SpringbootApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/enumeration/ESBDHHandlerServiceSelector.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/enumeration/ESBDHHandlerServiceSelector.java
index a8860a98e..b38fd285a 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/enumeration/ESBDHHandlerServiceSelector.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/enumeration/ESBDHHandlerServiceSelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/CustomPeppolIncomingSBDHandlerServiceImpl.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/CustomPeppolIncomingSBDHandlerServiceImpl.java
index 5f4f02ff5..b9ee3f93d 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/CustomPeppolIncomingSBDHandlerServiceImpl.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/CustomPeppolIncomingSBDHandlerServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/ISBDHandlerService.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/ISBDHandlerService.java
index 533edb5aa..fadbee7b1 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/ISBDHandlerService.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/ISBDHandlerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/SDBHandlerServiceLocator.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/SDBHandlerServiceLocator.java
index a1976641e..c07576013 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/SDBHandlerServiceLocator.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/service/SDBHandlerServiceLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/servlet/ServletConfig.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/servlet/ServletConfig.java
index 81d29e960..dc2f560a8 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/servlet/ServletConfig.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/servlet/ServletConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,7 +55,7 @@
 import com.helger.phase4.profile.peppol.Phase4PeppolHttpClientSettings;
 import com.helger.phase4.servlet.AS4UnifiedResponse;
 import com.helger.phase4.servlet.AS4XServletHandler;
-import com.helger.phase4.servlet.AS4XServletHandler.IHandlerCustomizer;
+import com.helger.phase4.servlet.IAS4ServletRequestHandlerCustomizer;
 import com.helger.photon.io.WebFileIO;
 import com.helger.security.certificate.CertificateHelper;
 import com.helger.servlet.ServletHelper;
@@ -94,83 +94,70 @@ public MyAS4Servlet ()
       // Multipart is handled specifically inside
       settings ().setMultipartEnabled (false);
       final AS4XServletHandler hdl = new AS4XServletHandler ();
-      // This method refers to the outer static method
-      hdl.setCryptoFactorySupplier (ServletConfig::getCryptoFactoryToUse);
-
-      if (false)
+      hdl.setRequestHandlerCustomizer (new IAS4ServletRequestHandlerCustomizer ()
       {
-        // Example code to show all possibilities of the handler customizer
-        hdl.setHandlerCustomizer (new IHandlerCustomizer ()
+        public void customizeBeforeHandling (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
+                                             @Nonnull final AS4UnifiedResponse aUnifiedResponse,
+                                             @Nonnull final AS4RequestHandler aRequestHandler)
         {
-          public void customizeBeforeHandling (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
-                                               @Nonnull final AS4UnifiedResponse aUnifiedResponse,
-                                               @Nonnull final AS4RequestHandler aHandler)
-          {
-            // Set a different crypto factory based on the request
-            hdl.setCryptoFactory (null);
-            // TODO
-          }
+          // This method refers to the outer static method
+          aRequestHandler.setCryptoFactory (ServletConfig.getCryptoFactoryToUse ());
 
-          public void customizeAfterHandling (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
-                                              @Nonnull final AS4UnifiedResponse aUnifiedResponse,
-                                              @Nonnull final AS4RequestHandler aHandler)
+          // Example code to disable PMode validation
+          if (false)
           {
-            // empty
+            aRequestHandler.setIncomingProfileSelector (new AS4IncomingProfileSelectorFromGlobal ()
+            {
+              @Override
+              public boolean validateAgainstProfile ()
+              {
+                // override;
+                return false;
+              }
+            });
           }
-        });
-      }
 
-      if (false)
-      {
-        // Example code to disable PMode validation
-        hdl.setHandlerCustomizer ( (aRequestScope, aUnifiedResponse, aHandler) -> aHandler.setIncomingProfileSelector (
-                                                                                                                       new AS4IncomingProfileSelectorFromGlobal ()
-                                                                                                                       {
-                                                                                                                         @Override
-                                                                                                                         public boolean validateAgainstProfile ()
-                                                                                                                         {
-                                                                                                                           // override;
-                                                                                                                           return false;
-                                                                                                                         }
-                                                                                                                       }));
-      }
-
-      // Example for changing the receiver data based on the source URL
-      if (false)
-      {
-        final IHandlerCustomizer aHandlerCustomizer = (aRequestScope, aUnifiedResponse, aHandler) -> {
-          final String sUrl = aRequestScope.getURLDecoded ();
-          // The receiver check data you want to set
-          final Phase4PeppolReceiverCheckData aReceiverCheckData;
-          if (sUrl != null && sUrl.startsWith ("https://ap-prod.example.org/as4"))
+          // Example for changing the Peppol receiver data based on the source
+          // URL
+          if (false)
           {
-            aReceiverCheckData = new Phase4PeppolReceiverCheckData (true,
-                                                                    new SMPClientReadOnly (URLHelper.getAsURI ("http://smp-prod.example.org")),
-                                                                    Phase4PeppolServletConfiguration.DEFAULT_WILDCARD_SELECTION_MODE,
-                                                                    "https://ap-prod.example.org/as4",
-                                                                    CertificateHelper.convertStringToCertficateOrNull ("....Public Prod AP Cert...."),
-                                                                    Phase4PeppolServletConfiguration.isPerformSBDHValueChecks (),
-                                                                    Phase4PeppolServletConfiguration.isCheckSBDHForMandatoryCountryC1 (),
-                                                                    Phase4PeppolServletConfiguration.isCheckSigningCertificateRevocation ());
-          }
-          else
-          {
-            aReceiverCheckData = new Phase4PeppolReceiverCheckData (true,
-                                                                    new SMPClientReadOnly (URLHelper.getAsURI ("http://smp-test.example.org")),
-                                                                    Phase4PeppolServletConfiguration.DEFAULT_WILDCARD_SELECTION_MODE,
-                                                                    "https://ap-test.example.org/as4",
-                                                                    CertificateHelper.convertStringToCertficateOrNull ("....Public Test AP Cert...."),
-                                                                    Phase4PeppolServletConfiguration.isPerformSBDHValueChecks (),
-                                                                    Phase4PeppolServletConfiguration.isCheckSBDHForMandatoryCountryC1 (),
-                                                                    Phase4PeppolServletConfiguration.isCheckSigningCertificateRevocation ());
+            final String sUrl = aRequestScope.getURLDecoded ();
+            // The receiver check data you want to set
+            final Phase4PeppolReceiverCheckData aReceiverCheckData;
+            if (sUrl != null && sUrl.startsWith ("https://ap-prod.example.org/as4"))
+            {
+              aReceiverCheckData = new Phase4PeppolReceiverCheckData (true,
+                                                                      new SMPClientReadOnly (URLHelper.getAsURI ("http://smp-prod.example.org")),
+                                                                      Phase4PeppolServletConfiguration.DEFAULT_WILDCARD_SELECTION_MODE,
+                                                                      "https://ap-prod.example.org/as4",
+                                                                      CertificateHelper.convertStringToCertficateOrNull ("....Public Prod AP Cert...."),
+                                                                      Phase4PeppolServletConfiguration.isPerformSBDHValueChecks (),
+                                                                      Phase4PeppolServletConfiguration.isCheckSBDHForMandatoryCountryC1 (),
+                                                                      Phase4PeppolServletConfiguration.isCheckSigningCertificateRevocation ());
+            }
+            else
+            {
+              aReceiverCheckData = new Phase4PeppolReceiverCheckData (true,
+                                                                      new SMPClientReadOnly (URLHelper.getAsURI ("http://smp-test.example.org")),
+                                                                      Phase4PeppolServletConfiguration.DEFAULT_WILDCARD_SELECTION_MODE,
+                                                                      "https://ap-test.example.org/as4",
+                                                                      CertificateHelper.convertStringToCertficateOrNull ("....Public Test AP Cert...."),
+                                                                      Phase4PeppolServletConfiguration.isPerformSBDHValueChecks (),
+                                                                      Phase4PeppolServletConfiguration.isCheckSBDHForMandatoryCountryC1 (),
+                                                                      Phase4PeppolServletConfiguration.isCheckSigningCertificateRevocation ());
+            }
+
+            // Find the right SPI handler
+            aRequestHandler.getProcessorOfType (Phase4PeppolServletMessageProcessorSPI.class)
+                           .setReceiverCheckData (aReceiverCheckData);
           }
+        }
 
-          // Find the right SPI handler
-          aHandler.getProcessorOfType (Phase4PeppolServletMessageProcessorSPI.class)
-                  .setReceiverCheckData (aReceiverCheckData);
-        };
-        hdl.setHandlerCustomizer (aHandlerCustomizer);
-      }
+        public void customizeAfterHandling (@Nonnull final IRequestWebScopeWithoutResponse aRequestScope,
+                                            @Nonnull final AS4UnifiedResponse aUnifiedResponse,
+                                            @Nonnull final AS4RequestHandler aRequestHandler)
+        {}
+      });
 
       // HTTP POST only
       handlerRegistry ().registerHandler (EHttpMethod.POST, hdl);
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingSBDHandlerSPI.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingSBDHandlerSPI.java
index e6e490075..a43078ee1 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingSBDHandlerSPI.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingSBDHandlerSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingViaInterfaceSPI.java b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingViaInterfaceSPI.java
index 14f600d9f..def02da6f 100644
--- a/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingViaInterfaceSPI.java
+++ b/phase4-spring-boot-demo/src/main/java/com/helger/phase4/springboot/spi/CustomPeppolIncomingViaInterfaceSPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/resources/application.properties b/phase4-spring-boot-demo/src/main/resources/application.properties
index 66ce61b5b..b58aa8537 100644
--- a/phase4-spring-boot-demo/src/main/resources/application.properties
+++ b/phase4-spring-boot-demo/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+# Copyright (C) 2015-2024 Philip Helger (www.helger.com)
 # philip[at]helger[dot]com
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/main/resources/log4j2.xml b/phase4-spring-boot-demo/src/main/resources/log4j2.xml
index 3f176fb69..b4b6a6e11 100644
--- a/phase4-spring-boot-demo/src/main/resources/log4j2.xml
+++ b/phase4-spring-boot-demo/src/main/resources/log4j2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+    Copyright (C) 2015-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/Phase4SpringbootApplicationTests.java b/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/Phase4SpringbootApplicationTests.java
index e9811ae8c..fb3566afd 100644
--- a/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/Phase4SpringbootApplicationTests.java
+++ b/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/Phase4SpringbootApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/SPITest.java b/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/SPITest.java
index 2bb036eda..ffa8c88fe 100644
--- a/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/SPITest.java
+++ b/phase4-spring-boot-demo/src/test/java/com/helger/phase4/springboot/SPITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Philip Helger (www.helger.com)
+ * Copyright (C) 2015-2024 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");