diff --git a/.github/workflows/ci-dependency-check.yml b/.github/workflows/ci-dependency-check.yml
index db1e5d5..9a04d1c 100644
--- a/.github/workflows/ci-dependency-check.yml
+++ b/.github/workflows/ci-dependency-check.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 512a055..c55d5a1 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v3
         with:
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/ci-pullrequest.yml b/.github/workflows/ci-pullrequest.yml
index 19e224f..fa010c9 100644
--- a/.github/workflows/ci-pullrequest.yml
+++ b/.github/workflows/ci-pullrequest.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index a11dc10..343e92e 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 21
         distribution: adopt
     - uses: actions/checkout@v3
       with:
diff --git a/.github/workflows/ci-sonar.yml b/.github/workflows/ci-sonar.yml
index 1b2bf52..86db11e 100644
--- a/.github/workflows/ci-sonar.yml
+++ b/.github/workflows/ci-sonar.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v3
         with:
diff --git a/pom.xml b/pom.xml
index e29b3f5..858f2ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,9 +6,15 @@
 
     <groupId>eu.europa.ec.dgc</groupId>
     <artifactId>ddcc-gateway-lib</artifactId>
-    <version>2.0.2</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
+    <parent>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-starter-parent</artifactId>
+        <version>2023.0.2</version>
+    </parent>
+
     <name>ddcc-gateway-lib</name>
     <description>Library with common used methods and classes for Digital Documentation Covid Certificate Gateway.
     </description>
@@ -17,24 +23,21 @@
     </organization>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!-- charset -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <!-- dependencies -->
-        <owasp.version>9.0.2</owasp.version>
-        <bcpkix.version>1.76</bcpkix.version>
-        <lombok.version>1.18.30</lombok.version>
-        <mapstruct.version>1.5.3.Final</mapstruct.version>
-        <commonsio.version>2.11.0</commonsio.version>
-        <cbor.version>4.5.2</cbor.version>
-        <mockwebserver.version>4.12.0</mockwebserver.version>
-        <plugin.checkstyle.version>3.2.1</plugin.checkstyle.version>
-        <plugin.sonar.version>3.9.1.2184</plugin.sonar.version>
-        <plugin.surefire.version>3.2.2</plugin.surefire.version>
-        <plugin.jacoco.version>0.8.11</plugin.jacoco.version>
-        <spring.boot.version>3.0.13</spring.boot.version>
+        <owasp.version>9.2.0</owasp.version>
+        <bcpkix.version>1.78.1</bcpkix.version>
+        <mapstruct.version>1.5.5.Final</mapstruct.version>
+        <commonsio.version>2.16.1</commonsio.version>
+        <cbor.version>4.5.4</cbor.version>
+        <plugin.checkstyle.version>3.4.0</plugin.checkstyle.version>
+        <plugin.jacoco.version>0.8.12</plugin.jacoco.version>
+<!--        <jackson.version>2.15.4</jackson.version>-->
+<!--        <lombok.version></lombok.version>-->
 
         <!-- license -->
         <license.projectName>WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib</license.projectName>
@@ -71,30 +74,23 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>${spring.boot.version}</version>
-<!--            <optional>true</optional>-->
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>${spring.boot.version}</version>
-<!--            <optional>true</optional>-->
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <version>4.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-httpclient</artifactId>
-            <version>13.1</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -104,7 +100,6 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -125,17 +120,16 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.14.3</version>
+            <version>${jackson-bom.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.14.3</version>
+            <version>${jackson-bom.version}</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>${mockwebserver.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -151,17 +145,11 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${plugin.surefire.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>2.3.0</version>
+                    <version>2.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -261,6 +249,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
                 <configuration>
                     <annotationProcessorPaths>
                         <path>
@@ -276,7 +265,7 @@
                         <path>
                             <groupId>org.springframework.boot</groupId>
                             <artifactId>spring-boot-configuration-processor</artifactId>
-                            <version>${spring.boot.version}</version>
+                            <version>${project.parent.parent.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
diff --git a/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java b/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java
index 6344ad1..2ed17f8 100644
--- a/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java
+++ b/src/main/java/eu/europa/ec/dgc/DgcLibAutoConfiguration.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayConnectorUtils.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayConnectorUtils.java
index 347b794..39c5481 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayConnectorUtils.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayConnectorUtils.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -361,11 +361,10 @@ protected Map<String, String> convertQueryParams(
     }
 
     private String getHashData(TrustedIssuerDto trustedIssuerDto) {
-        return trustedIssuerDto.getUuid() + HASH_SEPARATOR
-            + trustedIssuerDto.getCountry() + HASH_SEPARATOR
+        return trustedIssuerDto.getCountry() + HASH_SEPARATOR
             + trustedIssuerDto.getName() + HASH_SEPARATOR
             + trustedIssuerDto.getUrl() + HASH_SEPARATOR
-            + trustedIssuerDto.getType().name() + HASH_SEPARATOR;
+            + trustedIssuerDto.getType().name();
     }
 
     @RequiredArgsConstructor
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayCountryListDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayCountryListDownloadConnector.java
index 99532fd..819c71a 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayCountryListDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayCountryListDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnector.java
index 9da43fa..cbe37a1 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnectorBuilder.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnectorBuilder.java
index 0ed281e..e9b8f67 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnectorBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayDownloadConnectorBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListDownloadConnector.java
index c717657..49d3028 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListUploadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListUploadConnector.java
index 127e8eb..72b87c5 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListUploadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayRevocationListUploadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayTrustedIssuerDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayTrustedIssuerDownloadConnector.java
index 9f64340..9f848f8 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayTrustedIssuerDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayTrustedIssuerDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayUploadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayUploadConnector.java
index ed4dc34..87e6e81 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayUploadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayUploadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleDownloadConnector.java
index a4f8358..f23621e 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleUploadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleUploadConnector.java
index ab991a7..f955e74 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleUploadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValidationRuleUploadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValueSetDownloadConnector.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValueSetDownloadConnector.java
index e7634fb..a0774c6 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValueSetDownloadConnector.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/DgcGatewayValueSetDownloadConnector.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClient.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClient.java
index fa2296e..7af8d90 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClient.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClient.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClientConfig.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClientConfig.java
index 9039938..2f36eaf 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClientConfig.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/client/DgcGatewayConnectorRestClientConfig.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorConfigProperties.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorConfigProperties.java
index 5a024d3..09b1c97 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorConfigProperties.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorConfigProperties.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorKeystore.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorKeystore.java
index c92a82c..79d5f3c 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorKeystore.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/config/DgcGatewayConnectorKeystore.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/CertificateTypeDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/CertificateTypeDto.java
index 4b79183..245a56b 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/CertificateTypeDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/CertificateTypeDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ProblemReportDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ProblemReportDto.java
index 30bf4a5..772ce80 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ProblemReportDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ProblemReportDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDeleteRequestDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDeleteRequestDto.java
index 349f681..b69c70a 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDeleteRequestDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDeleteRequestDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDto.java
index c8663b7..779c699 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchListDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchListDto.java
index f6723df..8e8e4a1 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchListDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationBatchListDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationHashTypeDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationHashTypeDto.java
index 578eb9b..c894012 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationHashTypeDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/RevocationHashTypeDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustListItemDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustListItemDto.java
index 92e74f5..4dd3a00 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustListItemDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustListItemDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedCertificateTrustListDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedCertificateTrustListDto.java
index 827ec09..b2aa1a4 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedCertificateTrustListDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedCertificateTrustListDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedIssuerDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedIssuerDto.java
index f22d363..1adce82 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedIssuerDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedIssuerDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedReferenceDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedReferenceDto.java
index f2ac4d7..25291bb 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedReferenceDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/TrustedReferenceDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ValidationRuleDto.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ValidationRuleDto.java
index 79cb4c6..d4db9b8 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ValidationRuleDto.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/dto/ValidationRuleDto.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
index 7ad027f..2b066b3 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
index 051c906..df966c0 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
index a52308c..8257645 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
index 57bad84..be96283 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustListMapper.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustListMapper.java
index cf5a27a..1c79bf1 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustListMapper.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustListMapper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedCertificateMapper.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedCertificateMapper.java
index 500c183..fe45bb0 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedCertificateMapper.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedCertificateMapper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedIssuerMapper.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedIssuerMapper.java
index 5ae7b28..e8ecc80 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedIssuerMapper.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedIssuerMapper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedReferenceMapper.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedReferenceMapper.java
index 12d674f..7e03089 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedReferenceMapper.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/mapper/TrustedReferenceMapper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/CertificateType.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/CertificateType.java
index 6f9101c..6ab8c7a 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/CertificateType.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/CertificateType.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/QueryParameter.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/QueryParameter.java
index be1ffee..5ee4772 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/QueryParameter.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/QueryParameter.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustListItem.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustListItem.java
index 07b251c..48bb14e 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustListItem.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustListItem.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedCertificateTrustListItem.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedCertificateTrustListItem.java
index cc67060..99e3867 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedCertificateTrustListItem.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedCertificateTrustListItem.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedIssuer.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedIssuer.java
index dcbc966..50ad06d 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedIssuer.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedIssuer.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedReference.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedReference.java
index 9825740..f4a5501 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedReference.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/TrustedReference.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRule.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRule.java
index 5805668..f94c95f 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRule.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRule.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRulesByCountry.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRulesByCountry.java
index f0886e1..e37b95a 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRulesByCountry.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/model/ValidationRulesByCountry.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/Base45Encoder.java b/src/main/java/eu/europa/ec/dgc/generation/Base45Encoder.java
index d8f0065..46de11c 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/Base45Encoder.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/Base45Encoder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/CopyDigest.java b/src/main/java/eu/europa/ec/dgc/generation/CopyDigest.java
index 32db9f0..e83fde0 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/CopyDigest.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/CopyDigest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DccBuilderBase.java b/src/main/java/eu/europa/ec/dgc/generation/DccBuilderBase.java
index cf58bc6..6a53676 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DccBuilderBase.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DccBuilderBase.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DccRecoveryBuilder.java b/src/main/java/eu/europa/ec/dgc/generation/DccRecoveryBuilder.java
index 11af063..2aadff6 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DccRecoveryBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DccRecoveryBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DccTestBuilder.java b/src/main/java/eu/europa/ec/dgc/generation/DccTestBuilder.java
index 9b969fc..e04e5ff 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DccTestBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DccTestBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DccVaccinationBuilder.java b/src/main/java/eu/europa/ec/dgc/generation/DccVaccinationBuilder.java
index 15eceb8..c1db763 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DccVaccinationBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DccVaccinationBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedFinalizer.java b/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedFinalizer.java
index bfaad00..625a559 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedFinalizer.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedFinalizer.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedPublisher.java b/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedPublisher.java
index beae810..0369670 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedPublisher.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DgcCryptedPublisher.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DgcGenerator.java b/src/main/java/eu/europa/ec/dgc/generation/DgcGenerator.java
index 2ef6174..c133e15 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DgcGenerator.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DgcGenerator.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DgcSigner.java b/src/main/java/eu/europa/ec/dgc/generation/DgcSigner.java
index 795a2bd..4d3efa4 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DgcSigner.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DgcSigner.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/DgciGenerator.java b/src/main/java/eu/europa/ec/dgc/generation/DgciGenerator.java
index 0545adf..1922ee3 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/DgciGenerator.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/DgciGenerator.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/dto/DgcData.java b/src/main/java/eu/europa/ec/dgc/generation/dto/DgcData.java
index f6fc868..a7ff7dc 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/dto/DgcData.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/dto/DgcData.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/generation/dto/DgcInitData.java b/src/main/java/eu/europa/ec/dgc/generation/dto/DgcInitData.java
index d81bb18..1eb1b71 100644
--- a/src/main/java/eu/europa/ec/dgc/generation/dto/DgcInitData.java
+++ b/src/main/java/eu/europa/ec/dgc/generation/dto/DgcInitData.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilder.java b/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilder.java
index 6f3ceb1..34eaab2 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParser.java b/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParser.java
index ce51227..a709792 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParser.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParser.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilder.java b/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilder.java
index 6d2792b..284739d 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParser.java b/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParser.java
index ee2f4f2..2bfa9cb 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParser.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParser.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedMessageBuilder.java b/src/main/java/eu/europa/ec/dgc/signing/SignedMessageBuilder.java
index 11ac1da..a4bcd7e 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedMessageBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedMessageBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedMessageParser.java b/src/main/java/eu/europa/ec/dgc/signing/SignedMessageParser.java
index 07e3ef5..c7b3290 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedMessageParser.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedMessageParser.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilder.java b/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilder.java
index b066686..0f38a27 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilder.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilder.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageParser.java b/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageParser.java
index 6b16e3e..68ba7d1 100644
--- a/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageParser.java
+++ b/src/main/java/eu/europa/ec/dgc/signing/SignedStringMessageParser.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/eu/europa/ec/dgc/utils/CertificateUtils.java b/src/main/java/eu/europa/ec/dgc/utils/CertificateUtils.java
index 7062c9d..690d0f9 100644
--- a/src/main/java/eu/europa/ec/dgc/utils/CertificateUtils.java
+++ b/src/main/java/eu/europa/ec/dgc/utils/CertificateUtils.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/DgcLibAutoConfigurationTest.java b/src/test/java/eu/europa/ec/dgc/DgcLibAutoConfigurationTest.java
index 820e812..e65b2d5 100644
--- a/src/test/java/eu/europa/ec/dgc/DgcLibAutoConfigurationTest.java
+++ b/src/test/java/eu/europa/ec/dgc/DgcLibAutoConfigurationTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/CountryListDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/CountryListDownloadConnectorTest.java
index 35134de..84328a3 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/CountryListDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/CountryListDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/DdccDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/DdccDownloadConnectorTest.java
index d7ce459..526f15e 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/DdccDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/DdccDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -657,11 +657,10 @@ private Request dummyRequest() {
     }
 
     private String getHashData(TrustedIssuerDto trustedIssuerDto) {
-        return trustedIssuerDto.getUuid() + ";"
-            + trustedIssuerDto.getCountry() + ";"
+        return trustedIssuerDto.getCountry() + ";"
             + trustedIssuerDto.getName() + ";"
             + trustedIssuerDto.getUrl() + ";"
-            + trustedIssuerDto.getType().name() + ";";
+            + trustedIssuerDto.getType().name();
     }
 
 }
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorBuilderTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorBuilderTest.java
index ceca548..64b57e8 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorCacheTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorCacheTest.java
index 0b2394f..96bccd3 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorCacheTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorCacheTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorTest.java
index 7c342d8..8207e52 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorUtilsTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorUtilsTest.java
index d28127f..9f7b7fb 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorUtilsTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/DownloadConnectorUtilsTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListDownloadConnectorTest.java
index d5d9bb0..666de50 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListUploadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListUploadConnectorTest.java
index 7659bda..f32eeb3 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListUploadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/RevocationListUploadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/SpringBootTestApplication.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/SpringBootTestApplication.java
index adaa41d..402dd7c 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/SpringBootTestApplication.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/SpringBootTestApplication.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/TrustedIssuerDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/TrustedIssuerDownloadConnectorTest.java
index a07a027..9726363 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/TrustedIssuerDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/TrustedIssuerDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/UploadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/UploadConnectorTest.java
index a51b320..dd1dd31 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/UploadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/UploadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleDownloadConnectorTest.java
index b9e9628..92ed746 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleUploadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleUploadConnectorTest.java
index 17aa3a4..8223742 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleUploadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValidationRuleUploadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValueSetDownloadConnectorTest.java b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValueSetDownloadConnectorTest.java
index 508b343..d7aa8c2 100644
--- a/src/test/java/eu/europa/ec/dgc/gateway/connector/ValueSetDownloadConnectorTest.java
+++ b/src/test/java/eu/europa/ec/dgc/gateway/connector/ValueSetDownloadConnectorTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/Base45EncoderTest.java b/src/test/java/eu/europa/ec/dgc/generation/Base45EncoderTest.java
index 66ba480..73a5412 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/Base45EncoderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/Base45EncoderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/DccRecoveryBuilderTest.java b/src/test/java/eu/europa/ec/dgc/generation/DccRecoveryBuilderTest.java
index f0e8f6b..0154236 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/DccRecoveryBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/DccRecoveryBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/DccTestBuilderTest.java b/src/test/java/eu/europa/ec/dgc/generation/DccTestBuilderTest.java
index 293155b..c7840d2 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/DccTestBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/DccTestBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/DccVaccinationBuilderTest.java b/src/test/java/eu/europa/ec/dgc/generation/DccVaccinationBuilderTest.java
index 30a0705..fd83b42 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/DccVaccinationBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/DccVaccinationBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/DgcCryptedPublisherTest.java b/src/test/java/eu/europa/ec/dgc/generation/DgcCryptedPublisherTest.java
index 9e6a8c3..1be0511 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/DgcCryptedPublisherTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/DgcCryptedPublisherTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/DgcSignerTest.java b/src/test/java/eu/europa/ec/dgc/generation/DgcSignerTest.java
index 9c6a2f8..78b50e6 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/DgcSignerTest.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/DgcSignerTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/generation/KeyHelper.java b/src/test/java/eu/europa/ec/dgc/generation/KeyHelper.java
index e55b14a..4c7f2e3 100644
--- a/src/test/java/eu/europa/ec/dgc/generation/KeyHelper.java
+++ b/src/test/java/eu/europa/ec/dgc/generation/KeyHelper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/DeprecatedSignedCertificateMessageBuilderTest.java b/src/test/java/eu/europa/ec/dgc/signing/DeprecatedSignedCertificateMessageBuilderTest.java
index 881e05e..8203741 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/DeprecatedSignedCertificateMessageBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/DeprecatedSignedCertificateMessageBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilderTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilderTest.java
index d248fda..82864e9 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParserTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParserTest.java
index 5e9e480..3beab85 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParserTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedByteArrayMessageParserTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilderTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilderTest.java
index ae89278..49bf0aa 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParserTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParserTest.java
index 9a9d8e8..a110d03 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParserTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedCertificateMessageParserTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilderTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilderTest.java
index 49ff588..d0c724b 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilderTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageBuilderTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageParserTest.java b/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageParserTest.java
index e234664..a757f8f 100644
--- a/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageParserTest.java
+++ b/src/test/java/eu/europa/ec/dgc/signing/SignedStringMessageParserTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/testdata/CertificateTestUtils.java b/src/test/java/eu/europa/ec/dgc/testdata/CertificateTestUtils.java
index d5ac35c..25adec2 100644
--- a/src/test/java/eu/europa/ec/dgc/testdata/CertificateTestUtils.java
+++ b/src/test/java/eu/europa/ec/dgc/testdata/CertificateTestUtils.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/testdata/DgcTestKeyStore.java b/src/test/java/eu/europa/ec/dgc/testdata/DgcTestKeyStore.java
index 28e4503..d238889 100644
--- a/src/test/java/eu/europa/ec/dgc/testdata/DgcTestKeyStore.java
+++ b/src/test/java/eu/europa/ec/dgc/testdata/DgcTestKeyStore.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/eu/europa/ec/dgc/testdata/TrustedIssuerTestHelper.java b/src/test/java/eu/europa/ec/dgc/testdata/TrustedIssuerTestHelper.java
index 0aae2f7..7296335 100644
--- a/src/test/java/eu/europa/ec/dgc/testdata/TrustedIssuerTestHelper.java
+++ b/src/test/java/eu/europa/ec/dgc/testdata/TrustedIssuerTestHelper.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,11 +49,10 @@ public TrustedIssuerDto createTrustedIssuer(final String country) throws Excepti
     }
 
     private String getHashData(TrustedIssuerDto entity) {
-        return entity.getUuid() + ";"
-            + entity.getCountry() + ";"
+        return entity.getCountry() + ";"
             + entity.getName() + ";"
             + entity.getUrl() + ";"
-            + entity.getType().name() + ";";
+            + entity.getType().name();
     }
 
     public String signString(final String hashdata) throws Exception {
diff --git a/src/test/java/eu/europa/ec/dgc/utils/CertificateUtilsTest.java b/src/test/java/eu/europa/ec/dgc/utils/CertificateUtilsTest.java
index 5439d6a..19e6580 100644
--- a/src/test/java/eu/europa/ec/dgc/utils/CertificateUtilsTest.java
+++ b/src/test/java/eu/europa/ec/dgc/utils/CertificateUtilsTest.java
@@ -2,7 +2,7 @@
  * ---license-start
  * WHO Digital Documentation Covid Certificate Gateway Service / ddcc-gateway-lib
  * ---
- * Copyright (C) 2022 T-Systems International GmbH and all other contributors
+ * Copyright (C) 2022 - 2024 T-Systems International GmbH and all other contributors
  * ---
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.